[v3,11/22] common: Drop init.h from common header

Message ID 20200510113946.v3.11.I422abb6150b1e9bd658f8dfd1242b59de8af828f@changeid
State New
Headers show
Series
  • common: Further reduce the size of common.h
Related show

Commit Message

Simon Glass May 10, 2020, 5:40 p.m.
Move this uncommon header out of the common header.

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

Changes in v3: None
Changes in v2:
- Adjustments for chromebook_coral, etc.

 arch/arc/lib/cpu.c                                        | 1 +
 arch/arc/lib/init_helpers.c                               | 1 +
 arch/arm/cpu/arm1136/mx31/generic.c                       | 1 +
 arch/arm/cpu/arm1136/mx31/timer.c                         | 1 +
 arch/arm/cpu/arm1136/mx35/generic.c                       | 1 +
 arch/arm/cpu/arm1136/mx35/timer.c                         | 1 +
 arch/arm/cpu/arm920t/ep93xx/timer.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/lpc32xx/cpu.c                      | 1 +
 arch/arm/cpu/arm926ejs/lpc32xx/timer.c                    | 1 +
 arch/arm/cpu/arm926ejs/mx25/generic.c                     | 1 +
 arch/arm/cpu/arm926ejs/mx25/timer.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/cpu.c                        | 1 +
 arch/arm/cpu/arm926ejs/spear/spl.c                        | 1 +
 arch/arm/cpu/arm926ejs/spear/timer.c                      | 1 +
 arch/arm/cpu/armv7/arch_timer.c                           | 1 +
 arch/arm/cpu/armv7/iproc-common/timer.c                   | 1 +
 arch/arm/cpu/armv7/ls102xa/cpu.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/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/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/cpuinfo.c                                | 1 +
 arch/arm/cpu/pxa/pxa2xx.c                                 | 1 +
 arch/arm/cpu/pxa/timer.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-at91/arm920t/cpu.c                          | 1 +
 arch/arm/mach-at91/arm920t/timer.c                        | 1 +
 arch/arm/mach-at91/arm926ejs/cpu.c                        | 1 +
 arch/arm/mach-at91/arm926ejs/timer.c                      | 1 +
 arch/arm/mach-at91/armv7/cpu.c                            | 1 +
 arch/arm/mach-at91/armv7/timer.c                          | 1 +
 arch/arm/mach-at91/spl_at91.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/spl.c                               | 1 +
 arch/arm/mach-davinci/timer.c                             | 1 +
 arch/arm/mach-exynos/lowlevel_init.c                      | 1 +
 arch/arm/mach-exynos/spl_boot.c                           | 1 +
 arch/arm/mach-highbank/timer.c                            | 1 +
 arch/arm/mach-imx/cpu.c                                   | 1 +
 arch/arm/mach-imx/imx8m/soc.c                             | 1 +
 arch/arm/mach-imx/imxrt/soc.c                             | 1 +
 arch/arm/mach-imx/mx7/soc.c                               | 1 +
 arch/arm/mach-imx/spl.c                                   | 1 +
 arch/arm/mach-imx/syscounter.c                            | 1 +
 arch/arm/mach-imx/timer.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-keystone/init.c                             | 1 +
 arch/arm/mach-keystone/keystone.c                         | 1 +
 arch/arm/mach-kirkwood/cpu.c                              | 1 +
 arch/arm/mach-mediatek/cpu.c                              | 1 +
 arch/arm/mach-mediatek/mt7622/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-mediatek/spl.c                              | 1 +
 arch/arm/mach-meson/board-info.c                          | 1 +
 arch/arm/mach-mvebu/armada3700/cpu.c                      | 1 +
 arch/arm/mach-mvebu/cpu.c                                 | 1 +
 arch/arm/mach-mvebu/spl.c                                 | 1 +
 arch/arm/mach-mvebu/timer.c                               | 1 +
 arch/arm/mach-omap2/am33xx/chilisom.c                     | 1 +
 arch/arm/mach-omap2/am33xx/clock.c                        | 1 +
 arch/arm/mach-omap2/am33xx/sys_info.c                     | 1 +
 arch/arm/mach-omap2/clocks-common.c                       | 1 +
 arch/arm/mach-omap2/hwinit-common.c                       | 1 +
 arch/arm/mach-omap2/omap3/board.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/cpu.c                               | 1 +
 arch/arm/mach-orion5x/timer.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-rmobile/timer.c                             | 1 +
 arch/arm/mach-rockchip/cpu-info.c                         | 1 +
 arch/arm/mach-rockchip/px30-board-tpl.c                   | 1 +
 arch/arm/mach-rockchip/px30/px30.c                        | 1 +
 arch/arm/mach-rockchip/rk3036-board-spl.c                 | 1 +
 arch/arm/mach-rockchip/rk3036/rk3036.c                    | 1 +
 arch/arm/mach-rockchip/rk3036/sdram_rk3036.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/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/spl.c                              | 1 +
 arch/arm/mach-rockchip/tpl.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-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/timer.c                             | 1 +
 arch/arm/mach-socfpga/timer_s10.c                         | 1 +
 arch/arm/mach-stm32/soc.c                                 | 1 +
 arch/arm/mach-stm32mp/cpu.c                               | 1 +
 arch/arm/mach-stm32mp/dram_init.c                         | 1 +
 arch/arm/mach-stm32mp/spl.c                               | 1 +
 arch/arm/mach-sunxi/board.c                               | 1 +
 arch/arm/mach-sunxi/cpu_info.c                            | 1 +
 arch/arm/mach-sunxi/dram_sun50i_h6.c                      | 3 ++-
 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                       | 1 +
 arch/arm/mach-tegra/cboot.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/tegra210/clock.c                      | 1 +
 arch/arm/mach-tegra/tegra30/clock.c                       | 1 +
 arch/arm/mach-u8500/cpuinfo.c                             | 1 +
 arch/arm/mach-uniphier/arm32/timer.c                      | 1 +
 arch/arm/mach-uniphier/cpu-info.c                         | 1 +
 arch/arm/mach-uniphier/dram/umc-pxs2.c                    | 1 +
 arch/arm/mach-uniphier/dram_init.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-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/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.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/cpu/mcf547x_8x/slicetimer.c                     | 1 +
 arch/m68k/lib/time.c                                      | 1 +
 arch/microblaze/cpu/timer.c                               | 1 +
 arch/mips/cpu/cpu.c                                       | 1 +
 arch/mips/lib/stack.c                                     | 1 +
 arch/mips/mach-ath79/cpu.c                                | 1 +
 arch/mips/mach-bmips/dram.c                               | 1 +
 arch/mips/mach-jz47xx/jz4780/sdram.c                      | 1 +
 arch/mips/mach-jz47xx/jz4780/timer.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/spl.c                               | 1 +
 arch/mips/mach-pic32/cpu.c                                | 1 +
 arch/nds32/cpu/n1213/ag101/timer.c                        | 1 +
 arch/nios2/cpu/cpu.c                                      | 1 +
 arch/powerpc/cpu/mpc83xx/pci.c                            | 1 +
 arch/powerpc/cpu/mpc85xx/cmd_errata.c                     | 1 +
 arch/powerpc/cpu/mpc85xx/cpu.c                            | 1 +
 arch/powerpc/cpu/mpc86xx/cpu_init.c                       | 1 +
 arch/powerpc/cpu/mpc8xx/cpu_init.c                        | 1 +
 arch/powerpc/cpu/mpc8xxx/cpu.c                            | 1 +
 arch/powerpc/cpu/mpc8xxx/fsl_lbc.c                        | 1 +
 arch/powerpc/lib/stack.c                                  | 1 +
 arch/powerpc/lib/time.c                                   | 1 +
 arch/riscv/cpu/cpu.c                                      | 1 +
 arch/riscv/lib/spl.c                                      | 1 +
 arch/sandbox/cpu/spl.c                                    | 1 +
 arch/sandbox/cpu/start.c                                  | 1 +
 arch/sh/lib/time.c                                        | 1 +
 arch/sh/lib/time_sh2.c                                    | 1 +
 arch/x86/cpu/apollolake/cpu_spl.c                         | 1 +
 arch/x86/cpu/apollolake/fsp_s.c                           | 1 +
 arch/x86/cpu/braswell/braswell.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/refcode.c                          | 1 +
 arch/x86/cpu/coreboot/coreboot.c                          | 1 +
 arch/x86/cpu/efi/app.c                                    | 1 +
 arch/x86/cpu/intel_common/cpu_from_spl.c                  | 1 +
 arch/x86/cpu/ivybridge/cpu.c                              | 1 +
 arch/x86/cpu/ivybridge/ivybridge.c                        | 1 +
 arch/x86/cpu/ivybridge/sdram_nop.c                        | 1 +
 arch/x86/cpu/qemu/qemu.c                                  | 1 +
 arch/x86/cpu/quark/quark.c                                | 1 +
 arch/x86/cpu/queensbay/tnc.c                              | 1 +
 arch/x86/cpu/slimbootloader/slimbootloader.c              | 1 +
 arch/x86/cpu/tangier/tangier.c                            | 1 +
 arch/x86/cpu/x86_64/cpu.c                                 | 1 +
 arch/x86/lib/fsp/fsp_common.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/spl.c                                        | 1 +
 arch/x86/lib/tpl.c                                        | 1 +
 arch/xtensa/cpu/cpu.c                                     | 1 +
 board/BuR/brppt2/board.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/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/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/amlogic/p200/p200.c                                 | 1 +
 board/amlogic/p201/p201.c                                 | 1 +
 board/amlogic/p212/p212.c                                 | 1 +
 board/amlogic/q200/q200.c                                 | 1 +
 board/amlogic/s400/s400.c                                 | 1 +
 board/amlogic/sei510/sei510.c                             | 1 +
 board/amlogic/sei610/sei610.c                             | 1 +
 board/amlogic/u200/u200.c                                 | 1 +
 board/amlogic/w400/w400.c                                 | 1 +
 board/aristainetos/aristainetos.c                         | 1 +
 board/armltd/vexpress64/pcie.c                            | 1 +
 board/armltd/vexpress64/vexpress64.c                      | 1 +
 board/atmel/at91sam9260ek/led.c                           | 1 +
 board/atmel/common/video_display.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/bluegiga/apx4devkit/apx4devkit.c                    | 1 +
 board/bosch/guardian/board.c                              | 1 +
 board/boundary/nitrogen6x/nitrogen6x.c                    | 1 +
 board/broadcom/bcm963158/bcm963158.c                      | 1 +
 board/broadcom/bcm968360bg/bcm968360bg.c                  | 1 +
 board/broadcom/bcm968580xref/bcm968580xref.c              | 1 +
 board/bticino/mamoj/mamoj.c                               | 1 +
 board/bticino/mamoj/spl.c                                 | 1 +
 board/buffalo/lsxl/lsxl.c                                 | 1 +
 board/ccv/xpress/spl.c                                    | 1 +
 board/cirrus/edb93xx/edb93xx.c                            | 1 +
 board/cloudengines/pogo_e02/pogo_e02.c                    | 1 +
 board/compulab/cm_t35/cm_t35.c                            | 1 +
 board/corscience/tricorder/tricorder.c                    | 1 +
 board/cortina/presidio-asic/presidio.c                    | 1 +
 board/creative/xfi3/xfi3.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_spl.c                 | 1 +
 board/ea/mx7ulp_com/mx7ulp_com.c                          | 1 +
 board/elgin/elgin_rv1108/elgin_rv1108.c                   | 1 +
 board/emulation/qemu-arm/qemu-arm.c                       | 1 +
 board/engicam/common/spl.c                                | 1 +
 board/freescale/b4860qds/ddr.c                            | 1 +
 board/freescale/bsc9131rdb/bsc9131rdb.c                   | 1 +
 board/freescale/common/sys_eeprom.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/spl.c                          | 1 +
 board/freescale/imx8qm_mek/spl.c                          | 1 +
 board/freescale/imx8qxp_mek/spl.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/ls1021aqds/ddr.c                          | 1 +
 board/freescale/ls1028a/ls1028a.c                         | 1 +
 board/freescale/ls1043aqds/ls1043aqds.c                   | 1 +
 board/freescale/ls1043ardb/ls1043ardb.c                   | 1 +
 board/freescale/ls1046afrwy/ls1046afrwy.c                 | 1 +
 board/freescale/ls1046aqds/ls1046aqds.c                   | 1 +
 board/freescale/ls1046ardb/ls1046ardb.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/m5253demo/flash.c                         | 1 +
 board/freescale/m5282evb/m5282evb.c                       | 1 +
 board/freescale/mpc8313erdb/sdram.c                       | 1 +
 board/freescale/mpc8315erdb/sdram.c                       | 1 +
 board/freescale/mpc8349emds/mpc8349emds.c                 | 1 +
 board/freescale/mpc8349itx/mpc8349itx.c                   | 1 +
 board/freescale/mx23evk/mx23evk.c                         | 1 +
 board/freescale/mx28evk/mx28evk.c                         | 1 +
 board/freescale/mx6memcal/mx6memcal.c                     | 1 +
 board/freescale/mx6memcal/spl.c                           | 1 +
 board/freescale/mx6qarm2/mx6qarm2.c                       | 1 +
 board/freescale/mx6slevk/mx6slevk.c                       | 1 +
 board/freescale/mx7ulp_evk/mx7ulp_evk.c                   | 1 +
 board/freescale/p2041rdb/ddr.c                            | 1 +
 board/freescale/t102xqds/ddr.c                            | 1 +
 board/freescale/t102xrdb/ddr.c                            | 1 +
 board/freescale/t1040qds/ddr.c                            | 1 +
 board/freescale/t104xrdb/ddr.c                            | 1 +
 board/freescale/t208xqds/ddr.c                            | 1 +
 board/freescale/t208xrdb/ddr.c                            | 1 +
 board/freescale/t4qds/ddr.c                               | 1 +
 board/freescale/t4rdb/ddr.c                               | 1 +
 board/gateworks/gw_ventana/gw_ventana.c                   | 1 +
 board/gateworks/gw_ventana/gw_ventana_spl.c               | 1 +
 board/google/gru/gru.c                                    | 1 +
 board/google/veyron/veyron.c                              | 1 +
 board/gumstix/duovero/duovero.c                           | 1 +
 board/gumstix/pepper/board.c                              | 1 +
 board/highbank/highbank.c                                 | 1 +
 board/hisilicon/hikey/hikey.c                             | 1 +
 board/hisilicon/hikey960/hikey960.c                       | 1 +
 board/imgtec/boston/checkboard.c                          | 1 +
 board/imgtec/ci20/ci20.c                                  | 1 +
 board/imgtec/xilfpga/xilfpga.c                            | 1 +
 board/intel/cougarcanyon2/cougarcanyon2.c                 | 1 +
 board/intel/crownbay/crownbay.c                           | 1 +
 board/intel/minnowmax/minnowmax.c                         | 1 +
 board/iomega/iconnect/iconnect.c                          | 1 +
 board/isee/igep00x0/igep00x0.c                            | 1 +
 board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c                 | 1 +
 board/keymile/kmp204x/ddr.c                               | 1 +
 board/kmc/kzm9g/kzm9g.c                                   | 1 +
 board/kobol/helios4/helios4.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/spl.c                              | 1 +
 board/liebherr/xea/xea.c                                  | 1 +
 board/logicpd/am3517evm/am3517evm.c                       | 1 +
 board/logicpd/zoom1/zoom1.c                               | 1 +
 board/maxbcm/maxbcm.c                                     | 1 +
 board/mediatek/mt7622/mt7622_rfb.c                        | 1 +
 board/mediatek/mt8518/mt8518_ap1.c                        | 1 +
 board/microchip/mpfs_icicle/mpfs_icicle.c                 | 1 +
 board/microchip/pic32mzda/pic32mzda.c                     | 1 +
 board/mikrotik/crs305-1g-4s/crs305-1g-4s.c                | 1 +
 board/netgear/dgnd3700v2/dgnd3700v2.c                     | 1 +
 board/nokia/rx51/rx51.c                                   | 1 +
 board/novtech/meerkat96/meerkat96.c                       | 1 +
 board/olimex/mx23_olinuxino/mx23_olinuxino.c              | 1 +
 board/overo/overo.c                                       | 1 +
 board/pandora/pandora.c                                   | 1 +
 board/phytec/pcl063/spl.c                                 | 1 +
 board/phytec/pcm051/board.c                               | 1 +
 board/phytium/durian/durian.c                             | 1 +
 board/pine64/rockpro64_rk3399/rockpro64-rk3399.c          | 1 +
 board/ppcag/bg0900/bg0900.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/dragonboard820c/dragonboard820c.c          | 1 +
 board/raidsonic/ib62x0/ib62x0.c                           | 1 +
 board/renesas/MigoR/migo_r.c                              | 1 +
 board/renesas/alt/alt.c                                   | 1 +
 board/renesas/alt/alt_spl.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/gose/gose_spl.c                             | 1 +
 board/renesas/grpeach/grpeach.c                           | 1 +
 board/renesas/koelsch/koelsch.c                           | 1 +
 board/renesas/koelsch/koelsch_spl.c                       | 1 +
 board/renesas/lager/lager.c                               | 1 +
 board/renesas/lager/lager_spl.c                           | 1 +
 board/renesas/porter/porter.c                             | 1 +
 board/renesas/porter/porter_spl.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/sh7763rdp/sh7763rdp.c                       | 1 +
 board/renesas/silk/silk.c                                 | 1 +
 board/renesas/silk/silk_spl.c                             | 1 +
 board/renesas/stout/stout.c                               | 1 +
 board/renesas/stout/stout_spl.c                           | 1 +
 board/renesas/ulcb/ulcb.c                                 | 1 +
 board/rockchip/evb_rk3399/evb-rk3399.c                    | 1 +
 board/rockchip/evb_rv1108/evb_rv1108.c                    | 1 +
 board/samsung/goni/goni.c                                 | 1 +
 board/sandisk/sansa_fuze_plus/sfp.c                       | 1 +
 board/sbc8349/sbc8349.c                                   | 1 +
 board/schulercontrol/sc_sps_1/sc_sps_1.c                  | 1 +
 board/seeed/linkit-smart-7688/board.c                     | 1 +
 board/siemens/capricorn/board.c                           | 1 +
 board/siemens/capricorn/spl.c                             | 1 +
 board/siemens/common/board.c                              | 1 +
 board/sifive/fu540/fu540.c                                | 1 +
 board/silica/pengwyn/board.c                              | 1 +
 board/sks-kinkel/sksimx6/sksimx6.c                        | 1 +
 board/socrates/socrates.c                                 | 1 +
 board/solidrun/clearfog/clearfog.c                        | 1 +
 board/sr1500/socfpga.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/stv0991/stv0991.c                                | 1 +
 board/ste/stemmy/stemmy.c                                 | 1 +
 board/sunxi/dram_sun4i_auto.c                             | 1 +
 board/sunxi/dram_sun5i_auto.c                             | 1 +
 board/synopsys/axs10x/axs10x.c                            | 1 +
 board/synopsys/emsdp/emsdp.c                              | 1 +
 board/synopsys/iot_devkit/iot_devkit.c                    | 1 +
 board/synopsys/nsim/nsim.c                                | 1 +
 board/tbs/tbs2910/tbs2910.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-imx7d/spl.c                         | 1 +
 board/technexion/tao3530/tao3530.c                        | 1 +
 board/technologic/ts4600/ts4600.c                         | 1 +
 board/theobroma-systems/puma_rk3399/puma-rk3399.c         | 1 +
 board/ti/am3517crane/am3517crane.c                        | 1 +
 board/ti/beagle/beagle.c                                  | 1 +
 board/ti/evm/evm.c                                        | 1 +
 board/ti/ks2_evm/board_k2e.c                              | 1 +
 board/ti/ks2_evm/board_k2hk.c                             | 1 +
 board/ti/ks2_evm/board_k2l.c                              | 1 +
 board/ti/omap5_uevm/evm.c                                 | 1 +
 board/ti/panda/panda.c                                    | 1 +
 board/ti/sdp4430/sdp.c                                    | 1 +
 board/ti/ti814x/evm.c                                     | 1 +
 board/ti/ti816x/evm.c                                     | 1 +
 board/timll/devkit8000/devkit8000.c                       | 1 +
 board/toradex/apalis-tk1/apalis-tk1.c                     | 1 +
 board/toradex/apalis_t30/apalis_t30.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/common/tdx-common.c                         | 1 +
 board/toradex/verdin-imx8mm/spl.c                         | 1 +
 board/toradex/verdin-imx8mm/verdin-imx8mm.c               | 1 +
 board/tplink/wdr4300/wdr4300.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/ddr.c                                 | 1 +
 board/wandboard/spl.c                                     | 1 +
 board/xes/common/board.c                                  | 1 +
 board/xilinx/zynqmp_r5/board.c                            | 1 +
 board/zyxel/nsa310s/nsa310s.c                             | 1 +
 cmd/pci.c                                                 | 1 +
 cmd/tlv_eeprom.c                                          | 1 +
 common/board_info.c                                       | 1 +
 common/init/board_init.c                                  | 1 +
 common/lcd.c                                              | 1 +
 common/spl/spl.c                                          | 1 +
 drivers/clk/clk_stm32mp1.c                                | 1 +
 drivers/cpu/bmips_cpu.c                                   | 1 +
 drivers/ddr/altera/sdram_arria10.c                        | 1 +
 drivers/ddr/altera/sdram_soc64.c                          | 1 +
 drivers/ddr/fsl/main.c                                    | 1 +
 drivers/dma/lpc32xx_dma.c                                 | 1 +
 drivers/fpga/fpga.c                                       | 1 +
 drivers/mtd/cfi_flash.c                                   | 1 +
 drivers/mtd/pic32_flash.c                                 | 1 +
 drivers/pci/fsl_pci_init.c                                | 1 +
 drivers/pci/pci-uclass.c                                  | 1 +
 drivers/pci/pci_ftpci100.c                                | 1 +
 drivers/pci/pci_gt64120.c                                 | 1 +
 drivers/pci/pci_msc01.c                                   | 1 +
 drivers/pci/pcie_layerscape_fixup.c                       | 1 +
 drivers/pci/pcie_layerscape_fixup_common.c                | 1 +
 drivers/ram/imxrt_sdram.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/stm32_sdram.c                                 | 1 +
 drivers/timer/cadence-ttc.c                               | 1 +
 drivers/timer/rockchip_timer.c                            | 1 +
 drivers/timer/timer-uclass.c                              | 1 +
 drivers/usb/gadget/f_thor.c                               | 1 +
 drivers/usb/host/ehci-pci.c                               | 1 +
 drivers/usb/host/ohci-lpc32xx.c                           | 1 +
 drivers/usb/host/xhci-pci.c                               | 1 +
 fs/ubifs/io.c                                             | 1 +
 include/common.h                                          | 1 -
 lib/efi/efi_app.c                                         | 1 +
 lib/time.c                                                | 1 +
 535 files changed, 535 insertions(+), 2 deletions(-)

Comments

Masahiro Yamada May 11, 2020, 6:44 a.m. | #1
Simon,

On Mon, May 11, 2020 at 7:58 AM Simon Glass <sjg at chromium.org> wrote:
>
> Move this uncommon header out of the common header.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>


Why are you adding <init.h> to
arch/arm/mach-uniphier/cpu-info.c,
which does not include <common.h>
in the first place?


This seems a wrong conversion.

For uniphier, NACK.




> ---
>
> Changes in v3: None
> Changes in v2:
> - Adjustments for chromebook_coral, etc.
>
>  arch/arc/lib/cpu.c                                        | 1 +
>  arch/arc/lib/init_helpers.c                               | 1 +
>  arch/arm/cpu/arm1136/mx31/generic.c                       | 1 +
>  arch/arm/cpu/arm1136/mx31/timer.c                         | 1 +
>  arch/arm/cpu/arm1136/mx35/generic.c                       | 1 +
>  arch/arm/cpu/arm1136/mx35/timer.c                         | 1 +
>  arch/arm/cpu/arm920t/ep93xx/timer.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/lpc32xx/cpu.c                      | 1 +
>  arch/arm/cpu/arm926ejs/lpc32xx/timer.c                    | 1 +
>  arch/arm/cpu/arm926ejs/mx25/generic.c                     | 1 +
>  arch/arm/cpu/arm926ejs/mx25/timer.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/cpu.c                        | 1 +
>  arch/arm/cpu/arm926ejs/spear/spl.c                        | 1 +
>  arch/arm/cpu/arm926ejs/spear/timer.c                      | 1 +
>  arch/arm/cpu/armv7/arch_timer.c                           | 1 +
>  arch/arm/cpu/armv7/iproc-common/timer.c                   | 1 +
>  arch/arm/cpu/armv7/ls102xa/cpu.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/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/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/cpuinfo.c                                | 1 +
>  arch/arm/cpu/pxa/pxa2xx.c                                 | 1 +
>  arch/arm/cpu/pxa/timer.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-at91/arm920t/cpu.c                          | 1 +
>  arch/arm/mach-at91/arm920t/timer.c                        | 1 +
>  arch/arm/mach-at91/arm926ejs/cpu.c                        | 1 +
>  arch/arm/mach-at91/arm926ejs/timer.c                      | 1 +
>  arch/arm/mach-at91/armv7/cpu.c                            | 1 +
>  arch/arm/mach-at91/armv7/timer.c                          | 1 +
>  arch/arm/mach-at91/spl_at91.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/spl.c                               | 1 +
>  arch/arm/mach-davinci/timer.c                             | 1 +
>  arch/arm/mach-exynos/lowlevel_init.c                      | 1 +
>  arch/arm/mach-exynos/spl_boot.c                           | 1 +
>  arch/arm/mach-highbank/timer.c                            | 1 +
>  arch/arm/mach-imx/cpu.c                                   | 1 +
>  arch/arm/mach-imx/imx8m/soc.c                             | 1 +
>  arch/arm/mach-imx/imxrt/soc.c                             | 1 +
>  arch/arm/mach-imx/mx7/soc.c                               | 1 +
>  arch/arm/mach-imx/spl.c                                   | 1 +
>  arch/arm/mach-imx/syscounter.c                            | 1 +
>  arch/arm/mach-imx/timer.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-keystone/init.c                             | 1 +
>  arch/arm/mach-keystone/keystone.c                         | 1 +
>  arch/arm/mach-kirkwood/cpu.c                              | 1 +
>  arch/arm/mach-mediatek/cpu.c                              | 1 +
>  arch/arm/mach-mediatek/mt7622/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-mediatek/spl.c                              | 1 +
>  arch/arm/mach-meson/board-info.c                          | 1 +
>  arch/arm/mach-mvebu/armada3700/cpu.c                      | 1 +
>  arch/arm/mach-mvebu/cpu.c                                 | 1 +
>  arch/arm/mach-mvebu/spl.c                                 | 1 +
>  arch/arm/mach-mvebu/timer.c                               | 1 +
>  arch/arm/mach-omap2/am33xx/chilisom.c                     | 1 +
>  arch/arm/mach-omap2/am33xx/clock.c                        | 1 +
>  arch/arm/mach-omap2/am33xx/sys_info.c                     | 1 +
>  arch/arm/mach-omap2/clocks-common.c                       | 1 +
>  arch/arm/mach-omap2/hwinit-common.c                       | 1 +
>  arch/arm/mach-omap2/omap3/board.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/cpu.c                               | 1 +
>  arch/arm/mach-orion5x/timer.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-rmobile/timer.c                             | 1 +
>  arch/arm/mach-rockchip/cpu-info.c                         | 1 +
>  arch/arm/mach-rockchip/px30-board-tpl.c                   | 1 +
>  arch/arm/mach-rockchip/px30/px30.c                        | 1 +
>  arch/arm/mach-rockchip/rk3036-board-spl.c                 | 1 +
>  arch/arm/mach-rockchip/rk3036/rk3036.c                    | 1 +
>  arch/arm/mach-rockchip/rk3036/sdram_rk3036.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/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/spl.c                              | 1 +
>  arch/arm/mach-rockchip/tpl.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-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/timer.c                             | 1 +
>  arch/arm/mach-socfpga/timer_s10.c                         | 1 +
>  arch/arm/mach-stm32/soc.c                                 | 1 +
>  arch/arm/mach-stm32mp/cpu.c                               | 1 +
>  arch/arm/mach-stm32mp/dram_init.c                         | 1 +
>  arch/arm/mach-stm32mp/spl.c                               | 1 +
>  arch/arm/mach-sunxi/board.c                               | 1 +
>  arch/arm/mach-sunxi/cpu_info.c                            | 1 +
>  arch/arm/mach-sunxi/dram_sun50i_h6.c                      | 3 ++-
>  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                       | 1 +
>  arch/arm/mach-tegra/cboot.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/tegra210/clock.c                      | 1 +
>  arch/arm/mach-tegra/tegra30/clock.c                       | 1 +
>  arch/arm/mach-u8500/cpuinfo.c                             | 1 +
>  arch/arm/mach-uniphier/arm32/timer.c                      | 1 +
>  arch/arm/mach-uniphier/cpu-info.c                         | 1 +
>  arch/arm/mach-uniphier/dram/umc-pxs2.c                    | 1 +
>  arch/arm/mach-uniphier/dram_init.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-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/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.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/cpu/mcf547x_8x/slicetimer.c                     | 1 +
>  arch/m68k/lib/time.c                                      | 1 +
>  arch/microblaze/cpu/timer.c                               | 1 +
>  arch/mips/cpu/cpu.c                                       | 1 +
>  arch/mips/lib/stack.c                                     | 1 +
>  arch/mips/mach-ath79/cpu.c                                | 1 +
>  arch/mips/mach-bmips/dram.c                               | 1 +
>  arch/mips/mach-jz47xx/jz4780/sdram.c                      | 1 +
>  arch/mips/mach-jz47xx/jz4780/timer.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/spl.c                               | 1 +
>  arch/mips/mach-pic32/cpu.c                                | 1 +
>  arch/nds32/cpu/n1213/ag101/timer.c                        | 1 +
>  arch/nios2/cpu/cpu.c                                      | 1 +
>  arch/powerpc/cpu/mpc83xx/pci.c                            | 1 +
>  arch/powerpc/cpu/mpc85xx/cmd_errata.c                     | 1 +
>  arch/powerpc/cpu/mpc85xx/cpu.c                            | 1 +
>  arch/powerpc/cpu/mpc86xx/cpu_init.c                       | 1 +
>  arch/powerpc/cpu/mpc8xx/cpu_init.c                        | 1 +
>  arch/powerpc/cpu/mpc8xxx/cpu.c                            | 1 +
>  arch/powerpc/cpu/mpc8xxx/fsl_lbc.c                        | 1 +
>  arch/powerpc/lib/stack.c                                  | 1 +
>  arch/powerpc/lib/time.c                                   | 1 +
>  arch/riscv/cpu/cpu.c                                      | 1 +
>  arch/riscv/lib/spl.c                                      | 1 +
>  arch/sandbox/cpu/spl.c                                    | 1 +
>  arch/sandbox/cpu/start.c                                  | 1 +
>  arch/sh/lib/time.c                                        | 1 +
>  arch/sh/lib/time_sh2.c                                    | 1 +
>  arch/x86/cpu/apollolake/cpu_spl.c                         | 1 +
>  arch/x86/cpu/apollolake/fsp_s.c                           | 1 +
>  arch/x86/cpu/braswell/braswell.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/refcode.c                          | 1 +
>  arch/x86/cpu/coreboot/coreboot.c                          | 1 +
>  arch/x86/cpu/efi/app.c                                    | 1 +
>  arch/x86/cpu/intel_common/cpu_from_spl.c                  | 1 +
>  arch/x86/cpu/ivybridge/cpu.c                              | 1 +
>  arch/x86/cpu/ivybridge/ivybridge.c                        | 1 +
>  arch/x86/cpu/ivybridge/sdram_nop.c                        | 1 +
>  arch/x86/cpu/qemu/qemu.c                                  | 1 +
>  arch/x86/cpu/quark/quark.c                                | 1 +
>  arch/x86/cpu/queensbay/tnc.c                              | 1 +
>  arch/x86/cpu/slimbootloader/slimbootloader.c              | 1 +
>  arch/x86/cpu/tangier/tangier.c                            | 1 +
>  arch/x86/cpu/x86_64/cpu.c                                 | 1 +
>  arch/x86/lib/fsp/fsp_common.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/spl.c                                        | 1 +
>  arch/x86/lib/tpl.c                                        | 1 +
>  arch/xtensa/cpu/cpu.c                                     | 1 +
>  board/BuR/brppt2/board.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/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/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/amlogic/p200/p200.c                                 | 1 +
>  board/amlogic/p201/p201.c                                 | 1 +
>  board/amlogic/p212/p212.c                                 | 1 +
>  board/amlogic/q200/q200.c                                 | 1 +
>  board/amlogic/s400/s400.c                                 | 1 +
>  board/amlogic/sei510/sei510.c                             | 1 +
>  board/amlogic/sei610/sei610.c                             | 1 +
>  board/amlogic/u200/u200.c                                 | 1 +
>  board/amlogic/w400/w400.c                                 | 1 +
>  board/aristainetos/aristainetos.c                         | 1 +
>  board/armltd/vexpress64/pcie.c                            | 1 +
>  board/armltd/vexpress64/vexpress64.c                      | 1 +
>  board/atmel/at91sam9260ek/led.c                           | 1 +
>  board/atmel/common/video_display.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/bluegiga/apx4devkit/apx4devkit.c                    | 1 +
>  board/bosch/guardian/board.c                              | 1 +
>  board/boundary/nitrogen6x/nitrogen6x.c                    | 1 +
>  board/broadcom/bcm963158/bcm963158.c                      | 1 +
>  board/broadcom/bcm968360bg/bcm968360bg.c                  | 1 +
>  board/broadcom/bcm968580xref/bcm968580xref.c              | 1 +
>  board/bticino/mamoj/mamoj.c                               | 1 +
>  board/bticino/mamoj/spl.c                                 | 1 +
>  board/buffalo/lsxl/lsxl.c                                 | 1 +
>  board/ccv/xpress/spl.c                                    | 1 +
>  board/cirrus/edb93xx/edb93xx.c                            | 1 +
>  board/cloudengines/pogo_e02/pogo_e02.c                    | 1 +
>  board/compulab/cm_t35/cm_t35.c                            | 1 +
>  board/corscience/tricorder/tricorder.c                    | 1 +
>  board/cortina/presidio-asic/presidio.c                    | 1 +
>  board/creative/xfi3/xfi3.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_spl.c                 | 1 +
>  board/ea/mx7ulp_com/mx7ulp_com.c                          | 1 +
>  board/elgin/elgin_rv1108/elgin_rv1108.c                   | 1 +
>  board/emulation/qemu-arm/qemu-arm.c                       | 1 +
>  board/engicam/common/spl.c                                | 1 +
>  board/freescale/b4860qds/ddr.c                            | 1 +
>  board/freescale/bsc9131rdb/bsc9131rdb.c                   | 1 +
>  board/freescale/common/sys_eeprom.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/spl.c                          | 1 +
>  board/freescale/imx8qm_mek/spl.c                          | 1 +
>  board/freescale/imx8qxp_mek/spl.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/ls1021aqds/ddr.c                          | 1 +
>  board/freescale/ls1028a/ls1028a.c                         | 1 +
>  board/freescale/ls1043aqds/ls1043aqds.c                   | 1 +
>  board/freescale/ls1043ardb/ls1043ardb.c                   | 1 +
>  board/freescale/ls1046afrwy/ls1046afrwy.c                 | 1 +
>  board/freescale/ls1046aqds/ls1046aqds.c                   | 1 +
>  board/freescale/ls1046ardb/ls1046ardb.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/m5253demo/flash.c                         | 1 +
>  board/freescale/m5282evb/m5282evb.c                       | 1 +
>  board/freescale/mpc8313erdb/sdram.c                       | 1 +
>  board/freescale/mpc8315erdb/sdram.c                       | 1 +
>  board/freescale/mpc8349emds/mpc8349emds.c                 | 1 +
>  board/freescale/mpc8349itx/mpc8349itx.c                   | 1 +
>  board/freescale/mx23evk/mx23evk.c                         | 1 +
>  board/freescale/mx28evk/mx28evk.c                         | 1 +
>  board/freescale/mx6memcal/mx6memcal.c                     | 1 +
>  board/freescale/mx6memcal/spl.c                           | 1 +
>  board/freescale/mx6qarm2/mx6qarm2.c                       | 1 +
>  board/freescale/mx6slevk/mx6slevk.c                       | 1 +
>  board/freescale/mx7ulp_evk/mx7ulp_evk.c                   | 1 +
>  board/freescale/p2041rdb/ddr.c                            | 1 +
>  board/freescale/t102xqds/ddr.c                            | 1 +
>  board/freescale/t102xrdb/ddr.c                            | 1 +
>  board/freescale/t1040qds/ddr.c                            | 1 +
>  board/freescale/t104xrdb/ddr.c                            | 1 +
>  board/freescale/t208xqds/ddr.c                            | 1 +
>  board/freescale/t208xrdb/ddr.c                            | 1 +
>  board/freescale/t4qds/ddr.c                               | 1 +
>  board/freescale/t4rdb/ddr.c                               | 1 +
>  board/gateworks/gw_ventana/gw_ventana.c                   | 1 +
>  board/gateworks/gw_ventana/gw_ventana_spl.c               | 1 +
>  board/google/gru/gru.c                                    | 1 +
>  board/google/veyron/veyron.c                              | 1 +
>  board/gumstix/duovero/duovero.c                           | 1 +
>  board/gumstix/pepper/board.c                              | 1 +
>  board/highbank/highbank.c                                 | 1 +
>  board/hisilicon/hikey/hikey.c                             | 1 +
>  board/hisilicon/hikey960/hikey960.c                       | 1 +
>  board/imgtec/boston/checkboard.c                          | 1 +
>  board/imgtec/ci20/ci20.c                                  | 1 +
>  board/imgtec/xilfpga/xilfpga.c                            | 1 +
>  board/intel/cougarcanyon2/cougarcanyon2.c                 | 1 +
>  board/intel/crownbay/crownbay.c                           | 1 +
>  board/intel/minnowmax/minnowmax.c                         | 1 +
>  board/iomega/iconnect/iconnect.c                          | 1 +
>  board/isee/igep00x0/igep00x0.c                            | 1 +
>  board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c                 | 1 +
>  board/keymile/kmp204x/ddr.c                               | 1 +
>  board/kmc/kzm9g/kzm9g.c                                   | 1 +
>  board/kobol/helios4/helios4.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/spl.c                              | 1 +
>  board/liebherr/xea/xea.c                                  | 1 +
>  board/logicpd/am3517evm/am3517evm.c                       | 1 +
>  board/logicpd/zoom1/zoom1.c                               | 1 +
>  board/maxbcm/maxbcm.c                                     | 1 +
>  board/mediatek/mt7622/mt7622_rfb.c                        | 1 +
>  board/mediatek/mt8518/mt8518_ap1.c                        | 1 +
>  board/microchip/mpfs_icicle/mpfs_icicle.c                 | 1 +
>  board/microchip/pic32mzda/pic32mzda.c                     | 1 +
>  board/mikrotik/crs305-1g-4s/crs305-1g-4s.c                | 1 +
>  board/netgear/dgnd3700v2/dgnd3700v2.c                     | 1 +
>  board/nokia/rx51/rx51.c                                   | 1 +
>  board/novtech/meerkat96/meerkat96.c                       | 1 +
>  board/olimex/mx23_olinuxino/mx23_olinuxino.c              | 1 +
>  board/overo/overo.c                                       | 1 +
>  board/pandora/pandora.c                                   | 1 +
>  board/phytec/pcl063/spl.c                                 | 1 +
>  board/phytec/pcm051/board.c                               | 1 +
>  board/phytium/durian/durian.c                             | 1 +
>  board/pine64/rockpro64_rk3399/rockpro64-rk3399.c          | 1 +
>  board/ppcag/bg0900/bg0900.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/dragonboard820c/dragonboard820c.c          | 1 +
>  board/raidsonic/ib62x0/ib62x0.c                           | 1 +
>  board/renesas/MigoR/migo_r.c                              | 1 +
>  board/renesas/alt/alt.c                                   | 1 +
>  board/renesas/alt/alt_spl.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/gose/gose_spl.c                             | 1 +
>  board/renesas/grpeach/grpeach.c                           | 1 +
>  board/renesas/koelsch/koelsch.c                           | 1 +
>  board/renesas/koelsch/koelsch_spl.c                       | 1 +
>  board/renesas/lager/lager.c                               | 1 +
>  board/renesas/lager/lager_spl.c                           | 1 +
>  board/renesas/porter/porter.c                             | 1 +
>  board/renesas/porter/porter_spl.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/sh7763rdp/sh7763rdp.c                       | 1 +
>  board/renesas/silk/silk.c                                 | 1 +
>  board/renesas/silk/silk_spl.c                             | 1 +
>  board/renesas/stout/stout.c                               | 1 +
>  board/renesas/stout/stout_spl.c                           | 1 +
>  board/renesas/ulcb/ulcb.c                                 | 1 +
>  board/rockchip/evb_rk3399/evb-rk3399.c                    | 1 +
>  board/rockchip/evb_rv1108/evb_rv1108.c                    | 1 +
>  board/samsung/goni/goni.c                                 | 1 +
>  board/sandisk/sansa_fuze_plus/sfp.c                       | 1 +
>  board/sbc8349/sbc8349.c                                   | 1 +
>  board/schulercontrol/sc_sps_1/sc_sps_1.c                  | 1 +
>  board/seeed/linkit-smart-7688/board.c                     | 1 +
>  board/siemens/capricorn/board.c                           | 1 +
>  board/siemens/capricorn/spl.c                             | 1 +
>  board/siemens/common/board.c                              | 1 +
>  board/sifive/fu540/fu540.c                                | 1 +
>  board/silica/pengwyn/board.c                              | 1 +
>  board/sks-kinkel/sksimx6/sksimx6.c                        | 1 +
>  board/socrates/socrates.c                                 | 1 +
>  board/solidrun/clearfog/clearfog.c                        | 1 +
>  board/sr1500/socfpga.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/stv0991/stv0991.c                                | 1 +
>  board/ste/stemmy/stemmy.c                                 | 1 +
>  board/sunxi/dram_sun4i_auto.c                             | 1 +
>  board/sunxi/dram_sun5i_auto.c                             | 1 +
>  board/synopsys/axs10x/axs10x.c                            | 1 +
>  board/synopsys/emsdp/emsdp.c                              | 1 +
>  board/synopsys/iot_devkit/iot_devkit.c                    | 1 +
>  board/synopsys/nsim/nsim.c                                | 1 +
>  board/tbs/tbs2910/tbs2910.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-imx7d/spl.c                         | 1 +
>  board/technexion/tao3530/tao3530.c                        | 1 +
>  board/technologic/ts4600/ts4600.c                         | 1 +
>  board/theobroma-systems/puma_rk3399/puma-rk3399.c         | 1 +
>  board/ti/am3517crane/am3517crane.c                        | 1 +
>  board/ti/beagle/beagle.c                                  | 1 +
>  board/ti/evm/evm.c                                        | 1 +
>  board/ti/ks2_evm/board_k2e.c                              | 1 +
>  board/ti/ks2_evm/board_k2hk.c                             | 1 +
>  board/ti/ks2_evm/board_k2l.c                              | 1 +
>  board/ti/omap5_uevm/evm.c                                 | 1 +
>  board/ti/panda/panda.c                                    | 1 +
>  board/ti/sdp4430/sdp.c                                    | 1 +
>  board/ti/ti814x/evm.c                                     | 1 +
>  board/ti/ti816x/evm.c                                     | 1 +
>  board/timll/devkit8000/devkit8000.c                       | 1 +
>  board/toradex/apalis-tk1/apalis-tk1.c                     | 1 +
>  board/toradex/apalis_t30/apalis_t30.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/common/tdx-common.c                         | 1 +
>  board/toradex/verdin-imx8mm/spl.c                         | 1 +
>  board/toradex/verdin-imx8mm/verdin-imx8mm.c               | 1 +
>  board/tplink/wdr4300/wdr4300.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/ddr.c                                 | 1 +
>  board/wandboard/spl.c                                     | 1 +
>  board/xes/common/board.c                                  | 1 +
>  board/xilinx/zynqmp_r5/board.c                            | 1 +
>  board/zyxel/nsa310s/nsa310s.c                             | 1 +
>  cmd/pci.c                                                 | 1 +
>  cmd/tlv_eeprom.c                                          | 1 +
>  common/board_info.c                                       | 1 +
>  common/init/board_init.c                                  | 1 +
>  common/lcd.c                                              | 1 +
>  common/spl/spl.c                                          | 1 +
>  drivers/clk/clk_stm32mp1.c                                | 1 +
>  drivers/cpu/bmips_cpu.c                                   | 1 +
>  drivers/ddr/altera/sdram_arria10.c                        | 1 +
>  drivers/ddr/altera/sdram_soc64.c                          | 1 +
>  drivers/ddr/fsl/main.c                                    | 1 +
>  drivers/dma/lpc32xx_dma.c                                 | 1 +
>  drivers/fpga/fpga.c                                       | 1 +
>  drivers/mtd/cfi_flash.c                                   | 1 +
>  drivers/mtd/pic32_flash.c                                 | 1 +
>  drivers/pci/fsl_pci_init.c                                | 1 +
>  drivers/pci/pci-uclass.c                                  | 1 +
>  drivers/pci/pci_ftpci100.c                                | 1 +
>  drivers/pci/pci_gt64120.c                                 | 1 +
>  drivers/pci/pci_msc01.c                                   | 1 +
>  drivers/pci/pcie_layerscape_fixup.c                       | 1 +
>  drivers/pci/pcie_layerscape_fixup_common.c                | 1 +
>  drivers/ram/imxrt_sdram.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/stm32_sdram.c                                 | 1 +
>  drivers/timer/cadence-ttc.c                               | 1 +
>  drivers/timer/rockchip_timer.c                            | 1 +
>  drivers/timer/timer-uclass.c                              | 1 +
>  drivers/usb/gadget/f_thor.c                               | 1 +
>  drivers/usb/host/ehci-pci.c                               | 1 +
>  drivers/usb/host/ohci-lpc32xx.c                           | 1 +
>  drivers/usb/host/xhci-pci.c                               | 1 +
>  fs/ubifs/io.c                                             | 1 +
>  include/common.h                                          | 1 -
>  lib/efi/efi_app.c                                         | 1 +
>  lib/time.c                                                | 1 +
>  535 files changed, 535 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c
> index 83246550ec..f032f3e2f2 100644
> --- a/arch/arc/lib/cpu.c
> +++ b/arch/arc/lib/cpu.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <vsprintf.h>
>  #include <asm/arcregs.h>
> diff --git a/arch/arc/lib/init_helpers.c b/arch/arc/lib/init_helpers.c
> index c853f25d34..023eae1907 100644
> --- a/arch/arc/lib/init_helpers.c
> +++ b/arch/arc/lib/init_helpers.c
> @@ -3,6 +3,7 @@
>   * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved.
>   */
>
> +#include <init.h>
>  #include <asm/cache.h>
>  #include <common.h>
>
> diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
> index 3f6af6f5a3..a3d4f14796 100644
> --- a/arch/arm/cpu/arm1136/mx31/generic.c
> +++ b/arch/arm/cpu/arm1136/mx31/generic.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <div64.h>
> +#include <init.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/arch/clock.h>
>  #include <asm/io.h>
> diff --git a/arch/arm/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c
> index 3d07ee6809..a913860491 100644
> --- a/arch/arm/cpu/arm1136/mx31/timer.c
> +++ b/arch/arm/cpu/arm1136/mx31/timer.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/io.h>
>
> diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
> index c78f2cbfc9..4c45810fbe 100644
> --- a/arch/arm/cpu/arm1136/mx35/generic.c
> +++ b/arch/arm/cpu/arm1136/mx35/generic.c
> @@ -9,6 +9,7 @@
>  #include <common.h>
>  #include <clock_legacy.h>
>  #include <div64.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <linux/errno.h>
> diff --git a/arch/arm/cpu/arm1136/mx35/timer.c b/arch/arm/cpu/arm1136/mx35/timer.c
> index c1cdf35fb2..cb351ecf76 100644
> --- a/arch/arm/cpu/arm1136/mx35/timer.c
> +++ b/arch/arm/cpu/arm1136/mx35/timer.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/arch/crm_regs.h>
> diff --git a/arch/arm/cpu/arm920t/ep93xx/timer.c b/arch/arm/cpu/arm920t/ep93xx/timer.c
> index 4829c996be..0ee6034220 100644
> --- a/arch/arm/cpu/arm920t/ep93xx/timer.c
> +++ b/arch/arm/cpu/arm920t/ep93xx/timer.c
> @@ -12,6 +12,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <linux/types.h>
>  #include <asm/arch/ep93xx.h>
> diff --git a/arch/arm/cpu/arm926ejs/armada100/cpu.c b/arch/arm/cpu/arm926ejs/armada100/cpu.c
> index 0c81de7e36..96726b3144 100644
> --- a/arch/arm/cpu/arm926ejs/armada100/cpu.c
> +++ b/arch/arm/cpu/arm926ejs/armada100/cpu.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.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 f4e1f0db09..da0615faf1 100644
> --- a/arch/arm/cpu/arm926ejs/armada100/dram.c
> +++ b/arch/arm/cpu/arm926ejs/armada100/dram.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.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 f4962ec45f..b9941fcb2f 100644
> --- a/arch/arm/cpu/arm926ejs/armada100/timer.c
> +++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/arch/cpu.h>
>  #include <asm/arch/armada100.h>
> diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
> index 2bc3513abf..ee15a9453d 100644
> --- a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
> +++ b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <net.h>
>  #include <netdev.h>
>  #include <asm/arch/cpu.h>
> diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/timer.c b/arch/arm/cpu/arm926ejs/lpc32xx/timer.c
> index 3a896d10ca..46b7b46659 100644
> --- a/arch/arm/cpu/arm926ejs/lpc32xx/timer.c
> +++ b/arch/arm/cpu/arm926ejs/lpc32xx/timer.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/arch/cpu.h>
>  #include <asm/arch/clk.h>
> diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
> index ef8d2d202d..8f6cd4dc19 100644
> --- a/arch/arm/cpu/arm926ejs/mx25/generic.c
> +++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
> @@ -11,6 +11,7 @@
>  #include <common.h>
>  #include <clock_legacy.h>
>  #include <div64.h>
> +#include <init.h>
>  #include <net.h>
>  #include <netdev.h>
>  #include <vsprintf.h>
> diff --git a/arch/arm/cpu/arm926ejs/mx25/timer.c b/arch/arm/cpu/arm926ejs/mx25/timer.c
> index 04698fe563..7e2698b605 100644
> --- a/arch/arm/cpu/arm926ejs/mx25/timer.c
> +++ b/arch/arm/cpu/arm926ejs/mx25/timer.c
> @@ -20,6 +20,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.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 f51f0df8ec..193588ea10 100644
> --- a/arch/arm/cpu/arm926ejs/mx27/timer.c
> +++ b/arch/arm/cpu/arm926ejs/mx27/timer.c
> @@ -17,6 +17,7 @@
>
>  #include <common.h>
>  #include <div64.h>
> +#include <init.h>
>  #include <time.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 f65053c4b6..72988417ac 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
> @@ -12,6 +12,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <net.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 9168b91f27..83dd8b625e 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <config.h>
> +#include <init.h>
>  #include <serial.h>
>  #include <asm/io.h>
>  #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c
> index 226401dd6e..b6fdc88be7 100644
> --- a/arch/arm/cpu/arm926ejs/mxs/timer.c
> +++ b/arch/arm/cpu/arm926ejs/mxs/timer.c
> @@ -10,6 +10,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c
> index 51c4a730f4..f5192240e4 100644
> --- a/arch/arm/cpu/arm926ejs/spear/cpu.c
> +++ b/arch/arm/cpu/arm926ejs/spear/cpu.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/hardware.h>
>  #include <asm/arch/spr_misc.h>
> diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c
> index a919a455eb..7b14ba05b4 100644
> --- a/arch/arm/cpu/arm926ejs/spear/spl.c
> +++ b/arch/arm/cpu/arm926ejs/spear/spl.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <version.h>
>  #include <asm/io.h>
> diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c
> index 28c09e9fd6..9db1c74b36 100644
> --- a/arch/arm/cpu/arm926ejs/spear/timer.c
> +++ b/arch/arm/cpu/arm926ejs/spear/timer.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <asm/arch/hardware.h>
> diff --git a/arch/arm/cpu/armv7/arch_timer.c b/arch/arm/cpu/armv7/arch_timer.c
> index 2eb571050a..871629c233 100644
> --- a/arch/arm/cpu/armv7/arch_timer.c
> +++ b/arch/arm/cpu/armv7/arch_timer.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <div64.h>
> diff --git a/arch/arm/cpu/armv7/iproc-common/timer.c b/arch/arm/cpu/armv7/iproc-common/timer.c
> index 668b5e11a6..5c109764e9 100644
> --- a/arch/arm/cpu/armv7/iproc-common/timer.c
> +++ b/arch/arm/cpu/armv7/iproc-common/timer.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <div64.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <asm/iproc-common/timer.h>
> diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
> index c544f38641..e9464ee7e4 100644
> --- a/arch/arm/cpu/armv7/ls102xa/cpu.c
> +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <net.h>
>  #include <vsprintf.h>
>  #include <asm/arch/clock.h>
> diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c
> index a5f4e31ac7..46ade4ae86 100644
> --- a/arch/arm/cpu/armv7/ls102xa/timer.c
> +++ b/arch/arm/cpu/armv7/ls102xa/timer.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <div64.h>
> diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
> index 5f4076d6b7..7790f087a0 100644
> --- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
> +++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
> @@ -5,6 +5,7 @@
>   */
>  #include <common.h>
>  #include <fdtdec.h>
> +#include <init.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 e54cfb06dc..d2b5b4d3fc 100644
> --- a/arch/arm/cpu/armv7/s5p-common/timer.c
> +++ b/arch/arm/cpu/armv7/s5p-common/timer.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <div64.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <asm/arch/pwm.h>
> diff --git a/arch/arm/cpu/armv7/stv0991/timer.c b/arch/arm/cpu/armv7/stv0991/timer.c
> index 695bdd7a5c..5adccab012 100644
> --- a/arch/arm/cpu/armv7/stv0991/timer.c
> +++ b/arch/arm/cpu/armv7/stv0991/timer.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <asm/arch-stv0991/hardware.h>
> diff --git a/arch/arm/cpu/armv7/sunxi/timer.c b/arch/arm/cpu/armv7/sunxi/timer.c
> index 6bda5fbbb6..4f6a66d803 100644
> --- a/arch/arm/cpu/armv7/sunxi/timer.c
> +++ b/arch/arm/cpu/armv7/sunxi/timer.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <asm/arch/timer.h>
> diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
> index c1ba69893f..da43e34394 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 <cpu_func.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/cache.h>
>  #include <asm/io.h>
> diff --git a/arch/arm/cpu/armv7/vf610/timer.c b/arch/arm/cpu/armv7/vf610/timer.c
> index f858de953d..229e9e959e 100644
> --- a/arch/arm/cpu/armv7/vf610/timer.c
> +++ b/arch/arm/cpu/armv7/vf610/timer.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <div64.h>
> diff --git a/arch/arm/cpu/armv7m/systick-timer.c b/arch/arm/cpu/armv7m/systick-timer.c
> index 5c310d306d..dbe1b61977 100644
> --- a/arch/arm/cpu/armv7m/systick-timer.c
> +++ b/arch/arm/cpu/armv7m/systick-timer.c
> @@ -22,6 +22,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>
> diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
> index c0201341ea..ec40df41f6 100644
> --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
> +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
> @@ -8,6 +8,7 @@
>  #include <cpu_func.h>
>  #include <env.h>
>  #include <image.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/cache.h>
>  #include <asm/io.h>
> diff --git a/arch/arm/cpu/armv8/s32v234/cpu.c b/arch/arm/cpu/armv8/s32v234/cpu.c
> index f910b6ed72..5394a6697e 100644
> --- a/arch/arm/cpu/armv8/s32v234/cpu.c
> +++ b/arch/arm/cpu/armv8/s32v234/cpu.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.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 98f526e252..bc07dae318 100644
> --- a/arch/arm/cpu/armv8/s32v234/generic.c
> +++ b/arch/arm/cpu/armv8/s32v234/generic.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <clock_legacy.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/imx-regs.h>
> diff --git a/arch/arm/cpu/pxa/cpuinfo.c b/arch/arm/cpu/pxa/cpuinfo.c
> index 5379e13e2b..0d9542f998 100644
> --- a/arch/arm/cpu/pxa/cpuinfo.c
> +++ b/arch/arm/cpu/pxa/cpuinfo.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <errno.h>
>  #include <linux/compiler.h>
> diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c
> index ecf85d2f14..ea91d8aaec 100644
> --- a/arch/arm/cpu/pxa/pxa2xx.c
> +++ b/arch/arm/cpu/pxa/pxa2xx.c
> @@ -11,6 +11,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <irq_func.h>
>  #include <asm/arch/pxa-regs.h>
>  #include <asm/cache.h>
> diff --git a/arch/arm/cpu/pxa/timer.c b/arch/arm/cpu/pxa/timer.c
> index 169fed808b..8e9d610441 100644
> --- a/arch/arm/cpu/pxa/timer.c
> +++ b/arch/arm/cpu/pxa/timer.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>
>  int timer_init(void)
> diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
> index 8a24e34f62..5d5437cbbc 100644
> --- a/arch/arm/lib/spl.c
> +++ b/arch/arm/lib/spl.c
> @@ -9,6 +9,7 @@
>
>  #include <common.h>
>  #include <config.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <image.h>
>  #include <asm/cache.h>
> diff --git a/arch/arm/lib/stack.c b/arch/arm/lib/stack.c
> index c89a219dd2..96a248c0a9 100644
> --- a/arch/arm/lib/stack.c
> +++ b/arch/arm/lib/stack.c
> @@ -11,6 +11,7 @@
>   * Marius Groeger <mgroeger at sysgo.de>
>   */
>  #include <common.h>
> +#include <init.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/arch/arm/mach-aspeed/ast2500-board.c b/arch/arm/mach-aspeed/ast2500-board.c
> index e7edd544e2..20594e0efb 100644
> --- a/arch/arm/mach-aspeed/ast2500-board.c
> +++ b/arch/arm/mach-aspeed/ast2500-board.c
> @@ -4,6 +4,7 @@
>   */
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <timer.h>
>  #include <asm/io.h>
> diff --git a/arch/arm/mach-at91/arm920t/cpu.c b/arch/arm/mach-at91/arm920t/cpu.c
> index 42d0d2269f..44c079c0fd 100644
> --- a/arch/arm/mach-at91/arm920t/cpu.c
> +++ b/arch/arm/mach-at91/arm920t/cpu.c
> @@ -11,6 +11,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/hardware.h>
>  #include <asm/arch/clk.h>
> diff --git a/arch/arm/mach-at91/arm920t/timer.c b/arch/arm/mach-at91/arm920t/timer.c
> index 3aef9538b4..1e014ad9c9 100644
> --- a/arch/arm/mach-at91/arm920t/timer.c
> +++ b/arch/arm/mach-at91/arm920t/timer.c
> @@ -14,6 +14,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>
>  #include <asm/io.h>
> diff --git a/arch/arm/mach-at91/arm926ejs/cpu.c b/arch/arm/mach-at91/arm926ejs/cpu.c
> index e9b4e06595..761edb6df5 100644
> --- a/arch/arm/mach-at91/arm926ejs/cpu.c
> +++ b/arch/arm/mach-at91/arm926ejs/cpu.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <vsprintf.h>
>  #include <asm/io.h>
>  #include <asm/arch/hardware.h>
> diff --git a/arch/arm/mach-at91/arm926ejs/timer.c b/arch/arm/mach-at91/arm926ejs/timer.c
> index 31ad0bf702..42ef349966 100644
> --- a/arch/arm/mach-at91/arm926ejs/timer.c
> +++ b/arch/arm/mach-at91/arm926ejs/timer.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <asm/arch/hardware.h>
> diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c
> index 4474a96743..a8f4356ce9 100644
> --- a/arch/arm/mach-at91/armv7/cpu.c
> +++ b/arch/arm/mach-at91/armv7/cpu.c
> @@ -10,6 +10,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <vsprintf.h>
>  #include <asm/io.h>
>  #include <asm/arch/hardware.h>
> diff --git a/arch/arm/mach-at91/armv7/timer.c b/arch/arm/mach-at91/armv7/timer.c
> index 15c036cc27..a6346c01b2 100644
> --- a/arch/arm/mach-at91/armv7/timer.c
> +++ b/arch/arm/mach-at91/armv7/timer.c
> @@ -9,6 +9,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <asm/arch/hardware.h>
> diff --git a/arch/arm/mach-at91/spl_at91.c b/arch/arm/mach-at91/spl_at91.c
> index 822f877de7..b78cafdd9c 100644
> --- a/arch/arm/mach-at91/spl_at91.c
> +++ b/arch/arm/mach-at91/spl_at91.c
> @@ -10,6 +10,7 @@
>
>  #include <common.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/at91_common.h>
>  #include <asm/arch/at91sam9_matrix.h>
> diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c
> index 6ee0e1c24c..f40bc531d4 100644
> --- a/arch/arm/mach-at91/spl_atmel.c
> +++ b/arch/arm/mach-at91/spl_atmel.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/at91_common.h>
>  #include <asm/arch/at91_pit.h>
> diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
> index 9966d6c833..f4d00d892d 100644
> --- a/arch/arm/mach-bcm283x/init.c
> +++ b/arch/arm/mach-bcm283x/init.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.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 9fd6564d04..40dd44af67 100644
> --- a/arch/arm/mach-davinci/cpu.c
> +++ b/arch/arm/mach-davinci/cpu.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch/hardware.h>
>  #include <asm/io.h>
>
> diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c
> index 822e0dc4a1..07bf19b5e4 100644
> --- a/arch/arm/mach-davinci/da850_lowlevel.c
> +++ b/arch/arm/mach-davinci/da850_lowlevel.c
> @@ -6,6 +6,7 @@
>   * Heiko Schocher, DENX Software Engineering, hs at denx.de.
>   */
>  #include <common.h>
> +#include <init.h>
>  #include <nand.h>
>  #include <ns16550.h>
>  #include <post.h>
> diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c
> index d44e840aa0..5fea935d6e 100644
> --- a/arch/arm/mach-davinci/spl.c
> +++ b/arch/arm/mach-davinci/spl.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <config.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/u-boot.h>
>  #include <asm/utils.h>
> diff --git a/arch/arm/mach-davinci/timer.c b/arch/arm/mach-davinci/timer.c
> index 9846463c60..ebe985f795 100644
> --- a/arch/arm/mach-davinci/timer.c
> +++ b/arch/arm/mach-davinci/timer.c
> @@ -21,6 +21,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <asm/arch/timer_defs.h>
> diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
> index ecd0105121..97d6ca8fc2 100644
> --- a/arch/arm/mach-exynos/lowlevel_init.c
> +++ b/arch/arm/mach-exynos/lowlevel_init.c
> @@ -27,6 +27,7 @@
>  #include <config.h>
>  #include <debug_uart.h>
>  #include <asm/system.h>
> +#include <init.h>
>  #include <asm/arch/cpu.h>
>  #include <asm/arch/dmc.h>
>  #include <asm/arch/power.h>
> diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
> index 8b2c5c79c0..d9672e79ef 100644
> --- a/arch/arm/mach-exynos/spl_boot.c
> +++ b/arch/arm/mach-exynos/spl_boot.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <config.h>
> +#include <init.h>
>
>  #include <asm/cache.h>
>  #include <asm/arch/clock.h>
> diff --git a/arch/arm/mach-highbank/timer.c b/arch/arm/mach-highbank/timer.c
> index cd08ff444d..2423a0e378 100644
> --- a/arch/arm/mach-highbank/timer.c
> +++ b/arch/arm/mach-highbank/timer.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch-armv7/systimer.h>
>
> diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
> index 0a2c43378f..97464391d5 100644
> --- a/arch/arm/mach-imx/cpu.c
> +++ b/arch/arm/mach-imx/cpu.c
> @@ -8,6 +8,7 @@
>
>  #include <bootm.h>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <netdev.h>
>  #include <linux/errno.h>
> diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
> index 89229da3b6..1551717cc0 100644
> --- a/arch/arm/mach-imx/imx8m/soc.c
> +++ b/arch/arm/mach-imx/imx8m/soc.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
> diff --git a/arch/arm/mach-imx/imxrt/soc.c b/arch/arm/mach-imx/imxrt/soc.c
> index e1eea23035..8d5fae9a97 100644
> --- a/arch/arm/mach-imx/imxrt/soc.c
> +++ b/arch/arm/mach-imx/imxrt/soc.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/armv7_mpu.h>
>
> diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
> index 4aafeed188..60e688c518 100644
> --- a/arch/arm/mach-imx/mx7/soc.c
> +++ b/arch/arm/mach-imx/mx7/soc.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/arch/clock.h>
> diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
> index fd3fa04600..4af3e6985c 100644
> --- a/arch/arm/mach-imx/spl.c
> +++ b/arch/arm/mach-imx/spl.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c
> index 5a292c3964..db1c2c1e01 100644
> --- a/arch/arm/mach-imx/syscounter.c
> +++ b/arch/arm/mach-imx/syscounter.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <div64.h>
> diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c
> index 5fe5c51f6a..fa1941aec4 100644
> --- a/arch/arm/mach-imx/timer.c
> +++ b/arch/arm/mach-imx/timer.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <div64.h>
> diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c
> index b692806352..ddc9f3c4f4 100644
> --- a/arch/arm/mach-k3/am6_init.c
> +++ b/arch/arm/mach-k3/am6_init.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.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 af1020be95..53cad78dd5 100644
> --- a/arch/arm/mach-k3/common.c
> +++ b/arch/arm/mach-k3/common.c
> @@ -9,6 +9,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <image.h>
> +#include <init.h>
>  #include <spl.h>
>  #include "common.h"
>  #include <dm.h>
> diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c
> index 71fc20c30b..7a999f9d9c 100644
> --- a/arch/arm/mach-k3/j721e_init.c
> +++ b/arch/arm/mach-k3/j721e_init.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/io.h>
>  #include <asm/armv7_mpu.h>
> diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c
> index 59fd029e4c..d947d40eac 100644
> --- a/arch/arm/mach-keystone/init.c
> +++ b/arch/arm/mach-keystone/init.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <ns16550.h>
>  #include <asm/cache.h>
>  #include <asm/io.h>
> diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
> index 7441052a55..1d79927ac7 100644
> --- a/arch/arm/mach-keystone/keystone.c
> +++ b/arch/arm/mach-keystone/keystone.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.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 c56620dc5a..d328fee8bd 100644
> --- a/arch/arm/mach-kirkwood/cpu.c
> +++ b/arch/arm/mach-kirkwood/cpu.c
> @@ -9,6 +9,7 @@
>  #include <command.h>
>  #include <cpu_func.h>
>  #include <env.h>
> +#include <init.h>
>  #include <net.h>
>  #include <netdev.h>
>  #include <asm/cache.h>
> diff --git a/arch/arm/mach-mediatek/cpu.c b/arch/arm/mach-mediatek/cpu.c
> index 5e5f3f0842..c329e7cc98 100644
> --- a/arch/arm/mach-mediatek/cpu.c
> +++ b/arch/arm/mach-mediatek/cpu.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <wdt.h>
>  #include <dm/uclass-internal.h>
>
> diff --git a/arch/arm/mach-mediatek/mt7622/init.c b/arch/arm/mach-mediatek/mt7622/init.c
> index a715378127..7f6ce80f37 100644
> --- a/arch/arm/mach-mediatek/mt7622/init.c
> +++ b/arch/arm/mach-mediatek/mt7622/init.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <asm/armv8/mmu.h>
>  #include <asm/cache.h>
>
> diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c
> index ba91a6eaa6..098892802b 100644
> --- a/arch/arm/mach-mediatek/mt7629/init.c
> +++ b/arch/arm/mach-mediatek/mt7629/init.c
> @@ -8,6 +8,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <asm/arch/misc.h>
>  #include <asm/sections.h>
> diff --git a/arch/arm/mach-mediatek/mt8512/init.c b/arch/arm/mach-mediatek/mt8512/init.c
> index 4e6b710c11..9680251941 100644
> --- a/arch/arm/mach-mediatek/mt8512/init.c
> +++ b/arch/arm/mach-mediatek/mt8512/init.c
> @@ -10,6 +10,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <wdt.h>
>  #include <asm/arch/misc.h>
> diff --git a/arch/arm/mach-mediatek/mt8516/init.c b/arch/arm/mach-mediatek/mt8516/init.c
> index b038437a17..13be391221 100644
> --- a/arch/arm/mach-mediatek/mt8516/init.c
> +++ b/arch/arm/mach-mediatek/mt8516/init.c
> @@ -10,6 +10,7 @@
>  #include <cpu_func.h>
>  #include <dm.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <asm/arch/misc.h>
>  #include <asm/armv8/mmu.h>
> diff --git a/arch/arm/mach-mediatek/mt8518/init.c b/arch/arm/mach-mediatek/mt8518/init.c
> index c46cc5fcaf..531a403da1 100644
> --- a/arch/arm/mach-mediatek/mt8518/init.c
> +++ b/arch/arm/mach-mediatek/mt8518/init.c
> @@ -11,6 +11,7 @@
>  #include <cpu_func.h>
>  #include <dm.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <asm/arch/misc.h>
>  #include <asm/armv8/mmu.h>
> diff --git a/arch/arm/mach-mediatek/spl.c b/arch/arm/mach-mediatek/spl.c
> index 37f1f219b2..927175c5a3 100644
> --- a/arch/arm/mach-mediatek/spl.c
> +++ b/arch/arm/mach-mediatek/spl.c
> @@ -7,6 +7,7 @@
>  #include <clk.h>
>  #include <common.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <spl.h>
>
>  #include "init.h"
> diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
> index 4b88afa9b7..bfae0c36ea 100644
> --- a/arch/arm/mach-meson/board-info.c
> +++ b/arch/arm/mach-meson/board-info.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <dm.h>
>  #include <linux/bitfield.h>
> diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
> index 17d2d43bab..d6e84f1e20 100644
> --- a/arch/arm/mach-mvebu/armada3700/cpu.c
> +++ b/arch/arm/mach-mvebu/armada3700/cpu.c
> @@ -8,6 +8,7 @@
>  #include <cpu_func.h>
>  #include <dm.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <linux/libfdt.h>
>  #include <asm/io.h>
>  #include <asm/system.h>
> diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
> index fb241c7e4d..ab8b02956b 100644
> --- a/arch/arm/mach-mvebu/cpu.c
> +++ b/arch/arm/mach-mvebu/cpu.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <ahci.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <linux/mbus.h>
>  #include <asm/io.h>
>  #include <asm/pl310.h>
> diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
> index 70fef3b573..c6ecd5bee0 100644
> --- a/arch/arm/mach-mvebu/spl.c
> +++ b/arch/arm/mach-mvebu/spl.c
> @@ -8,6 +8,7 @@
>  #include <debug_uart.h>
>  #include <fdtdec.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/io.h>
>  #include <asm/arch/cpu.h>
> diff --git a/arch/arm/mach-mvebu/timer.c b/arch/arm/mach-mvebu/timer.c
> index 2f6b4d1702..50b78cb07b 100644
> --- a/arch/arm/mach-mvebu/timer.c
> +++ b/arch/arm/mach-mvebu/timer.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/soc.h>
>
> diff --git a/arch/arm/mach-omap2/am33xx/chilisom.c b/arch/arm/mach-omap2/am33xx/chilisom.c
> index 3942305108..15b6b35ae7 100644
> --- a/arch/arm/mach-omap2/am33xx/chilisom.c
> +++ b/arch/arm/mach-omap2/am33xx/chilisom.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.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/clock.c b/arch/arm/mach-omap2/am33xx/clock.c
> index 8c61547ee9..862c5e0905 100644
> --- a/arch/arm/mach-omap2/am33xx/clock.c
> +++ b/arch/arm/mach-omap2/am33xx/clock.c
> @@ -9,6 +9,7 @@
>   */
>  #include <common.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <asm/arch/cpu.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/hardware.h>
> diff --git a/arch/arm/mach-omap2/am33xx/sys_info.c b/arch/arm/mach-omap2/am33xx/sys_info.c
> index 17b46619b5..338f6afcae 100644
> --- a/arch/arm/mach-omap2/am33xx/sys_info.c
> +++ b/arch/arm/mach-omap2/am33xx/sys_info.c
> @@ -12,6 +12,7 @@
>   */
>
>  #include <common.h>
> +#include <init.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 9aff83e9df..f968a26d64 100644
> --- a/arch/arm/mach-omap2/clocks-common.c
> +++ b/arch/arm/mach-omap2/clocks-common.c
> @@ -15,6 +15,7 @@
>  #include <common.h>
>  #include <hang.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <asm/omap_common.h>
>  #include <asm/gpio.h>
>  #include <asm/arch/clock.h>
> diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c
> index 772b4c4db5..7a7086776e 100644
> --- a/arch/arm/mach-omap2/hwinit-common.c
> +++ b/arch/arm/mach-omap2/hwinit-common.c
> @@ -13,6 +13,7 @@
>  #include <common.h>
>  #include <debug_uart.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/arch/sys_proto.h>
>  #include <linux/sizes.h>
> diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
> index 60de0d6052..b893fb732e 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 <dm.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/io.h>
>  #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c
> index a8bd428e0c..4cfa132388 100644
> --- a/arch/arm/mach-omap2/omap3/emif4.c
> +++ b/arch/arm/mach-omap2/omap3/emif4.c
> @@ -10,6 +10,7 @@
>   */
>
>  #include <common.h>
> +#include <init.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 861d01d6df..1d65ed6227 100644
> --- a/arch/arm/mach-omap2/omap3/sdrc.c
> +++ b/arch/arm/mach-omap2/omap3/sdrc.c
> @@ -22,6 +22,7 @@
>   */
>
>  #include <common.h>
> +#include <init.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 dbb68f718d..7752dd1565 100644
> --- a/arch/arm/mach-omap2/timer.c
> +++ b/arch/arm/mach-omap2/timer.c
> @@ -16,6 +16,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <asm/arch/cpu.h>
> diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c
> index 7d57dd257f..d9abcacbb4 100644
> --- a/arch/arm/mach-orion5x/cpu.c
> +++ b/arch/arm/mach-orion5x/cpu.c
> @@ -10,6 +10,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <net.h>
>  #include <netdev.h>
>  #include <asm/cache.h>
> diff --git a/arch/arm/mach-orion5x/timer.c b/arch/arm/mach-orion5x/timer.c
> index 077eb63e74..a64d572112 100644
> --- a/arch/arm/mach-orion5x/timer.c
> +++ b/arch/arm/mach-orion5x/timer.c
> @@ -8,6 +8,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>
> diff --git a/arch/arm/mach-owl/soc.c b/arch/arm/mach-owl/soc.c
> index 8a434bd496..7d3f6f6285 100644
> --- a/arch/arm/mach-owl/soc.c
> +++ b/arch/arm/mach-owl/soc.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <asm/cache.h>
>  #include <linux/arm-smccc.h>
>  #include <linux/psci.h>
> diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-rmobile/board.c
> index 8a2d3ce621..a10371f74e 100644
> --- a/arch/arm/mach-rmobile/board.c
> +++ b/arch/arm/mach-rmobile/board.c
> @@ -4,6 +4,7 @@
>   * (C) Copyright 2012 Renesas Solutions Corp.
>   */
>  #include <common.h>
> +#include <init.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 9b34cba047..fdbbd72e28 100644
> --- a/arch/arm/mach-rmobile/cpu_info.c
> +++ b/arch/arm/mach-rmobile/cpu_info.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <asm/cache.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <env.h>
>  #include <linux/ctype.h>
> diff --git a/arch/arm/mach-rmobile/timer.c b/arch/arm/mach-rmobile/timer.c
> index 9fcab446a5..f88ccfde9f 100644
> --- a/arch/arm/mach-rmobile/timer.c
> +++ b/arch/arm/mach-rmobile/timer.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <div64.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <asm/arch-armv7/globaltimer.h>
> diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c
> index 4b0e99299a..08b7d3519d 100644
> --- a/arch/arm/mach-rockchip/cpu-info.c
> +++ b/arch/arm/mach-rockchip/cpu-info.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch-rockchip/clock.h>
>  #include <asm/arch-rockchip/cru.h>
> diff --git a/arch/arm/mach-rockchip/px30-board-tpl.c b/arch/arm/mach-rockchip/px30-board-tpl.c
> index 8c8976f61c..085e650620 100644
> --- a/arch/arm/mach-rockchip/px30-board-tpl.c
> +++ b/arch/arm/mach-rockchip/px30-board-tpl.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <debug_uart.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <spl.h>
>  #include <version.h>
> diff --git a/arch/arm/mach-rockchip/px30/px30.c b/arch/arm/mach-rockchip/px30/px30.c
> index 5014ee83d7..6fcef63c1b 100644
> --- a/arch/arm/mach-rockchip/px30/px30.c
> +++ b/arch/arm/mach-rockchip/px30/px30.c
> @@ -5,6 +5,7 @@
>  #include <common.h>
>  #include <clk.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <asm/armv8/mmu.h>
>  #include <asm/io.h>
>  #include <asm/arch-rockchip/grf_px30.h>
> diff --git a/arch/arm/mach-rockchip/rk3036-board-spl.c b/arch/arm/mach-rockchip/rk3036-board-spl.c
> index fbc89b66c4..6eb89e15b8 100644
> --- a/arch/arm/mach-rockchip/rk3036-board-spl.c
> +++ b/arch/arm/mach-rockchip/rk3036-board-spl.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <debug_uart.h>
> +#include <init.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 e0a6e4b025..e9e020ff3f 100644
> --- a/arch/arm/mach-rockchip/rk3036/rk3036.c
> +++ b/arch/arm/mach-rockchip/rk3036/rk3036.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.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/rk3036/sdram_rk3036.c b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
> index c39cbb8111..3874716e52 100644
> --- a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
> +++ b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
> @@ -3,6 +3,7 @@
>   * (C) Copyright 2015 Rockchip Electronics Co., Ltd
>   */
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/types.h>
>  #include <asm/arch-rockchip/cru_rk3036.h>
> diff --git a/arch/arm/mach-rockchip/rk3128/rk3128.c b/arch/arm/mach-rockchip/rk3128/rk3128.c
> index ee176de80b..740bd2ba07 100644
> --- a/arch/arm/mach-rockchip/rk3128/rk3128.c
> +++ b/arch/arm/mach-rockchip/rk3128/rk3128.c
> @@ -3,6 +3,7 @@
>   * Copyright (c) 2017 Rockchip Electronics Co., Ltd
>   */
>  #include <common.h>
> +#include <init.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c
> index e52466fb6f..dca9de28d4 100644
> --- a/arch/arm/mach-rockchip/rk3188/rk3188.c
> +++ b/arch/arm/mach-rockchip/rk3188/rk3188.c
> @@ -5,6 +5,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <syscon.h>
>  #include <asm/io.h>
>  #include <asm/arch-rockchip/bootrom.h>
> diff --git a/arch/arm/mach-rockchip/rk322x/rk322x.c b/arch/arm/mach-rockchip/rk322x/rk322x.c
> index 562117e6c1..ad4ac62e51 100644
> --- a/arch/arm/mach-rockchip/rk322x/rk322x.c
> +++ b/arch/arm/mach-rockchip/rk322x/rk322x.c
> @@ -2,6 +2,7 @@
>  /*
>   * (C) Copyright 2019 Rockchip Electronics Co., Ltd
>   */
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch-rockchip/bootrom.h>
>  #include <asm/arch-rockchip/grf_rk322x.h>
> diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
> index edf5994709..35a5c79728 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 <init.h>
>  #include <malloc.h>
>  #include <asm/io.h>
>  #include <asm/arch/grf_rk3308.h>
> diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c
> index 8c81242e5d..7c85b2663c 100644
> --- a/arch/arm/mach-rockchip/rk3328/rk3328.c
> +++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch-rockchip/bootrom.h>
>  #include <asm/arch-rockchip/hardware.h>
>  #include <asm/arch-rockchip/grf_rk3328.h>
> diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c
> index 20ae797794..bcc230c900 100644
> --- a/arch/arm/mach-rockchip/rk3368/rk3368.c
> +++ b/arch/arm/mach-rockchip/rk3368/rk3368.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <syscon.h>
>  #include <asm/armv8/mmu.h>
>  #include <asm/io.h>
> diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
> index 3a51194108..aaa7246393 100644
> --- a/arch/arm/mach-rockchip/rk3399/rk3399.c
> +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <fdt_support.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <spl_gpio.h>
>  #include <syscon.h>
> diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
> index 2796e41369..0d74989adb 100644
> --- a/arch/arm/mach-rockchip/spl.c
> +++ b/arch/arm/mach-rockchip/spl.c
> @@ -8,6 +8,7 @@
>  #include <dm.h>
>  #include <hang.h>
>  #include <image.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <spl.h>
>  #include <asm/arch-rockchip/bootrom.h>
> diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c
> index a2b8d31cbd..2de4e980e4 100644
> --- a/arch/arm/mach-rockchip/tpl.c
> +++ b/arch/arm/mach-rockchip/tpl.c
> @@ -7,6 +7,7 @@
>  #include <debug_uart.h>
>  #include <dm.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <spl.h>
>  #include <version.h>
> diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
> index 7c8c05cc31..340abf9305 100644
> --- a/arch/arm/mach-socfpga/board.c
> +++ b/arch/arm/mach-socfpga/board.c
> @@ -8,6 +8,7 @@
>  #include <common.h>
>  #include <errno.h>
>  #include <fdtdec.h>
> +#include <init.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.c b/arch/arm/mach-socfpga/clock_manager.c
> index dbb10ecb68..0a6025fffa 100644
> --- a/arch/arm/mach-socfpga/clock_manager.c
> +++ b/arch/arm/mach-socfpga/clock_manager.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <wait_bit.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock_manager.h>
> diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
> index 0158f4f04c..557305c703 100644
> --- a/arch/arm/mach-socfpga/misc.c
> +++ b/arch/arm/mach-socfpga/misc.c
> @@ -7,6 +7,7 @@
>  #include <cpu_func.h>
>  #include <hang.h>
>  #include <asm/cache.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <errno.h>
>  #include <fdtdec.h>
> diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c
> index d56349b7f3..bf978053ca 100644
> --- a/arch/arm/mach-socfpga/misc_arria10.c
> +++ b/arch/arm/mach-socfpga/misc_arria10.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <errno.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <netdev.h>
>  #include <ns16550.h>
> diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
> index 21eb934e56..39acc8cfdb 100644
> --- a/arch/arm/mach-socfpga/misc_gen5.c
> +++ b/arch/arm/mach-socfpga/misc_gen5.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.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 a3f5b4364e..a87dd44181 100644
> --- a/arch/arm/mach-socfpga/misc_s10.c
> +++ b/arch/arm/mach-socfpga/misc_s10.c
> @@ -9,6 +9,7 @@
>  #include <env.h>
>  #include <errno.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <netdev.h>
>  #include <asm/io.h>
> diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c
> index d2f52f2f2c..45aea4ab6c 100644
> --- a/arch/arm/mach-socfpga/spl_a10.c
> +++ b/arch/arm/mach-socfpga/spl_a10.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <hang.h>
> +#include <init.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 aa9f3e646c..0192cccbd1 100644
> --- a/arch/arm/mach-socfpga/spl_agilex.c
> +++ b/arch/arm/mach-socfpga/spl_agilex.c
> @@ -4,6 +4,7 @@
>   *
>   */
>
> +#include <init.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 e9967ac450..6c9f45396d 100644
> --- a/arch/arm/mach-socfpga/spl_gen5.c
> +++ b/arch/arm/mach-socfpga/spl_gen5.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <hang.h>
> +#include <init.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 08427dd83e..0f8588ba0c 100644
> --- a/arch/arm/mach-socfpga/spl_s10.c
> +++ b/arch/arm/mach-socfpga/spl_s10.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <hang.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/u-boot.h>
>  #include <asm/utils.h>
> diff --git a/arch/arm/mach-socfpga/timer.c b/arch/arm/mach-socfpga/timer.c
> index f1c0262ae5..a58f1cf9d3 100644
> --- a/arch/arm/mach-socfpga/timer.c
> +++ b/arch/arm/mach-socfpga/timer.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/timer.h>
>
> diff --git a/arch/arm/mach-socfpga/timer_s10.c b/arch/arm/mach-socfpga/timer_s10.c
> index 57237892c3..3ad98bdb25 100644
> --- a/arch/arm/mach-socfpga/timer_s10.c
> +++ b/arch/arm/mach-socfpga/timer_s10.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/timer.h>
>
> diff --git a/arch/arm/mach-stm32/soc.c b/arch/arm/mach-stm32/soc.c
> index 41338a1a33..1f12da401c 100644
> --- a/arch/arm/mach-stm32/soc.c
> +++ b/arch/arm/mach-stm32/soc.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/armv7_mpu.h>
>
> diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
> index 603c690a3d..001c246635 100644
> --- a/arch/arm/mach-stm32mp/cpu.c
> +++ b/arch/arm/mach-stm32mp/cpu.c
> @@ -7,6 +7,7 @@
>  #include <cpu_func.h>
>  #include <debug_uart.h>
>  #include <env.h>
> +#include <init.h>
>  #include <misc.h>
>  #include <net.h>
>  #include <asm/io.h>
> diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
> index 7688b3e315..f4cc609d2d 100644
> --- a/arch/arm/mach-stm32mp/dram_init.c
> +++ b/arch/arm/mach-stm32mp/dram_init.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <ram.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
> diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
> index f85391c6af..fefb255419 100644
> --- a/arch/arm/mach-stm32mp/spl.c
> +++ b/arch/arm/mach-stm32mp/spl.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/io.h>
>  #include <asm/arch/sys_proto.h>
> diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
> index 11b333b563..32e3664265 100644
> --- a/arch/arm/mach-sunxi/board.c
> +++ b/arch/arm/mach-sunxi/board.c
> @@ -11,6 +11,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <mmc.h>
>  #include <i2c.h>
>  #include <serial.h>
> diff --git a/arch/arm/mach-sunxi/cpu_info.c b/arch/arm/mach-sunxi/cpu_info.c
> index ae4745bfec..875e5a1a8a 100644
> --- a/arch/arm/mach-sunxi/cpu_info.c
> +++ b/arch/arm/mach-sunxi/cpu_info.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/cpu.h>
>  #include <asm/arch/clock.h>
> diff --git a/arch/arm/mach-sunxi/dram_sun50i_h6.c b/arch/arm/mach-sunxi/dram_sun50i_h6.c
> index 9375db76a1..411a612393 100644
> --- a/arch/arm/mach-sunxi/dram_sun50i_h6.c
> +++ b/arch/arm/mach-sunxi/dram_sun50i_h6.c
> @@ -1,11 +1,12 @@
> +// SPDX-License-Identifier: GPL-2.0+
>  /*
>   * sun50i H6 platform dram controller init
>   *
>   * (C) Copyright 2017      Icenowy Zheng <icenowy at aosc.io>
>   *
> - * SPDX-License-Identifier:    GPL-2.0+
>   */
>  #include <common.h>
> +#include <init.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 f473230bb5..8e781267c5 100644
> --- a/arch/arm/mach-sunxi/dram_sun6i.c
> +++ b/arch/arm/mach-sunxi/dram_sun6i.c
> @@ -11,6 +11,7 @@
>   */
>  #include <common.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/dram.h>
> diff --git a/arch/arm/mach-sunxi/dram_sun8i_a23.c b/arch/arm/mach-sunxi/dram_sun8i_a23.c
> index 9f00fefb77..221f92869c 100644
> --- a/arch/arm/mach-sunxi/dram_sun8i_a23.c
> +++ b/arch/arm/mach-sunxi/dram_sun8i_a23.c
> @@ -21,6 +21,7 @@
>
>  #include <common.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/dram.h>
> diff --git a/arch/arm/mach-sunxi/dram_sun8i_a33.c b/arch/arm/mach-sunxi/dram_sun8i_a33.c
> index 5da01922bf..179acc7e6f 100644
> --- a/arch/arm/mach-sunxi/dram_sun8i_a33.c
> +++ b/arch/arm/mach-sunxi/dram_sun8i_a33.c
> @@ -9,6 +9,7 @@
>   */
>  #include <common.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/dram.h>
> diff --git a/arch/arm/mach-sunxi/dram_sun8i_a83t.c b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
> index 2c43b3ceba..2febb23654 100644
> --- a/arch/arm/mach-sunxi/dram_sun8i_a83t.c
> +++ b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
> @@ -9,6 +9,7 @@
>   */
>  #include <common.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/dram.h>
> diff --git a/arch/arm/mach-sunxi/dram_sun9i.c b/arch/arm/mach-sunxi/dram_sun9i.c
> index 77cc60623e..58ce05db6d 100644
> --- a/arch/arm/mach-sunxi/dram_sun9i.c
> +++ b/arch/arm/mach-sunxi/dram_sun9i.c
> @@ -13,6 +13,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
> diff --git a/arch/arm/mach-sunxi/dram_sunxi_dw.c b/arch/arm/mach-sunxi/dram_sunxi_dw.c
> index 85e7a1874e..ea5fe108eb 100644
> --- a/arch/arm/mach-sunxi/dram_sunxi_dw.c
> +++ b/arch/arm/mach-sunxi/dram_sunxi_dw.c
> @@ -9,6 +9,7 @@
>   * (C) Copyright 2015      Jens Kuske <jenskuske at gmail.com>
>   */
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/dram.h>
> diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
> index 4416827220..7cfbb6270f 100644
> --- a/arch/arm/mach-tegra/cboot.c
> +++ b/arch/arm/mach-tegra/cboot.c
> @@ -8,6 +8,7 @@
>  #include <fdt_support.h>
>  #include <fdtdec.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <net.h>
>  #include <stdlib.h>
> diff --git a/arch/arm/mach-tegra/sys_info.c b/arch/arm/mach-tegra/sys_info.c
> index 5dc998a52b..5ad586ac17 100644
> --- a/arch/arm/mach-tegra/sys_info.c
> +++ b/arch/arm/mach-tegra/sys_info.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.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 ad09cc52eb..8d662c23d0 100644
> --- a/arch/arm/mach-tegra/tegra114/clock.c
> +++ b/arch/arm/mach-tegra/tegra114/clock.c
> @@ -7,6 +7,7 @@
>  /* Tegra114 Clock control functions */
>
>  #include <common.h>
> +#include <init.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 70916ea3c1..f02f8b0532 100644
> --- a/arch/arm/mach-tegra/tegra124/clock.c
> +++ b/arch/arm/mach-tegra/tegra124/clock.c
> @@ -7,6 +7,7 @@
>  /* Tegra124 Clock control functions */
>
>  #include <common.h>
> +#include <init.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 8f1bb4f069..4e607816a7 100644
> --- a/arch/arm/mach-tegra/tegra20/clock.c
> +++ b/arch/arm/mach-tegra/tegra20/clock.c
> @@ -9,6 +9,7 @@
>
>  #include <common.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/tegra.h>
> diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c
> index 492f4d8c11..ed0ad2ee8b 100644
> --- a/arch/arm/mach-tegra/tegra210/clock.c
> +++ b/arch/arm/mach-tegra/tegra210/clock.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <asm/cache.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
> diff --git a/arch/arm/mach-tegra/tegra30/clock.c b/arch/arm/mach-tegra/tegra30/clock.c
> index dd1193be14..ea17d14536 100644
> --- a/arch/arm/mach-tegra/tegra30/clock.c
> +++ b/arch/arm/mach-tegra/tegra30/clock.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <errno.h>
> +#include <init.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 20f5ff3398..ab05b8a51b 100644
> --- a/arch/arm/mach-u8500/cpuinfo.c
> +++ b/arch/arm/mach-u8500/cpuinfo.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>
>  #define U8500_BOOTROM_BASE     0x90000000
> diff --git a/arch/arm/mach-uniphier/arm32/timer.c b/arch/arm/mach-uniphier/arm32/timer.c
> index 899b539104..b3c907b508 100644
> --- a/arch/arm/mach-uniphier/arm32/timer.c
> +++ b/arch/arm/mach-uniphier/arm32/timer.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <linux/io.h>
>
>  #include "arm-mpcore.h"
> diff --git a/arch/arm/mach-uniphier/cpu-info.c b/arch/arm/mach-uniphier/cpu-info.c
> index 6a7b203a44..1ede50771e 100644
> --- a/arch/arm/mach-uniphier/cpu-info.c
> +++ b/arch/arm/mach-uniphier/cpu-info.c
> @@ -5,6 +5,7 @@
>   *   Author: Masahiro Yamada <yamada.masahiro at socionext.com>
>   */
>
> +#include <init.h>
>  #include <stdio.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 5392ffa603..b013571f36 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 <init.h>
>  #include <linux/delay.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 5f9d90fe6d..1127373b20 100644
> --- a/arch/arm/mach-uniphier/dram_init.c
> +++ b/arch/arm/mach-uniphier/dram_init.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <linux/errno.h>
>  #include <linux/io.h>
>  #include <linux/kernel.h>
> diff --git a/arch/arm/mach-versal/clk.c b/arch/arm/mach-versal/clk.c
> index 9184714e47..b1e34796d0 100644
> --- a/arch/arm/mach-versal/clk.c
> +++ b/arch/arm/mach-versal/clk.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
> diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c
> index 71731f324f..61c0b663fc 100644
> --- a/arch/arm/mach-versal/cpu.c
> +++ b/arch/arm/mach-versal/cpu.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/armv8/mmu.h>
>  #include <asm/cache.h>
>  #include <asm/io.h>
> diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
> index b578f6538a..1ace117fc8 100644
> --- a/arch/arm/mach-zynq/clk.c
> +++ b/arch/arm/mach-zynq/clk.c
> @@ -6,6 +6,7 @@
>  #include <clk.h>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <asm/arch/clk.h>
>
> diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c
> index 43c5ca39d4..77b7cb1307 100644
> --- a/arch/arm/mach-zynq/cpu.c
> +++ b/arch/arm/mach-zynq/cpu.c
> @@ -5,6 +5,7 @@
>   */
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <zynqpl.h>
>  #include <asm/cache.h>
>  #include <asm/io.h>
> diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c
> index 627c84ceba..05f42e6e8b 100644
> --- a/arch/arm/mach-zynq/spl.c
> +++ b/arch/arm/mach-zynq/spl.c
> @@ -6,6 +6,7 @@
>  #include <debug_uart.h>
>  #include <hang.h>
>  #include <image.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <generated/dt.h>
>
> diff --git a/arch/arm/mach-zynq/timer.c b/arch/arm/mach-zynq/timer.c
> index d822e20d2b..cc0e24cbfe 100644
> --- a/arch/arm/mach-zynq/timer.c
> +++ b/arch/arm/mach-zynq/timer.c
> @@ -31,6 +31,7 @@
>  #include <common.h>
>  #include <div64.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <time.h>
>  #include <malloc.h>
>  #include <asm/io.h>
> diff --git a/arch/arm/mach-zynqmp-r5/cpu.c b/arch/arm/mach-zynqmp-r5/cpu.c
> index aa5de863eb..b3402d7189 100644
> --- a/arch/arm/mach-zynqmp-r5/cpu.c
> +++ b/arch/arm/mach-zynqmp-r5/cpu.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <asm/armv7_mpu.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
> diff --git a/arch/arm/mach-zynqmp/clk.c b/arch/arm/mach-zynqmp/clk.c
> index db2b4a8be2..5067b339c2 100644
> --- a/arch/arm/mach-zynqmp/clk.c
> +++ b/arch/arm/mach-zynqmp/clk.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/arch/clk.h>
>  #include <asm/arch/hardware.h>
> diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
> index d832406434..3eb8e8f448 100644
> --- a/arch/arm/mach-zynqmp/cpu.c
> +++ b/arch/arm/mach-zynqmp/cpu.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/arch/hardware.h>
>  #include <asm/arch/sys_proto.h>
> diff --git a/arch/m68k/cpu/mcf5227x/cpu.c b/arch/m68k/cpu/mcf5227x/cpu.c
> index 34534d876b..1590d4a954 100644
> --- a/arch/m68k/cpu/mcf5227x/cpu.c
> +++ b/arch/m68k/cpu/mcf5227x/cpu.c
> @@ -9,6 +9,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <vsprintf.h>
>  #include <watchdog.h>
>  #include <command.h>
> diff --git a/arch/m68k/cpu/mcf5227x/cpu_init.c b/arch/m68k/cpu/mcf5227x/cpu_init.c
> index 7cde4c6105..4ab13b4d8e 100644
> --- a/arch/m68k/cpu/mcf5227x/cpu_init.c
> +++ b/arch/m68k/cpu/mcf5227x/cpu_init.c
> @@ -10,6 +10,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <watchdog.h>
>
>  #include <asm/immap.h>
> diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
> index 8c808a6b0c..225bdc2d25 100644
> --- a/arch/m68k/cpu/mcf523x/cpu.c
> +++ b/arch/m68k/cpu/mcf523x/cpu.c
> @@ -9,6 +9,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <vsprintf.h>
>  #include <watchdog.h>
> diff --git a/arch/m68k/cpu/mcf523x/cpu_init.c b/arch/m68k/cpu/mcf523x/cpu_init.c
> index 8c6e12d548..87effa71dc 100644
> --- a/arch/m68k/cpu/mcf523x/cpu_init.c
> +++ b/arch/m68k/cpu/mcf523x/cpu_init.c
> @@ -10,6 +10,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <watchdog.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 5eee856392..1f70d90f0b 100644
> --- a/arch/m68k/cpu/mcf52x2/cpu.c
> +++ b/arch/m68k/cpu/mcf52x2/cpu.c
> @@ -14,6 +14,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <vsprintf.h>
>  #include <watchdog.h>
> diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c
> index f39fe19baf..9d4a10f028 100644
> --- a/arch/m68k/cpu/mcf52x2/cpu_init.c
> +++ b/arch/m68k/cpu/mcf52x2/cpu_init.c
> @@ -19,6 +19,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <watchdog.h>
>  #include <asm/immap.h>
>  #include <asm/io.h>
> diff --git a/arch/m68k/cpu/mcf530x/cpu.c b/arch/m68k/cpu/mcf530x/cpu.c
> index a76deebc68..bef9047b35 100644
> --- a/arch/m68k/cpu/mcf530x/cpu.c
> +++ b/arch/m68k/cpu/mcf530x/cpu.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <vsprintf.h>
>  #include <asm/immap.h>
>  #include <asm/io.h>
> diff --git a/arch/m68k/cpu/mcf530x/cpu_init.c b/arch/m68k/cpu/mcf530x/cpu_init.c
> index 166720aef5..83529408eb 100644
> --- a/arch/m68k/cpu/mcf530x/cpu_init.c
> +++ b/arch/m68k/cpu/mcf530x/cpu_init.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <watchdog.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 32c477a5fd..52b64a94a7 100644
> --- a/arch/m68k/cpu/mcf532x/cpu.c
> +++ b/arch/m68k/cpu/mcf532x/cpu.c
> @@ -9,6 +9,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <vsprintf.h>
>  #include <watchdog.h>
> diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c
> index bd130c1b0c..1311f3967c 100644
> --- a/arch/m68k/cpu/mcf532x/cpu_init.c
> +++ b/arch/m68k/cpu/mcf532x/cpu_init.c
> @@ -10,6 +10,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <watchdog.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 1602369080..cb1514c600 100644
> --- a/arch/m68k/cpu/mcf5445x/cpu.c
> +++ b/arch/m68k/cpu/mcf5445x/cpu.c
> @@ -9,6 +9,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <vsprintf.h>
>  #include <watchdog.h>
> diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c
> index 6ee23f0db2..9deab51d07 100644
> --- a/arch/m68k/cpu/mcf5445x/cpu_init.c
> +++ b/arch/m68k/cpu/mcf5445x/cpu_init.c
> @@ -10,6 +10,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <watchdog.h>
>  #include <asm/immap.h>
>  #include <asm/processor.h>
> diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
> index 51281549a3..2a64c7b6f6 100644
> --- a/arch/m68k/cpu/mcf547x_8x/cpu.c
> +++ b/arch/m68k/cpu/mcf547x_8x/cpu.c
> @@ -9,6 +9,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <vsprintf.h>
>  #include <watchdog.h>
> diff --git a/arch/m68k/cpu/mcf547x_8x/cpu_init.c b/arch/m68k/cpu/mcf547x_8x/cpu_init.c
> index 8779384c0a..8e42b63141 100644
> --- a/arch/m68k/cpu/mcf547x_8x/cpu_init.c
> +++ b/arch/m68k/cpu/mcf547x_8x/cpu_init.c
> @@ -11,6 +11,7 @@
>  #include <common.h>
>  #include <MCD_dma.h>
>  #include <cpu_func.h>
> +#include <init.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 885659e342..c4988f9031 100644
> --- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
> +++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <irq_func.h>
>
>  #include <asm/timer.h>
> diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
> index bde1f4c228..eab6e2088e 100644
> --- a/arch/m68k/lib/time.c
> +++ b/arch/m68k/lib/time.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <irq_func.h>
>  #include <time.h>
>
> diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
> index 805eac7fa3..e07fc628d1 100644
> --- a/arch/microblaze/cpu/timer.c
> +++ b/arch/microblaze/cpu/timer.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/microblaze_timer.h>
>  #include <asm/microblaze_intc.h>
> diff --git a/arch/mips/cpu/cpu.c b/arch/mips/cpu/cpu.c
> index a403ff729b..682bee6be2 100644
> --- a/arch/mips/cpu/cpu.c
> +++ b/arch/mips/cpu/cpu.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <command.h>
> +#include <init.h>
>  #include <linux/compiler.h>
>  #include <asm/cache.h>
>  #include <asm/mipsregs.h>
> diff --git a/arch/mips/lib/stack.c b/arch/mips/lib/stack.c
> index 99fd056905..4d1d98c3ad 100644
> --- a/arch/mips/lib/stack.c
> +++ b/arch/mips/lib/stack.c
> @@ -1,6 +1,7 @@
>  // SPDX-License-Identifier: GPL-2.0+
>
>  #include <common.h>
> +#include <init.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/arch/mips/mach-ath79/cpu.c b/arch/mips/mach-ath79/cpu.c
> index 9afc672602..31e87d6206 100644
> --- a/arch/mips/mach-ath79/cpu.c
> +++ b/arch/mips/mach-ath79/cpu.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.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 87ced7c5d5..764ce89231 100644
> --- a/arch/mips/mach-bmips/dram.c
> +++ b/arch/mips/mach-bmips/dram.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <dm.h>
>
> diff --git a/arch/mips/mach-jz47xx/jz4780/sdram.c b/arch/mips/mach-jz47xx/jz4780/sdram.c
> index 65afefe53e..3049a63d57 100644
> --- a/arch/mips/mach-jz47xx/jz4780/sdram.c
> +++ b/arch/mips/mach-jz47xx/jz4780/sdram.c
> @@ -11,6 +11,7 @@
>
>  #include <common.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <mach/jz4780.h>
>  #include <mach/jz4780_dram.h>
> diff --git a/arch/mips/mach-jz47xx/jz4780/timer.c b/arch/mips/mach-jz47xx/jz4780/timer.c
> index b32a2f5643..340e35e6fc 100644
> --- a/arch/mips/mach-jz47xx/jz4780/timer.c
> +++ b/arch/mips/mach-jz47xx/jz4780/timer.c
> @@ -9,6 +9,7 @@
>  #include <config.h>
>  #include <common.h>
>  #include <div64.h>
> +#include <init.h>
>  #include <irq_func.h>
>  #include <time.h>
>  #include <asm/io.h>
> diff --git a/arch/mips/mach-mscc/cpu.c b/arch/mips/mach-mscc/cpu.c
> index 3ee589891b..8273a0f5aa 100644
> --- a/arch/mips/mach-mscc/cpu.c
> +++ b/arch/mips/mach-mscc/cpu.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>
>  #include <asm/io.h>
>  #include <asm/types.h>
> diff --git a/arch/mips/mach-mscc/dram.c b/arch/mips/mach-mscc/dram.c
> index 72c70c9e84..b12bac63c2 100644
> --- a/arch/mips/mach-mscc/dram.c
> +++ b/arch/mips/mach-mscc/dram.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.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 459a9673eb..9ee5c7fdf6 100644
> --- a/arch/mips/mach-mtmips/cpu.c
> +++ b/arch/mips/mach-mtmips/cpu.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <linux/io.h>
>  #include <linux/sizes.h>
> diff --git a/arch/mips/mach-mtmips/spl.c b/arch/mips/mach-mtmips/spl.c
> index 2a24af70c3..38d9e9160d 100644
> --- a/arch/mips/mach-mtmips/spl.c
> +++ b/arch/mips/mach-mtmips/spl.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <fdt.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/sections.h>
>  #include <linux/sizes.h>
> diff --git a/arch/mips/mach-pic32/cpu.c b/arch/mips/mach-pic32/cpu.c
> index 8075d93d41..1d8c397144 100644
> --- a/arch/mips/mach-pic32/cpu.c
> +++ b/arch/mips/mach-pic32/cpu.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <clk.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <mach/pic32.h>
>  #include <mach/ddr.h>
> diff --git a/arch/nds32/cpu/n1213/ag101/timer.c b/arch/nds32/cpu/n1213/ag101/timer.c
> index f2e362102e..c59585692d 100644
> --- a/arch/nds32/cpu/n1213/ag101/timer.c
> +++ b/arch/nds32/cpu/n1213/ag101/timer.c
> @@ -9,6 +9,7 @@
>   */
>  #ifndef CONFIG_TIMER
>  #include <common.h>
> +#include <init.h>
>  #include <irq_func.h>
>  #include <time.h>
>  #include <asm/io.h>
> diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
> index 37ffa8f4a4..9008db6aa5 100644
> --- a/arch/nios2/cpu/cpu.c
> +++ b/arch/nios2/cpu/cpu.c
> @@ -9,6 +9,7 @@
>  #include <cpu_func.h>
>  #include <dm.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <irq_func.h>
>  #include <asm/cache.h>
>
> diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
> index 665ac378c8..a183ed6343 100644
> --- a/arch/powerpc/cpu/mpc83xx/pci.c
> +++ b/arch/powerpc/cpu/mpc83xx/pci.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <pci.h>
>
>  #if defined(CONFIG_OF_LIBFDT)
> diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
> index e455d8baf5..d3167f6cb9 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 <init.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 9f9eed165b..eff0d5d7e2 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 <init.h>
>  #include <irq_func.h>
>  #include <time.h>
>  #include <vsprintf.h>
> diff --git a/arch/powerpc/cpu/mpc86xx/cpu_init.c b/arch/powerpc/cpu/mpc86xx/cpu_init.c
> index 89add62dc1..34752a34af 100644
> --- a/arch/powerpc/cpu/mpc86xx/cpu_init.c
> +++ b/arch/powerpc/cpu/mpc86xx/cpu_init.c
> @@ -11,6 +11,7 @@
>
>  #include <config.h>
>  #include <common.h>
> +#include <init.h>
>  #include <mpc86xx.h>
>  #include <asm/mmu.h>
>  #include <asm/fsl_law.h>
> diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c
> index 8bd6d0fbcf..c8d06b0508 100644
> --- a/arch/powerpc/cpu/mpc8xx/cpu_init.c
> +++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <watchdog.h>
>
>  #include <mpc8xx.h>
> diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
> index bb81f49ae7..da0a80e6fc 100644
> --- a/arch/powerpc/cpu/mpc8xxx/cpu.c
> +++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
> @@ -11,6 +11,7 @@
>  #include <common.h>
>  #include <command.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <net.h>
>  #include <tsec.h>
>  #include <fm_eth.h>
> diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
> index afcb75ba17..29489b46e6 100644
> --- a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
> +++ b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <asm/fsl_lbc.h>
>
>  #ifdef CONFIG_MPC83xx
> diff --git a/arch/powerpc/lib/stack.c b/arch/powerpc/lib/stack.c
> index 9a956c221d..5840fe6349 100644
> --- a/arch/powerpc/lib/stack.c
> +++ b/arch/powerpc/lib/stack.c
> @@ -11,6 +11,7 @@
>   * Marius Groeger <mgroeger at sysgo.de>
>   */
>  #include <common.h>
> +#include <init.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/arch/powerpc/lib/time.c b/arch/powerpc/lib/time.c
> index e1494fa129..58931f0e6e 100644
> --- a/arch/powerpc/lib/time.c
> +++ b/arch/powerpc/lib/time.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>
> diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c
> index e457f6acbf..1cebb0322e 100644
> --- a/arch/riscv/cpu/cpu.c
> +++ b/arch/riscv/cpu/cpu.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <cpu.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <log.h>
>  #include <asm/encoding.h>
>  #include <dm/uclass-internal.h>
> diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c
> index 4ca038b148..f3f603b76e 100644
> --- a/arch/riscv/lib/spl.c
> +++ b/arch/riscv/lib/spl.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/smp.h>
>
> diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
> index d5f683bbaa..b92db85c22 100644
> --- a/arch/sandbox/cpu/spl.c
> +++ b/arch/sandbox/cpu/spl.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <os.h>
>  #include <spl.h>
>  #include <asm/spl.h>
> diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
> index b6ff5c3d64..c6a2bbe468 100644
> --- a/arch/sandbox/cpu/start.c
> +++ b/arch/sandbox/cpu/start.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <command.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <os.h>
>  #include <cli.h>
>  #include <sort.h>
> diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c
> index 51e1cc1181..d09f782f5f 100644
> --- a/arch/sh/lib/time.c
> +++ b/arch/sh/lib/time.c
> @@ -11,6 +11,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/processor.h>
>  #include <asm/io.h>
>
> diff --git a/arch/sh/lib/time_sh2.c b/arch/sh/lib/time_sh2.c
> index d82c1d2feb..ef7c6073cc 100644
> --- a/arch/sh/lib/time_sh2.c
> +++ b/arch/sh/lib/time_sh2.c
> @@ -8,6 +8,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <time.h>
>  #include <asm/io.h>
>  #include <asm/processor.h>
> diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c
> index e2509e391f..707ceb3e64 100644
> --- a/arch/x86/cpu/apollolake/cpu_spl.c
> +++ b/arch/x86/cpu/apollolake/cpu_spl.c
> @@ -8,6 +8,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <ec_commands.h>
> +#include <init.h>
>  #include <log.h>
>  #include <spi_flash.h>
>  #include <spl.h>
> diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
> index fd6e73dfc8..30b820fdbc 100644
> --- a/arch/x86/cpu/apollolake/fsp_s.c
> +++ b/arch/x86/cpu/apollolake/fsp_s.c
> @@ -8,6 +8,7 @@
>  #include <binman.h>
>  #include <bootstage.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <irq.h>
>  #include <malloc.h>
>  #include <acpi/acpi_s3.h>
> diff --git a/arch/x86/cpu/braswell/braswell.c b/arch/x86/cpu/braswell/braswell.c
> index 7a83b06005..3345049993 100644
> --- a/arch/x86/cpu/braswell/braswell.c
> +++ b/arch/x86/cpu/braswell/braswell.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/mrccache.h>
>  #include <asm/post.h>
>
> diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c
> index 55a7439f1c..793167937c 100644
> --- a/arch/x86/cpu/broadwell/cpu.c
> +++ b/arch/x86/cpu/broadwell/cpu.c
> @@ -8,6 +8,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <cpu.h>
> +#include <init.h>
>  #include <asm/cpu.h>
>  #include <asm/cpu_x86.h>
>  #include <asm/cpu_common.h>
> diff --git a/arch/x86/cpu/broadwell/cpu_from_spl.c b/arch/x86/cpu/broadwell/cpu_from_spl.c
> index 2aa6f245e7..17ff43b58e 100644
> --- a/arch/x86/cpu/broadwell/cpu_from_spl.c
> +++ b/arch/x86/cpu/broadwell/cpu_from_spl.c
> @@ -9,6 +9,7 @@
>  #include <cpu_func.h>
>  #include <debug_uart.h>
>  #include <handoff.h>
> +#include <init.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 895edeb4bc..3d42b1caac 100644
> --- a/arch/x86/cpu/broadwell/cpu_full.c
> +++ b/arch/x86/cpu/broadwell/cpu_full.c
> @@ -8,6 +8,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <cpu.h>
> +#include <init.h>
>  #include <asm/cpu.h>
>  #include <asm/cpu_x86.h>
>  #include <asm/cpu_common.h>
> diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
> index f016489185..b944896e75 100644
> --- a/arch/x86/cpu/broadwell/refcode.c
> +++ b/arch/x86/cpu/broadwell/refcode.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <asm/arch/pei_data.h>
>
>  #define RMODULE_MAGIC          0xf8fe
> diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
> index 624caf67a6..d44db1347b 100644
> --- a/arch/x86/cpu/coreboot/coreboot.c
> +++ b/arch/x86/cpu/coreboot/coreboot.c
> @@ -8,6 +8,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <usb.h>
>  #include <asm/io.h>
>  #include <asm/msr.h>
> diff --git a/arch/x86/cpu/efi/app.c b/arch/x86/cpu/efi/app.c
> index 13077411dc..10677ecbc2 100644
> --- a/arch/x86/cpu/efi/app.c
> +++ b/arch/x86/cpu/efi/app.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <netdev.h>
>
>  int arch_cpu_init(void)
> diff --git a/arch/x86/cpu/intel_common/cpu_from_spl.c b/arch/x86/cpu/intel_common/cpu_from_spl.c
> index b7bb524162..e4157c5734 100644
> --- a/arch/x86/cpu/intel_common/cpu_from_spl.c
> +++ b/arch/x86/cpu/intel_common/cpu_from_spl.c
> @@ -7,6 +7,7 @@
>  #include <dm.h>
>  #include <errno.h>
>  #include <handoff.h>
> +#include <init.h>
>  #include <asm/cpu_common.h>
>  #include <asm/intel_regs.h>
>  #include <asm/lapic.h>
> diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
> index 8f30cdbe24..0639b5cf02 100644
> --- a/arch/x86/cpu/ivybridge/cpu.c
> +++ b/arch/x86/cpu/ivybridge/cpu.c
> @@ -15,6 +15,7 @@
>  #include <dm.h>
>  #include <errno.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <pch.h>
>  #include <asm/cpu.h>
>  #include <asm/cpu_common.h>
> diff --git a/arch/x86/cpu/ivybridge/ivybridge.c b/arch/x86/cpu/ivybridge/ivybridge.c
> index 8d10fd6c54..eb3f362e4e 100644
> --- a/arch/x86/cpu/ivybridge/ivybridge.c
> +++ b/arch/x86/cpu/ivybridge/ivybridge.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/post.h>
>  #include <asm/processor.h>
>
> diff --git a/arch/x86/cpu/ivybridge/sdram_nop.c b/arch/x86/cpu/ivybridge/sdram_nop.c
> index c55213ca2d..54e6acf262 100644
> --- a/arch/x86/cpu/ivybridge/sdram_nop.c
> +++ b/arch/x86/cpu/ivybridge/sdram_nop.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c
> index 716351ad7f..044a429c13 100644
> --- a/arch/x86/cpu/qemu/qemu.c
> +++ b/arch/x86/cpu/qemu/qemu.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <pci.h>
>  #include <qfw.h>
>  #include <asm/irq.h>
> diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c
> index 46c6d00eb4..e2e2d9fe33 100644
> --- a/arch/x86/cpu/quark/quark.c
> +++ b/arch/x86/cpu/quark/quark.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <mmc.h>
>  #include <asm/cache.h>
>  #include <asm/io.h>
> diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c
> index 66737e655b..782ed863fe 100644
> --- a/arch/x86/cpu/queensbay/tnc.c
> +++ b/arch/x86/cpu/queensbay/tnc.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <dm/device-internal.h>
>  #include <pci.h>
>  #include <asm/io.h>
> diff --git a/arch/x86/cpu/slimbootloader/slimbootloader.c b/arch/x86/cpu/slimbootloader/slimbootloader.c
> index 21dcfb2142..889fba5473 100644
> --- a/arch/x86/cpu/slimbootloader/slimbootloader.c
> +++ b/arch/x86/cpu/slimbootloader/slimbootloader.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <asm/arch/slimbootloader.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
> diff --git a/arch/x86/cpu/tangier/tangier.c b/arch/x86/cpu/tangier/tangier.c
> index 43bee1fb70..1e2f6cc8b7 100644
> --- a/arch/x86/cpu/tangier/tangier.c
> +++ b/arch/x86/cpu/tangier/tangier.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <asm/u-boot-x86.h>
>
>  /*
> diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c
> index 4b64339f25..1b4d3971b0 100644
> --- a/arch/x86/cpu/x86_64/cpu.c
> +++ b/arch/x86/cpu/x86_64/cpu.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <debug_uart.h>
> +#include <init.h>
>
>  /*
>   * Global declaration of gd.
> diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c
> index 267527eb34..114d3d9cf8 100644
> --- a/arch/x86/lib/fsp/fsp_common.c
> +++ b/arch/x86/lib/fsp/fsp_common.c
> @@ -7,6 +7,7 @@
>  #include <cpu_func.h>
>  #include <dm.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <rtc.h>
>  #include <acpi/acpi_s3.h>
>  #include <asm/cmos_layout.h>
> diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c
> index 98b762209f..0e71583a49 100644
> --- a/arch/x86/lib/fsp/fsp_graphics.c
> +++ b/arch/x86/lib/fsp/fsp_graphics.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <vbe.h>
>  #include <video.h>
>  #include <asm/fsp/fsp_support.h>
> diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c
> index 0a726807c2..312283ae9d 100644
> --- a/arch/x86/lib/fsp1/fsp_common.c
> +++ b/arch/x86/lib/fsp1/fsp_common.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <rtc.h>
>  #include <acpi/acpi_s3.h>
> diff --git a/arch/x86/lib/fsp1/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c
> index 5ef89744b9..e3f9e30f6a 100644
> --- a/arch/x86/lib/fsp1/fsp_dram.c
> +++ b/arch/x86/lib/fsp1/fsp_dram.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/fsp/fsp_support.h>
>
>  int dram_init(void)
> diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c
> index 3869c53c5f..e2e6efd8b0 100644
> --- a/arch/x86/lib/fsp2/fsp_dram.c
> +++ b/arch/x86/lib/fsp2/fsp_dram.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <handoff.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <acpi/acpi_s3.h>
>  #include <asm/arch/cpu.h>
> diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
> index bdae9291e7..fb8d40c02d 100644
> --- a/arch/x86/lib/spl.c
> +++ b/arch/x86/lib/spl.c
> @@ -9,6 +9,7 @@
>  #include <dm.h>
>  #include <hang.h>
>  #include <image.h>
> +#include <init.h>
>  #include <irq_func.h>
>  #include <malloc.h>
>  #include <spl.h>
> diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
> index f9dcf32d73..ac265b6744 100644
> --- a/arch/x86/lib/tpl.c
> +++ b/arch/x86/lib/tpl.c
> @@ -8,6 +8,7 @@
>  #include <dm.h>
>  #include <hang.h>
>  #include <image.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/cpu.h>
>  #include <asm/mtrr.h>
> diff --git a/arch/xtensa/cpu/cpu.c b/arch/xtensa/cpu/cpu.c
> index 6f4b88f88e..85d3464607 100644
> --- a/arch/xtensa/cpu/cpu.c
> +++ b/arch/xtensa/cpu/cpu.c
> @@ -10,6 +10,7 @@
>
>  #include <common.h>
>  #include <command.h>
> +#include <init.h>
>  #include <vsprintf.h>
>  #include <linux/stringify.h>
>  #include <asm/global_data.h>
> diff --git a/board/BuR/brppt2/board.c b/board/BuR/brppt2/board.c
> index c91d2f9494..f156b552a7 100644
> --- a/board/BuR/brppt2/board.c
> +++ b/board/BuR/brppt2/board.c
> @@ -9,6 +9,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <dm.h>
>  #include <miiphy.h>
> diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
> index 50305656e8..8b97e1a533 100644
> --- a/board/LaCie/net2big_v2/net2big_v2.c
> +++ b/board/LaCie/net2big_v2/net2big_v2.c
> @@ -12,6 +12,7 @@
>  #include <command.h>
>  #include <env.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/mach-types.h>
>  #include <asm/arch/cpu.h>
> diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
> index b7ae58c645..f9bf527739 100644
> --- a/board/LaCie/netspace_v2/netspace_v2.c
> +++ b/board/LaCie/netspace_v2/netspace_v2.c
> @@ -11,6 +11,7 @@
>  #include <common.h>
>  #include <command.h>
>  #include <env.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/mach-types.h>
>  #include <asm/arch/cpu.h>
> diff --git a/board/Marvell/aspenite/aspenite.c b/board/Marvell/aspenite/aspenite.c
> index c4e506ff3b..c1406d7489 100644
> --- a/board/Marvell/aspenite/aspenite.c
> +++ b/board/Marvell/aspenite/aspenite.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <mvmfp.h>
>  #include <asm/mach-types.h>
>  #include <asm/arch/cpu.h>
> diff --git a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
> index 729516d9e1..a6f1167e39 100644
> --- a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
> +++ b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
> @@ -1,6 +1,7 @@
>  // SPDX-License-Identifier: GPL-2.0+
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.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 3e975801b8..ba0a944b9a 100644
> --- a/board/Marvell/db-88f6720/db-88f6720.c
> +++ b/board/Marvell/db-88f6720/db-88f6720.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <netdev.h>
> diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
> index 372beb3c43..f225f467bf 100644
> --- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
> +++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <netdev.h>
> diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
> index f3df7e666b..53a80c949b 100644
> --- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
> +++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <netdev.h>
> diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
> index e7808f5a5c..cb65357844 100644
> --- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
> +++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <netdev.h>
> diff --git a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
> index cae428ffd0..1153b188e7 100644
> --- a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
> +++ b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <asm/gpio.h>
>  #include <linux/mbus.h>
>  #include <linux/io.h>
> diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c
> index 887dd1ed74..7d188c3279 100644
> --- a/board/Marvell/dreamplug/dreamplug.c
> +++ b/board/Marvell/dreamplug/dreamplug.c
> @@ -9,6 +9,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <asm/arch/cpu.h>
> diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
> index fc2bc85f00..10236bd07f 100644
> --- a/board/Marvell/gplugd/gplugd.c
> +++ b/board/Marvell/gplugd/gplugd.c
> @@ -12,6 +12,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <mvmfp.h>
>  #include <asm/arch/cpu.h>
>  #include <asm/arch/mfp.h>
> diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c
> index 71bee76bdc..f3981c66d2 100644
> --- a/board/Marvell/guruplug/guruplug.c
> +++ b/board/Marvell/guruplug/guruplug.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <asm/mach-types.h>
> diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
> index bef4e1767c..29bd6a9a40 100644
> --- a/board/Marvell/mvebu_armada-37xx/board.c
> +++ b/board/Marvell/mvebu_armada-37xx/board.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <phy.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 ae9202895d..d9b5b213fe 100644
> --- a/board/Marvell/openrd/openrd.c
> +++ b/board/Marvell/openrd/openrd.c
> @@ -11,6 +11,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <asm/mach-types.h>
> diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c
> index 6c6106c23c..6311ed3b2e 100644
> --- a/board/Marvell/sheevaplug/sheevaplug.c
> +++ b/board/Marvell/sheevaplug/sheevaplug.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <asm/mach-types.h>
> diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c
> index 0ff8a9053e..85dd10e55a 100644
> --- a/board/Seagate/dockstar/dockstar.c
> +++ b/board/Seagate/dockstar/dockstar.c
> @@ -10,6 +10,7 @@
>
>  #include <common.h>
>  #include <bootstage.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <asm/arch/soc.h>
> diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c
> index fd2f0df371..de1ec54466 100644
> --- a/board/Seagate/goflexhome/goflexhome.c
> +++ b/board/Seagate/goflexhome/goflexhome.c
> @@ -13,6 +13,7 @@
>
>  #include <common.h>
>  #include <bootstage.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <asm/mach-types.h>
> diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c
> index 99462052f0..3a027d083a 100644
> --- a/board/Seagate/nas220/nas220.c
> +++ b/board/Seagate/nas220/nas220.c
> @@ -9,6 +9,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <asm/mach-types.h>
> diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c
> index f2031ef3bb..c4cd95cd80 100644
> --- a/board/Synology/ds109/ds109.c
> +++ b/board/Synology/ds109/ds109.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <asm/setup.h>
> diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c
> index d23e97c9b9..deb530fe78 100644
> --- a/board/Synology/ds414/ds414.c
> +++ b/board/Synology/ds414/ds414.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <asm/io.h>
>  #include <asm/arch/cpu.h>
> diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
> index bb7913025d..772e21b9c5 100644
> --- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
> +++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <errno.h>
> +#include <init.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 6863da82d6..21ebd5dddb 100644
> --- a/board/advantech/imx8qm_rom7720_a1/spl.c
> +++ b/board/advantech/imx8qm_rom7720_a1/spl.c
> @@ -5,6 +5,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <image.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <fsl_esdhc.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 8f4c587371..8499fc541f 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
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/fsp1/fsp_support.h>
>
>  /* ALC262 Verb Table - 10EC0262 */
> diff --git a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
> index 1f3f293bd9..b96cf0b59c 100644
> --- a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
> +++ b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <linux/io.h>
>  #include <miiphy.h>
> diff --git a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
> index 889ce70d75..5c9124fbb4 100644
> --- a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
> +++ b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <netdev.h>
> diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c
> index 04b053dc20..1a6dec04a3 100644
> --- a/board/alliedtelesis/x530/x530.c
> +++ b/board/alliedtelesis/x530/x530.c
> @@ -8,6 +8,7 @@
>  #include <dm.h>
>  #include <env.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <wdt.h>
>  #include <asm/gpio.h>
>  #include <linux/mbus.h>
> diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c
> index 9034c4fbff..fb1828ff44 100644
> --- a/board/amazon/kc1/kc1.c
> +++ b/board/amazon/kc1/kc1.c
> @@ -8,6 +8,7 @@
>  #include <config.h>
>  #include <common.h>
>  #include <env.h>
> +#include <init.h>
>  #include <linux/ctype.h>
>  #include <linux/usb/musb.h>
>  #include <asm/omap_musb.h>
> diff --git a/board/amlogic/p200/p200.c b/board/amlogic/p200/p200.c
> index d7f7ebd962..8f1bf8bfda 100644
> --- a/board/amlogic/p200/p200.c
> +++ b/board/amlogic/p200/p200.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <env.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/gx.h>
> diff --git a/board/amlogic/p201/p201.c b/board/amlogic/p201/p201.c
> index cdac64ed92..597bb71cbf 100644
> --- a/board/amlogic/p201/p201.c
> +++ b/board/amlogic/p201/p201.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <env.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/gx.h>
> diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c
> index 6ac5aadecf..fbc49e9565 100644
> --- a/board/amlogic/p212/p212.c
> +++ b/board/amlogic/p212/p212.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <env.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/gx.h>
> diff --git a/board/amlogic/q200/q200.c b/board/amlogic/q200/q200.c
> index ae9b888c12..62e6fa3d19 100644
> --- a/board/amlogic/q200/q200.c
> +++ b/board/amlogic/q200/q200.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <env.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/gx.h>
> diff --git a/board/amlogic/s400/s400.c b/board/amlogic/s400/s400.c
> index 79b867996b..7e2f0cdae3 100644
> --- a/board/amlogic/s400/s400.c
> +++ b/board/amlogic/s400/s400.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/axg.h>
> diff --git a/board/amlogic/sei510/sei510.c b/board/amlogic/sei510/sei510.c
> index 07a6a47ebc..70fe3559f6 100644
> --- a/board/amlogic/sei510/sei510.c
> +++ b/board/amlogic/sei510/sei510.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <env_internal.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/axg.h>
> diff --git a/board/amlogic/sei610/sei610.c b/board/amlogic/sei610/sei610.c
> index 5c24276d51..3c44fba516 100644
> --- a/board/amlogic/sei610/sei610.c
> +++ b/board/amlogic/sei610/sei610.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <env_internal.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/axg.h>
> diff --git a/board/amlogic/u200/u200.c b/board/amlogic/u200/u200.c
> index 4df7ff437e..373235d77a 100644
> --- a/board/amlogic/u200/u200.c
> +++ b/board/amlogic/u200/u200.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/axg.h>
> diff --git a/board/amlogic/w400/w400.c b/board/amlogic/w400/w400.c
> index 95bbdedbdd..47a51710dc 100644
> --- a/board/amlogic/w400/w400.c
> +++ b/board/amlogic/w400/w400.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <env_internal.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/eth.h>
> diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
> index 5095cf65d1..3a59b51c1c 100644
> --- a/board/aristainetos/aristainetos.c
> +++ b/board/aristainetos/aristainetos.c
> @@ -10,6 +10,7 @@
>   */
>
>  #include <image.h>
> +#include <init.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/arch/iomux.h>
> diff --git a/board/armltd/vexpress64/pcie.c b/board/armltd/vexpress64/pcie.c
> index 21156a4ca9..888434a6f8 100644
> --- a/board/armltd/vexpress64/pcie.c
> +++ b/board/armltd/vexpress64/pcie.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.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 912202d8eb..fbfa7a18f1 100644
> --- a/board/armltd/vexpress64/vexpress64.c
> +++ b/board/armltd/vexpress64/vexpress64.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <errno.h>
>  #include <net.h>
> diff --git a/board/atmel/at91sam9260ek/led.c b/board/atmel/at91sam9260ek/led.c
> index 2ea66b9b15..cc6d5d7a05 100644
> --- a/board/atmel/at91sam9260ek/led.c
> +++ b/board/atmel/at91sam9260ek/led.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/gpio.h>
>  #include <status_led.h>
> diff --git a/board/atmel/common/video_display.c b/board/atmel/common/video_display.c
> index 5cc52139a7..2666b0b3cd 100644
> --- a/board/atmel/common/video_display.c
> +++ b/board/atmel/common/video_display.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <atmel_lcd.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <nand.h>
>  #include <version.h>
>  #include <video.h>
> diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
> index dd7863f7ac..db0da0ca2f 100644
> --- a/board/bachmann/ot1200/ot1200.c
> +++ b/board/bachmann/ot1200/ot1200.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
> diff --git a/board/bachmann/ot1200/ot1200_spl.c b/board/bachmann/ot1200/ot1200_spl.c
> index a3a822f65a..7fbd6f2c5d 100644
> --- a/board/bachmann/ot1200/ot1200_spl.c
> +++ b/board/bachmann/ot1200/ot1200_spl.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/arch/mx6-ddr.h>
>
> diff --git a/board/barco/platinum/spl_picon.c b/board/barco/platinum/spl_picon.c
> index ec6de460c1..253a64d28e 100644
> --- a/board/barco/platinum/spl_picon.c
> +++ b/board/barco/platinum/spl_picon.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/iomux.h>
>  #include <asm/arch/mx6-ddr.h>
> diff --git a/board/barco/platinum/spl_titanium.c b/board/barco/platinum/spl_titanium.c
> index 263371a2b2..8c91b752ff 100644
> --- a/board/barco/platinum/spl_titanium.c
> +++ b/board/barco/platinum/spl_titanium.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/iomux.h>
>  #include <asm/arch/mx6-ddr.h>
> diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
> index 2599db7bf7..be8eefb365 100644
> --- a/board/bluegiga/apx4devkit/apx4devkit.c
> +++ b/board/bluegiga/apx4devkit/apx4devkit.c
> @@ -14,6 +14,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/gpio.h>
>  #include <asm/io.h>
> diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
> index 03ba9e8c5e..b8dbe8ac53 100644
> --- a/board/bosch/guardian/board.c
> +++ b/board/bosch/guardian/board.c
> @@ -14,6 +14,7 @@
>  #include <env_internal.h>
>  #include <errno.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <led.h>
>  #include <miiphy.h>
>  #include <panel.h>
> diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
> index 4d40cb8ff5..8e29fd0095 100644
> --- a/board/boundary/nitrogen6x/nitrogen6x.c
> +++ b/board/boundary/nitrogen6x/nitrogen6x.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <env.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
> diff --git a/board/broadcom/bcm963158/bcm963158.c b/board/broadcom/bcm963158/bcm963158.c
> index db82cd570d..9feaee3c0f 100644
> --- a/board/broadcom/bcm963158/bcm963158.c
> +++ b/board/broadcom/bcm963158/bcm963158.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <linux/io.h>
>
>  #ifdef CONFIG_ARM64
> diff --git a/board/broadcom/bcm968360bg/bcm968360bg.c b/board/broadcom/bcm968360bg/bcm968360bg.c
> index a5fbc1d297..90af6b88bd 100644
> --- a/board/broadcom/bcm968360bg/bcm968360bg.c
> +++ b/board/broadcom/bcm968360bg/bcm968360bg.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <linux/io.h>
>
>  #ifdef CONFIG_ARM64
> diff --git a/board/broadcom/bcm968580xref/bcm968580xref.c b/board/broadcom/bcm968580xref/bcm968580xref.c
> index 2e547f5170..1bd723d49e 100644
> --- a/board/broadcom/bcm968580xref/bcm968580xref.c
> +++ b/board/broadcom/bcm968580xref/bcm968580xref.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <linux/io.h>
>
>  #ifdef CONFIG_ARM64
> diff --git a/board/bticino/mamoj/mamoj.c b/board/bticino/mamoj/mamoj.c
> index 6ad7e31092..b7d37b7004 100644
> --- a/board/bticino/mamoj/mamoj.c
> +++ b/board/bticino/mamoj/mamoj.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch/sys_proto.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
> diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c
> index 620e4d1de0..ece37800bf 100644
> --- a/board/bticino/mamoj/spl.c
> +++ b/board/bticino/mamoj/spl.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <serial.h>
>  #include <spl.h>
>
> diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c
> index 56a2c29e4c..6afb6bbdb5 100644
> --- a/board/buffalo/lsxl/lsxl.c
> +++ b/board/buffalo/lsxl/lsxl.c
> @@ -12,6 +12,7 @@
>  #include <env.h>
>  #include <env_internal.h>
>  #include <flash.h>
> +#include <init.h>
>  #include <net.h>
>  #include <malloc.h>
>  #include <netdev.h>
> diff --git a/board/ccv/xpress/spl.c b/board/ccv/xpress/spl.c
> index 90f655ab2e..38bda8d184 100644
> --- a/board/ccv/xpress/spl.c
> +++ b/board/ccv/xpress/spl.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/io.h>
>  #include <asm/arch/mx6-ddr.h>
> diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c
> index b64ec95e31..0318bf18cf 100644
> --- a/board/cirrus/edb93xx/edb93xx.c
> +++ b/board/cirrus/edb93xx/edb93xx.c
> @@ -16,6 +16,7 @@
>  #include <config.h>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <irq_func.h>
>  #include <net.h>
>  #include <netdev.h>
> diff --git a/board/cloudengines/pogo_e02/pogo_e02.c b/board/cloudengines/pogo_e02/pogo_e02.c
> index 835c3279be..433e0de8a3 100644
> --- a/board/cloudengines/pogo_e02/pogo_e02.c
> +++ b/board/cloudengines/pogo_e02/pogo_e02.c
> @@ -10,6 +10,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <asm/arch/cpu.h>
> diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c
> index b52358baac..b714712f2a 100644
> --- a/board/compulab/cm_t35/cm_t35.c
> +++ b/board/compulab/cm_t35/cm_t35.c
> @@ -13,6 +13,7 @@
>
>  #include <common.h>
>  #include <env.h>
> +#include <init.h>
>  #include <status_led.h>
>  #include <netdev.h>
>  #include <net.h>
> diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c
> index cec819b36f..30974e8d92 100644
> --- a/board/corscience/tricorder/tricorder.c
> +++ b/board/corscience/tricorder/tricorder.c
> @@ -10,6 +10,7 @@
>   * Frederik Kriewitz <frederik at kriewitz.eu>
>   */
>  #include <common.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <twl4030.h>
>  #include <status_led.h>
> diff --git a/board/cortina/presidio-asic/presidio.c b/board/cortina/presidio-asic/presidio.c
> index b4fa01f368..427151c8df 100644
> --- a/board/cortina/presidio-asic/presidio.c
> +++ b/board/cortina/presidio-asic/presidio.c
> @@ -4,6 +4,7 @@
>   *
>   */
>  #include <common.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <errno.h>
>  #include <netdev.h>
> diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c
> index 66781ef316..4a32893a79 100644
> --- a/board/creative/xfi3/xfi3.c
> +++ b/board/creative/xfi3/xfi3.c
> @@ -11,6 +11,7 @@
>
>  #include <common.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/gpio.h>
>  #include <asm/io.h>
> diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dns325/dns325.c
> index dfdc683683..a0f3dada42 100644
> --- a/board/d-link/dns325/dns325.c
> +++ b/board/d-link/dns325/dns325.c
> @@ -10,6 +10,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <netdev.h>
> diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
> index d9019de6e0..a3b0f8bf09 100644
> --- a/board/davinci/da8xxevm/da850evm.c
> +++ b/board/davinci/da8xxevm/da850evm.c
> @@ -12,6 +12,7 @@
>  #include <dm.h>
>  #include <env.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <net.h>
>  #include <spi.h>
>  #include <spi_flash.h>
> diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
> index 608a7f28eb..adb56c6c87 100644
> --- a/board/davinci/da8xxevm/omapl138_lcdk.c
> +++ b/board/davinci/da8xxevm/omapl138_lcdk.c
> @@ -11,6 +11,7 @@
>  #include <common.h>
>  #include <env.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/arch/hardware.h>
>  #include <asm/ti-common/davinci_nand.h>
> diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
> index f2c3ac3e28..fd6099c566 100644
> --- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c
> +++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/crm_regs.h>
>  #include <asm/arch/imx-regs.h>
> diff --git a/board/ea/mx7ulp_com/mx7ulp_com.c b/board/ea/mx7ulp_com/mx7ulp_com.c
> index 6fc1631bf7..a9b8a32108 100644
> --- a/board/ea/mx7ulp_com/mx7ulp_com.c
> +++ b/board/ea/mx7ulp_com/mx7ulp_com.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/sys_proto.h>
>  #include <asm/arch/mx7ulp-pins.h>
> diff --git a/board/elgin/elgin_rv1108/elgin_rv1108.c b/board/elgin/elgin_rv1108/elgin_rv1108.c
> index c5a1cc95e4..5d8f62244b 100644
> --- a/board/elgin/elgin_rv1108/elgin_rv1108.c
> +++ b/board/elgin/elgin_rv1108/elgin_rv1108.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <syscon.h>
>  #include <asm/io.h>
>  #include <asm/arch-rockchip/clock.h>
> diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c
> index 4e18733001..ee5d4b41f2 100644
> --- a/board/emulation/qemu-arm/qemu-arm.c
> +++ b/board/emulation/qemu-arm/qemu-arm.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <virtio_types.h>
>  #include <virtio.h>
>
> diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c
> index 6359fb3223..62b06783c9 100644
> --- a/board/engicam/common/spl.c
> +++ b/board/engicam/common/spl.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <image.h>
> +#include <init.h>
>  #include <serial.h>
>  #include <spl.h>
>
> diff --git a/board/freescale/b4860qds/ddr.c b/board/freescale/b4860qds/ddr.c
> index de9f5f5f8b..c6cd3f4292 100644
> --- a/board/freescale/b4860qds/ddr.c
> +++ b/board/freescale/b4860qds/ddr.c
> @@ -7,6 +7,7 @@
>  #include <i2c.h>
>  #include <hwconfig.h>
>  #include <fsl_ddr.h>
> +#include <init.h>
>  #include <asm/mmu.h>
>  #include <fsl_ddr_sdram.h>
>  #include <fsl_ddr_dimm_params.h>
> diff --git a/board/freescale/bsc9131rdb/bsc9131rdb.c b/board/freescale/bsc9131rdb/bsc9131rdb.c
> index 871d066d68..75c2aec75d 100644
> --- a/board/freescale/bsc9131rdb/bsc9131rdb.c
> +++ b/board/freescale/bsc9131rdb/bsc9131rdb.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <image.h>
> +#include <init.h>
>  #include <asm/processor.h>
>  #include <asm/mmu.h>
>  #include <asm/cache.h>
> diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
> index c487e3a515..71af645b03 100644
> --- a/board/freescale/common/sys_eeprom.c
> +++ b/board/freescale/common/sys_eeprom.c
> @@ -10,6 +10,7 @@
>  #include <command.h>
>  #include <env.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <linux/ctype.h>
>  #include <u-boot/crc.h>
>
> diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
> index 9c8731ce78..073f3ac704 100644
> --- a/board/freescale/corenet_ds/ddr.c
> +++ b/board/freescale/corenet_ds/ddr.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <hwconfig.h>
> +#include <init.h>
>  #include <vsprintf.h>
>  #include <asm/mmu.h>
>  #include <fsl_ddr_sdram.h>
> diff --git a/board/freescale/imx8mm_evk/imx8mm_evk.c b/board/freescale/imx8mm_evk/imx8mm_evk.c
> index 53ebb949df..1f95f3b0c4 100644
> --- a/board/freescale/imx8mm_evk/imx8mm_evk.c
> +++ b/board/freescale/imx8mm_evk/imx8mm_evk.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <netdev.h>
>
> diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
> index f73ade5549..3abf6be482 100644
> --- a/board/freescale/imx8mm_evk/spl.c
> +++ b/board/freescale/imx8mm_evk/spl.c
> @@ -7,6 +7,7 @@
>  #include <cpu_func.h>
>  #include <hang.h>
>  #include <image.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/io.h>
>  #include <asm/mach-imx/iomux-v3.h>
> diff --git a/board/freescale/imx8mn_evk/imx8mn_evk.c b/board/freescale/imx8mn_evk/imx8mn_evk.c
> index 4f33c0e7c9..8bd54ea2aa 100644
> --- a/board/freescale/imx8mn_evk/imx8mn_evk.c
> +++ b/board/freescale/imx8mn_evk/imx8mn_evk.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
> index 7cb7f6e60b..fae1f0c9c7 100644
> --- a/board/freescale/imx8mn_evk/spl.c
> +++ b/board/freescale/imx8mn_evk/spl.c
> @@ -8,6 +8,7 @@
>  #include <cpu_func.h>
>  #include <hang.h>
>  #include <image.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/io.h>
>  #include <asm/mach-imx/iomux-v3.h>
> diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c
> index f004af681b..aa5100f5bf 100644
> --- a/board/freescale/imx8mp_evk/imx8mp_evk.c
> +++ b/board/freescale/imx8mp_evk/imx8mp_evk.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <errno.h>
> +#include <init.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 79b504d409..e84e470ac2 100644
> --- a/board/freescale/imx8mp_evk/spl.c
> +++ b/board/freescale/imx8mp_evk/spl.c
> @@ -8,6 +8,7 @@
>  #include <cpu_func.h>
>  #include <hang.h>
>  #include <image.h>
> +#include <init.h>
>  #include <spl.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 8b5b240edf..69ca7c37f5 100644
> --- a/board/freescale/imx8mq_evk/spl.c
> +++ b/board/freescale/imx8mq_evk/spl.c
> @@ -8,6 +8,7 @@
>  #include <common.h>
>  #include <hang.h>
>  #include <image.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <errno.h>
>  #include <asm/io.h>
> diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c
> index c5c07089a2..38a981cf8b 100644
> --- a/board/freescale/imx8qm_mek/spl.c
> +++ b/board/freescale/imx8qm_mek/spl.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <image.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <dm/uclass.h>
>  #include <dm/device.h>
> diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
> index 3cbbc9b84c..74c2ea2e6c 100644
> --- a/board/freescale/imx8qxp_mek/spl.c
> +++ b/board/freescale/imx8qxp_mek/spl.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <image.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <dm/uclass.h>
>  #include <dm/device.h>
> diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk.c b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
> index bda03b5ea5..b6a0d2567e 100644
> --- a/board/freescale/imxrt1050-evk/imxrt1050-evk.c
> +++ b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <spl.h>
>  #include <asm/io.h>
> diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c
> index 8260e7f797..f63377fdd6 100644
> --- a/board/freescale/ls1012afrdm/ls1012afrdm.c
> +++ b/board/freescale/ls1012afrdm/ls1012afrdm.c
> @@ -7,6 +7,7 @@
>  #include <fdt_support.h>
>  #include <i2c.h>
>  #include <asm/cache.h>
> +#include <init.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 e41f7e41bb..24978314a1 100644
> --- a/board/freescale/ls1012aqds/ls1012aqds.c
> +++ b/board/freescale/ls1012aqds/ls1012aqds.c
> @@ -7,6 +7,7 @@
>  #include <i2c.h>
>  #include <fdt_support.h>
>  #include <asm/cache.h>
> +#include <init.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 8633268ed7..fc929c441c 100644
> --- a/board/freescale/ls1012ardb/ls1012ardb.c
> +++ b/board/freescale/ls1012ardb/ls1012ardb.c
> @@ -8,6 +8,7 @@
>  #include <hang.h>
>  #include <i2c.h>
>  #include <asm/cache.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/fsl_serdes.h>
> diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
> index d3e2e53321..d854b51155 100644
> --- a/board/freescale/ls1021aqds/ddr.c
> +++ b/board/freescale/ls1021aqds/ddr.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <fsl_ddr_sdram.h>
>  #include <fsl_ddr_dimm_params.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
>  #include "ddr.h"
> diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c
> index feeae9b406..fd7815e128 100644
> --- a/board/freescale/ls1028a/ls1028a.c
> +++ b/board/freescale/ls1028a/ls1028a.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <errno.h>
>  #include <fsl_ddr.h>
> diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
> index 2d4b18cdbc..032207af8a 100644
> --- a/board/freescale/ls1043aqds/ls1043aqds.c
> +++ b/board/freescale/ls1043aqds/ls1043aqds.c
> @@ -8,6 +8,7 @@
>  #include <i2c.h>
>  #include <fdt_support.h>
>  #include <fsl_ddr_sdram.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/fsl_serdes.h>
> diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c
> index 26a192957b..0b5f26515a 100644
> --- a/board/freescale/ls1043ardb/ls1043ardb.c
> +++ b/board/freescale/ls1043ardb/ls1043ardb.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/fsl_serdes.h>
> diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c
> index 71ace192e2..e815bf84fb 100644
> --- a/board/freescale/ls1046afrwy/ls1046afrwy.c
> +++ b/board/freescale/ls1046afrwy/ls1046afrwy.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <fdt_support.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/fsl_serdes.h>
> diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
> index e6648e9d70..b77b2ed40e 100644
> --- a/board/freescale/ls1046aqds/ls1046aqds.c
> +++ b/board/freescale/ls1046aqds/ls1046aqds.c
> @@ -8,6 +8,7 @@
>  #include <i2c.h>
>  #include <fdt_support.h>
>  #include <fsl_ddr_sdram.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/fsl_serdes.h>
> diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c
> index 5308cb2e1c..27e213f796 100644
> --- a/board/freescale/ls1046ardb/ls1046ardb.c
> +++ b/board/freescale/ls1046ardb/ls1046ardb.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <fdt_support.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/fsl_serdes.h>
> diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
> index 225e787c75..1b10aa759b 100644
> --- a/board/freescale/ls1088a/ls1088a.c
> +++ b/board/freescale/ls1088a/ls1088a.c
> @@ -5,6 +5,7 @@
>  #include <common.h>
>  #include <env.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <errno.h>
>  #include <netdev.h>
> diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
> index f144bf6b37..95e99eabd7 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 <init.h>
>  #include <malloc.h>
>  #include <errno.h>
>  #include <net.h>
> diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
> index 4034bdee28..5f95f3c301 100644
> --- a/board/freescale/ls2080aqds/ls2080aqds.c
> +++ b/board/freescale/ls2080aqds/ls2080aqds.c
> @@ -4,6 +4,7 @@
>   */
>  #include <common.h>
>  #include <env.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <errno.h>
>  #include <netdev.h>
> diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
> index 5e2fc7cc98..b1fa3297a3 100644
> --- a/board/freescale/ls2080ardb/ls2080ardb.c
> +++ b/board/freescale/ls2080ardb/ls2080ardb.c
> @@ -5,6 +5,7 @@
>   */
>  #include <common.h>
>  #include <env.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <errno.h>
>  #include <netdev.h>
> diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
> index 0d94107def..fba068c824 100644
> --- a/board/freescale/lx2160a/lx2160a.c
> +++ b/board/freescale/lx2160a/lx2160a.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <clock_legacy.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <dm/platform_data/serial_pl01x.h>
>  #include <i2c.h>
>  #include <malloc.h>
> diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c
> index 87368564af..3197421781 100644
> --- a/board/freescale/m5253demo/flash.c
> +++ b/board/freescale/m5253demo/flash.c
> @@ -9,6 +9,7 @@
>
>  #include <common.h>
>  #include <flash.h>
> +#include <init.h>
>  #include <irq_func.h>
>
>  #include <asm/immap.h>
> diff --git a/board/freescale/m5282evb/m5282evb.c b/board/freescale/m5282evb/m5282evb.c
> index 065e3e71f5..251be667d4 100644
> --- a/board/freescale/m5282evb/m5282evb.c
> +++ b/board/freescale/m5282evb/m5282evb.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/immap.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
> diff --git a/board/freescale/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c
> index c8e30a0947..5874e1a924 100644
> --- a/board/freescale/mpc8313erdb/sdram.c
> +++ b/board/freescale/mpc8313erdb/sdram.c
> @@ -8,6 +8,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <mpc83xx.h>
>  #include <spd_sdram.h>
>
> diff --git a/board/freescale/mpc8315erdb/sdram.c b/board/freescale/mpc8315erdb/sdram.c
> index 2f0f29a0e5..13bfc1e5f1 100644
> --- a/board/freescale/mpc8315erdb/sdram.c
> +++ b/board/freescale/mpc8315erdb/sdram.c
> @@ -8,6 +8,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <mpc83xx.h>
>  #include <spd_sdram.h>
>
> diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
> index 0996b87c0f..5451437f37 100644
> --- a/board/freescale/mpc8349emds/mpc8349emds.c
> +++ b/board/freescale/mpc8349emds/mpc8349emds.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <fdt_support.h>
> +#include <init.h>
>  #include <ioports.h>
>  #include <mpc83xx.h>
>  #include <asm/mpc8349_pci.h>
> diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
> index a2e284f1a2..5d78fea336 100644
> --- a/board/freescale/mpc8349itx/mpc8349itx.c
> +++ b/board/freescale/mpc8349itx/mpc8349itx.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <fdt_support.h>
> +#include <init.h>
>  #include <ioports.h>
>  #include <mpc83xx.h>
>  #include <i2c.h>
> diff --git a/board/freescale/mx23evk/mx23evk.c b/board/freescale/mx23evk/mx23evk.c
> index 6f4d34b9ed..6cfff04966 100644
> --- a/board/freescale/mx23evk/mx23evk.c
> +++ b/board/freescale/mx23evk/mx23evk.c
> @@ -12,6 +12,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/gpio.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/arch/clock.h>
> diff --git a/board/freescale/mx28evk/mx28evk.c b/board/freescale/mx28evk/mx28evk.c
> index e5fa4ae765..4272bacf5e 100644
> --- a/board/freescale/mx28evk/mx28evk.c
> +++ b/board/freescale/mx28evk/mx28evk.c
> @@ -12,6 +12,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/gpio.h>
>  #include <asm/io.h>
> diff --git a/board/freescale/mx6memcal/mx6memcal.c b/board/freescale/mx6memcal/mx6memcal.c
> index d01127eccc..ea7a56369d 100644
> --- a/board/freescale/mx6memcal/mx6memcal.c
> +++ b/board/freescale/mx6memcal/mx6memcal.c
> @@ -8,6 +8,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch/sys_proto.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
> diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c
> index be551bc375..c11eee51b6 100644
> --- a/board/freescale/mx6memcal/spl.c
> +++ b/board/freescale/mx6memcal/spl.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.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 3866020a6d..5c08ecbb96 100644
> --- a/board/freescale/mx6qarm2/mx6qarm2.c
> +++ b/board/freescale/mx6qarm2/mx6qarm2.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/imx-regs.h>
> diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
> index 38fc30553c..7dd00bda38 100644
> --- a/board/freescale/mx6slevk/mx6slevk.c
> +++ b/board/freescale/mx6slevk/mx6slevk.c
> @@ -5,6 +5,7 @@
>   * Author: Fabio Estevam <fabio.estevam at freescale.com>
>   */
>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/iomux.h>
> diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
> index c939514a5f..1594285860 100644
> --- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c
> +++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <fdt_support.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/sys_proto.h>
>  #include <asm/arch/mx7ulp-pins.h>
> diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
> index 8bcd2fb5a7..a30a0738dc 100644
> --- a/board/freescale/p2041rdb/ddr.c
> +++ b/board/freescale/p2041rdb/ddr.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <hwconfig.h>
> +#include <init.h>
>  #include <asm/mmu.h>
>  #include <fsl_ddr_sdram.h>
>  #include <fsl_ddr_dimm_params.h>
> diff --git a/board/freescale/t102xqds/ddr.c b/board/freescale/t102xqds/ddr.c
> index 998a2a5d3f..c3a60d6087 100644
> --- a/board/freescale/t102xqds/ddr.c
> +++ b/board/freescale/t102xqds/ddr.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <hwconfig.h>
> +#include <init.h>
>  #include <asm/mmu.h>
>  #include <fsl_ddr_sdram.h>
>  #include <fsl_ddr_dimm_params.h>
> diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
> index 043f0b5b84..2ab6e62c5a 100644
> --- a/board/freescale/t102xrdb/ddr.c
> +++ b/board/freescale/t102xrdb/ddr.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <hwconfig.h>
> +#include <init.h>
>  #include <asm/mmu.h>
>  #include <fsl_ddr_sdram.h>
>  #include <fsl_ddr_dimm_params.h>
> diff --git a/board/freescale/t1040qds/ddr.c b/board/freescale/t1040qds/ddr.c
> index 2b1d768f1b..c9639e9170 100644
> --- a/board/freescale/t1040qds/ddr.c
> +++ b/board/freescale/t1040qds/ddr.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <hwconfig.h>
> +#include <init.h>
>  #include <asm/mmu.h>
>  #include <fsl_ddr_sdram.h>
>  #include <fsl_ddr_dimm_params.h>
> diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
> index 2b1b28da88..ae365652c2 100644
> --- a/board/freescale/t104xrdb/ddr.c
> +++ b/board/freescale/t104xrdb/ddr.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <hwconfig.h>
> +#include <init.h>
>  #include <asm/mmu.h>
>  #include <fsl_ddr_sdram.h>
>  #include <fsl_ddr_dimm_params.h>
> diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
> index a2a56540b5..5a97a84948 100644
> --- a/board/freescale/t208xqds/ddr.c
> +++ b/board/freescale/t208xqds/ddr.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <hwconfig.h>
> +#include <init.h>
>  #include <asm/mmu.h>
>  #include <fsl_ddr_sdram.h>
>  #include <fsl_ddr_dimm_params.h>
> diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
> index 0b16982f06..78316ffe84 100644
> --- a/board/freescale/t208xrdb/ddr.c
> +++ b/board/freescale/t208xrdb/ddr.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <hwconfig.h>
> +#include <init.h>
>  #include <asm/mmu.h>
>  #include <fsl_ddr_sdram.h>
>  #include <fsl_ddr_dimm_params.h>
> diff --git a/board/freescale/t4qds/ddr.c b/board/freescale/t4qds/ddr.c
> index 08656b4e30..5a6d0eb69b 100644
> --- a/board/freescale/t4qds/ddr.c
> +++ b/board/freescale/t4qds/ddr.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <hwconfig.h>
> +#include <init.h>
>  #include <asm/mmu.h>
>  #include <fsl_ddr_sdram.h>
>  #include <fsl_ddr_dimm_params.h>
> diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
> index 787de6d7ad..3b67186cc2 100644
> --- a/board/freescale/t4rdb/ddr.c
> +++ b/board/freescale/t4rdb/ddr.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <hwconfig.h>
> +#include <init.h>
>  #include <asm/mmu.h>
>  #include <fsl_ddr_sdram.h>
>  #include <fsl_ddr_dimm_params.h>
> diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
> index 1443ef91ef..2ef213ce0f 100644
> --- a/board/gateworks/gw_ventana/gw_ventana.c
> +++ b/board/gateworks/gw_ventana/gw_ventana.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/crm_regs.h>
> diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
> index 80fec5f9cf..3ccd65271e 100644
> --- a/board/gateworks/gw_ventana/gw_ventana_spl.c
> +++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <env.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/crm_regs.h>
>  #include <asm/arch/mx6-ddr.h>
> diff --git a/board/google/gru/gru.c b/board/google/gru/gru.c
> index b6b4f19d84..7dfbc3ac86 100644
> --- a/board/google/gru/gru.c
> +++ b/board/google/gru/gru.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>
>  #ifdef CONFIG_SPL_BUILD
>  /* provided to defeat compiler optimisation in board_init_f() */
> diff --git a/board/google/veyron/veyron.c b/board/google/veyron/veyron.c
> index 6b9c34818b..4a847edd89 100644
> --- a/board/google/veyron/veyron.c
> +++ b/board/google/veyron/veyron.c
> @@ -6,6 +6,7 @@
>  #include <clk.h>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <asm/arch-rockchip/clock.h>
>  #include <dt-bindings/clock/rk3288-cru.h>
>  #include <linux/err.h>
> diff --git a/board/gumstix/duovero/duovero.c b/board/gumstix/duovero/duovero.c
> index cbb1cd0f8f..7b6fd5c737 100644
> --- a/board/gumstix/duovero/duovero.c
> +++ b/board/gumstix/duovero/duovero.c
> @@ -5,6 +5,7 @@
>   * Maintainer: Ash Charles  <ash at gumstix.com>
>   */
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <netdev.h>
>  #include <asm/arch/sys_proto.h>
> diff --git a/board/gumstix/pepper/board.c b/board/gumstix/pepper/board.c
> index 2a6a449306..ebb5a560c3 100644
> --- a/board/gumstix/pepper/board.c
> +++ b/board/gumstix/pepper/board.c
> @@ -9,6 +9,7 @@
>  #include <common.h>
>  #include <env.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <net.h>
>  #include <serial.h>
>  #include <spl.h>
> diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
> index ffde1161d0..063831dfe8 100644
> --- a/board/highbank/highbank.c
> +++ b/board/highbank/highbank.c
> @@ -8,6 +8,7 @@
>  #include <cpu_func.h>
>  #include <env.h>
>  #include <fdt_support.h>
> +#include <init.h>
>  #include <net.h>
>  #include <netdev.h>
>  #include <scsi.h>
> diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c
> index 84400090b3..2a50b8458a 100644
> --- a/board/hisilicon/hikey/hikey.c
> +++ b/board/hisilicon/hikey/hikey.c
> @@ -7,6 +7,7 @@
>  #include <cpu_func.h>
>  #include <dm.h>
>  #include <fdt_support.h>
> +#include <init.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 0ed62c7d84..89a922fb82 100644
> --- a/board/hisilicon/hikey960/hikey960.c
> +++ b/board/hisilicon/hikey960/hikey960.c
> @@ -9,6 +9,7 @@
>  #include <dm.h>
>  #include <errno.h>
>  #include <asm/cache.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/hi3660.h>
>  #include <asm/armv8/mmu.h>
> diff --git a/board/imgtec/boston/checkboard.c b/board/imgtec/boston/checkboard.c
> index 46ec1e8d9c..1b8a47d254 100644
> --- a/board/imgtec/boston/checkboard.c
> +++ b/board/imgtec/boston/checkboard.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>
>  #include <asm/io.h>
>  #include <asm/mipsregs.h>
> diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c
> index 170ea12c93..66c64f8056 100644
> --- a/board/imgtec/ci20/ci20.c
> +++ b/board/imgtec/ci20/ci20.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <env.h>
> +#include <init.h>
>  #include <net.h>
>  #include <netdev.h>
>  #include <asm/io.h>
> diff --git a/board/imgtec/xilfpga/xilfpga.c b/board/imgtec/xilfpga/xilfpga.c
> index 86645155e6..0b68bbde50 100644
> --- a/board/imgtec/xilfpga/xilfpga.c
> +++ b/board/imgtec/xilfpga/xilfpga.c
> @@ -9,6 +9,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/board/intel/cougarcanyon2/cougarcanyon2.c b/board/intel/cougarcanyon2/cougarcanyon2.c
> index 7aadd9e477..ce11eae59d 100644
> --- a/board/intel/cougarcanyon2/cougarcanyon2.c
> +++ b/board/intel/cougarcanyon2/cougarcanyon2.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <pci.h>
>  #include <smsc_sio1007.h>
>  #include <asm/ibmpc.h>
> diff --git a/board/intel/crownbay/crownbay.c b/board/intel/crownbay/crownbay.c
> index 57dce4185d..55095deead 100644
> --- a/board/intel/crownbay/crownbay.c
> +++ b/board/intel/crownbay/crownbay.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/ibmpc.h>
>  #include <asm/pnp_def.h>
>  #include <smsc_lpc47m.h>
> diff --git a/board/intel/minnowmax/minnowmax.c b/board/intel/minnowmax/minnowmax.c
> index e5fc939793..e486f9d7d9 100644
> --- a/board/intel/minnowmax/minnowmax.c
> +++ b/board/intel/minnowmax/minnowmax.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <asm/gpio.h>
>  #include <dm/device-internal.h>
>  #include <dm/uclass-internal.h>
> diff --git a/board/iomega/iconnect/iconnect.c b/board/iomega/iconnect/iconnect.c
> index fc7847bd1d..79c794bfc8 100644
> --- a/board/iomega/iconnect/iconnect.c
> +++ b/board/iomega/iconnect/iconnect.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <asm/arch/cpu.h>
>  #include <asm/arch/soc.h>
> diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
> index 0ad601f39b..887ec6a66b 100644
> --- a/board/isee/igep00x0/igep00x0.c
> +++ b/board/isee/igep00x0/igep00x0.c
> @@ -5,6 +5,7 @@
>   */
>  #include <common.h>
>  #include <env.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <net.h>
>  #include <status_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 25a5e4b9ba..01c8691f31 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
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/crm_regs.h>
>  #include <asm/arch/imx-regs.h>
> diff --git a/board/keymile/kmp204x/ddr.c b/board/keymile/kmp204x/ddr.c
> index ee2e3d6b9a..bea9451aec 100644
> --- a/board/keymile/kmp204x/ddr.c
> +++ b/board/keymile/kmp204x/ddr.c
> @@ -9,6 +9,7 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <hwconfig.h>
> +#include <init.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 c6117b33bc..7bc66af193 100644
> --- a/board/kmc/kzm9g/kzm9g.c
> +++ b/board/kmc/kzm9g/kzm9g.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/io.h>
>  #include <asm/arch/sys_proto.h>
> diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
> index f8134b7042..97b152664a 100644
> --- a/board/kobol/helios4/helios4.c
> +++ b/board/kobol/helios4/helios4.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <netdev.h>
> diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c
> index fa099e95f5..51b669a891 100644
> --- a/board/lego/ev3/legoev3.c
> +++ b/board/lego/ev3/legoev3.c
> @@ -14,6 +14,7 @@
>
>  #include <common.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <spi.h>
>  #include <spi_flash.h>
>  #include <asm/arch/hardware.h>
> diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c
> index b4205d6ed4..2825eccc03 100644
> --- a/board/lg/sniper/sniper.c
> +++ b/board/lg/sniper/sniper.c
> @@ -9,6 +9,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <env.h>
> +#include <init.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 a362d25c01..b979ddd296 100644
> --- a/board/liebherr/display5/display5.c
> +++ b/board/liebherr/display5/display5.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <fdt_support.h>
> +#include <init.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 0f5eab79b5..fc3ebaf145 100644
> --- a/board/liebherr/display5/spl.c
> +++ b/board/liebherr/display5/spl.c
> @@ -8,6 +8,7 @@
>  #include <cpu_func.h>
>  #include <env.h>
>  #include <image.h>
> +#include <init.h>
>  #include <serial.h>
>  #include <spl.h>
>  #include <linux/libfdt.h>
> diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c
> index 8ed8e03295..f40e814f86 100644
> --- a/board/liebherr/mccmon6/spl.c
> +++ b/board/liebherr/mccmon6/spl.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <image.h>
> +#include <init.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 95c9064066..41fa21292e 100644
> --- a/board/liebherr/xea/xea.c
> +++ b/board/liebherr/xea/xea.c
> @@ -15,6 +15,7 @@
>
>  #include <common.h>
>  #include <fdt_support.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/gpio.h>
>  #include <asm/io.h>
> diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c
> index 6ed3a9b847..b25b02b641 100644
> --- a/board/logicpd/am3517evm/am3517evm.c
> +++ b/board/logicpd/am3517evm/am3517evm.c
> @@ -12,6 +12,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <net.h>
>  #include <ns16550.h>
>  #include <serial.h>
> diff --git a/board/logicpd/zoom1/zoom1.c b/board/logicpd/zoom1/zoom1.c
> index 7438d37923..53dc9762f8 100644
> --- a/board/logicpd/zoom1/zoom1.c
> +++ b/board/logicpd/zoom1/zoom1.c
> @@ -16,6 +16,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <env.h>
> +#include <init.h>
>  #include <net.h>
>  #include <ns16550.h>
>  #include <netdev.h>
> diff --git a/board/maxbcm/maxbcm.c b/board/maxbcm/maxbcm.c
> index 395904f8c8..3c6422214f 100644
> --- a/board/maxbcm/maxbcm.c
> +++ b/board/maxbcm/maxbcm.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <asm/io.h>
>  #include <asm/arch/cpu.h>
> diff --git a/board/mediatek/mt7622/mt7622_rfb.c b/board/mediatek/mt7622/mt7622_rfb.c
> index b9296bede2..912b993240 100644
> --- a/board/mediatek/mt7622/mt7622_rfb.c
> +++ b/board/mediatek/mt7622/mt7622_rfb.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <config.h>
> +#include <init.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/board/mediatek/mt8518/mt8518_ap1.c b/board/mediatek/mt8518/mt8518_ap1.c
> index 2ac7c6cd18..72284a2689 100644
> --- a/board/mediatek/mt8518/mt8518_ap1.c
> +++ b/board/mediatek/mt8518/mt8518_ap1.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/board/microchip/mpfs_icicle/mpfs_icicle.c b/board/microchip/mpfs_icicle/mpfs_icicle.c
> index 0ef243186d..8381361ec3 100644
> --- a/board/microchip/mpfs_icicle/mpfs_icicle.c
> +++ b/board/microchip/mpfs_icicle/mpfs_icicle.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <asm/io.h>
>
>  #define MPFS_SYSREG_SOFT_RESET ((unsigned int *)0x20002088)
> diff --git a/board/microchip/pic32mzda/pic32mzda.c b/board/microchip/pic32mzda/pic32mzda.c
> index aa8aab39ce..e7337deea7 100644
> --- a/board/microchip/pic32mzda/pic32mzda.c
> +++ b/board/microchip/pic32mzda/pic32mzda.c
> @@ -10,6 +10,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <clk.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <dt-bindings/clock/microchip,clock.h>
>  #include <mach/pic32.h>
> diff --git a/board/mikrotik/crs305-1g-4s/crs305-1g-4s.c b/board/mikrotik/crs305-1g-4s/crs305-1g-4s.c
> index d1d1f40092..4b67a4ba2d 100644
> --- a/board/mikrotik/crs305-1g-4s/crs305-1g-4s.c
> +++ b/board/mikrotik/crs305-1g-4s/crs305-1g-4s.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <asm/gpio.h>
>  #include <linux/mbus.h>
>  #include <linux/io.h>
> diff --git a/board/netgear/dgnd3700v2/dgnd3700v2.c b/board/netgear/dgnd3700v2/dgnd3700v2.c
> index 6840a21001..d9c0200f24 100644
> --- a/board/netgear/dgnd3700v2/dgnd3700v2.c
> +++ b/board/netgear/dgnd3700v2/dgnd3700v2.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>
>  #define GPIO_BASE_6362                 0x10000080
> diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
> index 71ca79deab..92b5c20b51 100644
> --- a/board/nokia/rx51/rx51.c
> +++ b/board/nokia/rx51/rx51.c
> @@ -23,6 +23,7 @@
>
>  #include <common.h>
>  #include <env.h>
> +#include <init.h>
>  #include <watchdog.h>
>  #include <malloc.h>
>  #include <twl4030.h>
> diff --git a/board/novtech/meerkat96/meerkat96.c b/board/novtech/meerkat96/meerkat96.c
> index 5fb4d43997..b13e7ce3b1 100644
> --- a/board/novtech/meerkat96/meerkat96.c
> +++ b/board/novtech/meerkat96/meerkat96.c
> @@ -4,6 +4,7 @@
>   * Copyright (C) 2016 NXP Semiconductors
>   */
>
> +#include <init.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/arch/mx7-pins.h>
> diff --git a/board/olimex/mx23_olinuxino/mx23_olinuxino.c b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
> index f1d7cb8c93..cfe33d3072 100644
> --- a/board/olimex/mx23_olinuxino/mx23_olinuxino.c
> +++ b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/gpio.h>
>  #include <asm/io.h>
>  #include <asm/arch/iomux-mx23.h>
> diff --git a/board/overo/overo.c b/board/overo/overo.c
> index f7da1a95ea..7a54719e87 100644
> --- a/board/overo/overo.c
> +++ b/board/overo/overo.c
> @@ -14,6 +14,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <env.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <net.h>
>  #include <ns16550.h>
> diff --git a/board/pandora/pandora.c b/board/pandora/pandora.c
> index a9aae7951d..bb310d9e68 100644
> --- a/board/pandora/pandora.c
> +++ b/board/pandora/pandora.c
> @@ -14,6 +14,7 @@
>   */
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <ns16550.h>
>  #include <twl4030.h>
>  #include <asm/io.h>
> diff --git a/board/phytec/pcl063/spl.c b/board/phytec/pcl063/spl.c
> index b5e080c072..48cb2e267c 100644
> --- a/board/phytec/pcl063/spl.c
> +++ b/board/phytec/pcl063/spl.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/arch/clock.h>
>  #include <asm/io.h>
> diff --git a/board/phytec/pcm051/board.c b/board/phytec/pcm051/board.c
> index e561c82253..6f1ada82c4 100644
> --- a/board/phytec/pcm051/board.c
> +++ b/board/phytec/pcm051/board.c
> @@ -11,6 +11,7 @@
>  #include <common.h>
>  #include <env.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <net.h>
>  #include <spl.h>
>  #include <asm/arch/cpu.h>
> diff --git a/board/phytium/durian/durian.c b/board/phytium/durian/durian.c
> index 91d13bdea4..7dceebdeae 100644
> --- a/board/phytium/durian/durian.c
> +++ b/board/phytium/durian/durian.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <asm/armv8/mmu.h>
>  #include <asm/cache.h>
>  #include <asm/system.h>
> diff --git a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c
> index 3f60235771..d79084614f 100644
> --- a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c
> +++ b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <syscon.h>
>  #include <asm/io.h>
>  #include <asm/arch-rockchip/clock.h>
> diff --git a/board/ppcag/bg0900/bg0900.c b/board/ppcag/bg0900/bg0900.c
> index 00afff3abf..70870797bb 100644
> --- a/board/ppcag/bg0900/bg0900.c
> +++ b/board/ppcag/bg0900/bg0900.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/gpio.h>
>  #include <asm/io.h>
> diff --git a/board/qca/ap121/ap121.c b/board/qca/ap121/ap121.c
> index 24acdcb2e6..60a2e19143 100644
> --- a/board/qca/ap121/ap121.c
> +++ b/board/qca/ap121/ap121.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/addrspace.h>
>  #include <asm/types.h>
> diff --git a/board/qca/ap143/ap143.c b/board/qca/ap143/ap143.c
> index 8ee26ababa..ac65054136 100644
> --- a/board/qca/ap143/ap143.c
> +++ b/board/qca/ap143/ap143.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/addrspace.h>
>  #include <asm/types.h>
> diff --git a/board/qca/ap152/ap152.c b/board/qca/ap152/ap152.c
> index 30cd56563b..1064705d26 100644
> --- a/board/qca/ap152/ap152.c
> +++ b/board/qca/ap152/ap152.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/addrspace.h>
>  #include <asm/types.h>
> diff --git a/board/qemu-mips/qemu-mips.c b/board/qemu-mips/qemu-mips.c
> index b3e0830843..cf22ed5627 100644
> --- a/board/qemu-mips/qemu-mips.c
> +++ b/board/qemu-mips/qemu-mips.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <command.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/mipsregs.h>
>  #include <asm/io.h>
> diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c
> index 3134415d80..c1ade5ce43 100644
> --- a/board/qualcomm/dragonboard820c/dragonboard820c.c
> +++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <asm/arch/sysmap-apq8096.h>
>  #include <env.h>
>  #include <asm/cache.h>
> diff --git a/board/raidsonic/ib62x0/ib62x0.c b/board/raidsonic/ib62x0/ib62x0.c
> index e8aae4cb81..db1b0adc38 100644
> --- a/board/raidsonic/ib62x0/ib62x0.c
> +++ b/board/raidsonic/ib62x0/ib62x0.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <asm/io.h>
>  #include <asm/arch/cpu.h>
> diff --git a/board/renesas/MigoR/migo_r.c b/board/renesas/MigoR/migo_r.c
> index 3ffd9ad75d..f8bdb4d48a 100644
> --- a/board/renesas/MigoR/migo_r.c
> +++ b/board/renesas/MigoR/migo_r.c
> @@ -10,6 +10,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <netdev.h>
>  #include <asm/io.h>
> diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
> index a6d7cb48a2..de487ff4b7 100644
> --- a/board/renesas/alt/alt.c
> +++ b/board/renesas/alt/alt.c
> @@ -9,6 +9,7 @@
>  #include <cpu_func.h>
>  #include <env.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <dm.h>
>  #include <dm/platform_data/serial_sh.h>
> diff --git a/board/renesas/alt/alt_spl.c b/board/renesas/alt/alt_spl.c
> index dbb210584d..a9c289447e 100644
> --- a/board/renesas/alt/alt_spl.c
> +++ b/board/renesas/alt/alt_spl.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <dm/platform_data/serial_sh.h>
>  #include <asm/processor.h>
> diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
> index 892f7e7260..400c166b90 100644
> --- a/board/renesas/blanche/blanche.c
> +++ b/board/renesas/blanche/blanche.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/arch/mmc.h>
>  #include <asm/arch/rcar-mstp.h>
> diff --git a/board/renesas/condor/condor.c b/board/renesas/condor/condor.c
> index 6505beda81..91afcdd85a 100644
> --- a/board/renesas/condor/condor.c
> +++ b/board/renesas/condor/condor.c
> @@ -9,6 +9,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <hang.h>
> +#include <init.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 2f9364c484..5f37a19600 100644
> --- a/board/renesas/draak/draak.c
> +++ b/board/renesas/draak/draak.c
> @@ -9,6 +9,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <netdev.h>
>  #include <dm.h>
> diff --git a/board/renesas/eagle/eagle.c b/board/renesas/eagle/eagle.c
> index cf06a173e4..6228f22e01 100644
> --- a/board/renesas/eagle/eagle.c
> +++ b/board/renesas/eagle/eagle.c
> @@ -9,6 +9,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <netdev.h>
>  #include <dm.h>
> diff --git a/board/renesas/ebisu/ebisu.c b/board/renesas/ebisu/ebisu.c
> index 81d7f8eafa..d164a36361 100644
> --- a/board/renesas/ebisu/ebisu.c
> +++ b/board/renesas/ebisu/ebisu.c
> @@ -9,6 +9,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <netdev.h>
>  #include <dm.h>
> diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
> index eb6ee6f6a4..aec947ab5a 100644
> --- a/board/renesas/gose/gose.c
> +++ b/board/renesas/gose/gose.c
> @@ -9,6 +9,7 @@
>  #include <cpu_func.h>
>  #include <env.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <dm.h>
>  #include <dm/platform_data/serial_sh.h>
> diff --git a/board/renesas/gose/gose_spl.c b/board/renesas/gose/gose_spl.c
> index 42a6758148..b1b2ceb607 100644
> --- a/board/renesas/gose/gose_spl.c
> +++ b/board/renesas/gose/gose_spl.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <dm/platform_data/serial_sh.h>
>  #include <asm/processor.h>
> diff --git a/board/renesas/grpeach/grpeach.c b/board/renesas/grpeach/grpeach.c
> index ba904609ae..b92e01ca98 100644
> --- a/board/renesas/grpeach/grpeach.c
> +++ b/board/renesas/grpeach/grpeach.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.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 e09d3d0a63..67ac85d580 100644
> --- a/board/renesas/koelsch/koelsch.c
> +++ b/board/renesas/koelsch/koelsch.c
> @@ -10,6 +10,7 @@
>  #include <cpu_func.h>
>  #include <env.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <dm.h>
>  #include <dm/platform_data/serial_sh.h>
> diff --git a/board/renesas/koelsch/koelsch_spl.c b/board/renesas/koelsch/koelsch_spl.c
> index b3530d7ce7..a321678e1b 100644
> --- a/board/renesas/koelsch/koelsch_spl.c
> +++ b/board/renesas/koelsch/koelsch_spl.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <dm/platform_data/serial_sh.h>
>  #include <asm/processor.h>
> diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
> index 9ac9515925..1a5877bf15 100644
> --- a/board/renesas/lager/lager.c
> +++ b/board/renesas/lager/lager.c
> @@ -12,6 +12,7 @@
>  #include <env.h>
>  #include <env_internal.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <netdev.h>
>  #include <dm.h>
> diff --git a/board/renesas/lager/lager_spl.c b/board/renesas/lager/lager_spl.c
> index d7db361b12..ceaf164e78 100644
> --- a/board/renesas/lager/lager_spl.c
> +++ b/board/renesas/lager/lager_spl.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <dm/platform_data/serial_sh.h>
>  #include <asm/processor.h>
> diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
> index 097710b479..acff2e3b39 100644
> --- a/board/renesas/porter/porter.c
> +++ b/board/renesas/porter/porter.c
> @@ -10,6 +10,7 @@
>  #include <cpu_func.h>
>  #include <env.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <dm.h>
>  #include <dm/platform_data/serial_sh.h>
> diff --git a/board/renesas/porter/porter_spl.c b/board/renesas/porter/porter_spl.c
> index 026220d9e2..5b1f03cf7d 100644
> --- a/board/renesas/porter/porter_spl.c
> +++ b/board/renesas/porter/porter_spl.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <dm/platform_data/serial_sh.h>
>  #include <asm/processor.h>
> diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
> index 5a6aa8255b..b9e8cb4ce7 100644
> --- a/board/renesas/rcar-common/common.c
> +++ b/board/renesas/rcar-common/common.c
> @@ -9,6 +9,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.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 a3e2aebe77..2b21a29de1 100644
> --- a/board/renesas/rcar-common/gen3-spl.c
> +++ b/board/renesas/rcar-common/gen3-spl.c
> @@ -8,6 +8,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <image.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <spl.h>
>
> diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
> index ecf0dde4ef..ff0409be98 100644
> --- a/board/renesas/salvator-x/salvator-x.c
> +++ b/board/renesas/salvator-x/salvator-x.c
> @@ -10,6 +10,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <image.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <netdev.h>
>  #include <dm.h>
> diff --git a/board/renesas/sh7763rdp/sh7763rdp.c b/board/renesas/sh7763rdp/sh7763rdp.c
> index 9bc2c55986..73a53c1e5a 100644
> --- a/board/renesas/sh7763rdp/sh7763rdp.c
> +++ b/board/renesas/sh7763rdp/sh7763rdp.c
> @@ -8,6 +8,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/processor.h>
>
> diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
> index e7cbd75776..db88f0ddb6 100644
> --- a/board/renesas/silk/silk.c
> +++ b/board/renesas/silk/silk.c
> @@ -10,6 +10,7 @@
>  #include <cpu_func.h>
>  #include <env.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <dm.h>
>  #include <dm/platform_data/serial_sh.h>
> diff --git a/board/renesas/silk/silk_spl.c b/board/renesas/silk/silk_spl.c
> index a2c397f935..9859977c77 100644
> --- a/board/renesas/silk/silk_spl.c
> +++ b/board/renesas/silk/silk_spl.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <dm/platform_data/serial_sh.h>
>  #include <asm/processor.h>
> diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c
> index 0a0ff5ff76..594070a9bf 100644
> --- a/board/renesas/stout/stout.c
> +++ b/board/renesas/stout/stout.c
> @@ -10,6 +10,7 @@
>
>  #include <common.h>
>  #include <env.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <netdev.h>
>  #include <dm.h>
> diff --git a/board/renesas/stout/stout_spl.c b/board/renesas/stout/stout_spl.c
> index 8d01efce56..a10752de1c 100644
> --- a/board/renesas/stout/stout_spl.c
> +++ b/board/renesas/stout/stout_spl.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <dm/platform_data/serial_sh.h>
>  #include <asm/processor.h>
> diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
> index 04ca49572f..ebb379a82a 100644
> --- a/board/renesas/ulcb/ulcb.c
> +++ b/board/renesas/ulcb/ulcb.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <image.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <netdev.h>
>  #include <dm.h>
> diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c
> index b9049abcc7..7909ef5c18 100644
> --- a/board/rockchip/evb_rk3399/evb-rk3399.c
> +++ b/board/rockchip/evb_rk3399/evb-rk3399.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <asm/arch-rockchip/periph.h>
>  #include <power/regulator.h>
>
> diff --git a/board/rockchip/evb_rv1108/evb_rv1108.c b/board/rockchip/evb_rv1108/evb_rv1108.c
> index 5d622c3737..c57913828d 100644
> --- a/board/rockchip/evb_rv1108/evb_rv1108.c
> +++ b/board/rockchip/evb_rv1108/evb_rv1108.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <syscon.h>
>  #include <asm/io.h>
>  #include <asm/arch-rockchip/clock.h>
> diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
> index 623e4abc21..a900ad1476 100644
> --- a/board/samsung/goni/goni.c
> +++ b/board/samsung/goni/goni.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/gpio.h>
>  #include <asm/arch/mmc.h>
>  #include <dm.h>
> diff --git a/board/sandisk/sansa_fuze_plus/sfp.c b/board/sandisk/sansa_fuze_plus/sfp.c
> index c2c9b9c7e7..ae965a80a5 100644
> --- a/board/sandisk/sansa_fuze_plus/sfp.c
> +++ b/board/sandisk/sansa_fuze_plus/sfp.c
> @@ -11,6 +11,7 @@
>
>  #include <common.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/gpio.h>
>  #include <asm/io.h>
> diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
> index 9051392cd0..2c05ebb1bd 100644
> --- a/board/sbc8349/sbc8349.c
> +++ b/board/sbc8349/sbc8349.c
> @@ -9,6 +9,7 @@
>
>  #include <common.h>
>  #include <fdt_support.h>
> +#include <init.h>
>  #include <ioports.h>
>  #include <mpc83xx.h>
>  #include <asm/mpc8349_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 422f25c2e9..d2c5f807ad 100644
> --- a/board/schulercontrol/sc_sps_1/sc_sps_1.c
> +++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/gpio.h>
>  #include <asm/io.h>
> diff --git a/board/seeed/linkit-smart-7688/board.c b/board/seeed/linkit-smart-7688/board.c
> index d3d3d50c2c..492530ec4e 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 <init.h>
>  #include <asm/io.h>
>
>  #define MT76XX_GPIO1_MODE      0x10000060
> diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
> index 00fd4b9658..b4eae7f027 100644
> --- a/board/siemens/capricorn/board.c
> +++ b/board/siemens/capricorn/board.c
> @@ -8,6 +8,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <netdev.h>
>  #include <env_internal.h>
>  #include <fsl_esdhc_imx.h>
> diff --git a/board/siemens/capricorn/spl.c b/board/siemens/capricorn/spl.c
> index 47fe86ccc0..8435bd3863 100644
> --- a/board/siemens/capricorn/spl.c
> +++ b/board/siemens/capricorn/spl.c
> @@ -6,6 +6,7 @@
>   *
>   */
>  #include <common.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <dm.h>
>  #include <dm/uclass.h>
> diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
> index 24429d2837..f1bca4b27f 100644
> --- a/board/siemens/common/board.c
> +++ b/board/siemens/common/board.c
> @@ -12,6 +12,7 @@
>  #include <common.h>
>  #include <env.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <serial.h>
>  #include <spl.h>
> diff --git a/board/sifive/fu540/fu540.c b/board/sifive/fu540/fu540.c
> index 47a2090251..e9d1cf9a4b 100644
> --- a/board/sifive/fu540/fu540.c
> +++ b/board/sifive/fu540/fu540.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <linux/delay.h>
>  #include <linux/io.h>
>
> diff --git a/board/silica/pengwyn/board.c b/board/silica/pengwyn/board.c
> index 08eafefb91..e3c9d9e755 100644
> --- a/board/silica/pengwyn/board.c
> +++ b/board/silica/pengwyn/board.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <env.h>
> +#include <init.h>
>  #include <net.h>
>  #include <serial.h>
>  #include <asm/arch/cpu.h>
> diff --git a/board/sks-kinkel/sksimx6/sksimx6.c b/board/sks-kinkel/sksimx6/sksimx6.c
> index 48e7ff2479..e5f6e90e0c 100644
> --- a/board/sks-kinkel/sksimx6/sksimx6.c
> +++ b/board/sks-kinkel/sksimx6/sksimx6.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/imx-regs.h>
> diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
> index 84644a85c7..c51f3e4f92 100644
> --- a/board/socrates/socrates.c
> +++ b/board/socrates/socrates.c
> @@ -13,6 +13,7 @@
>  #include <common.h>
>  #include <clock_legacy.h>
>  #include <env.h>
> +#include <init.h>
>  #include <pci.h>
>  #include <uuid.h>
>  #include <asm/processor.h>
> diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
> index 490ca9bc34..b8391a35c0 100644
> --- a/board/solidrun/clearfog/clearfog.c
> +++ b/board/solidrun/clearfog/clearfog.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <i2c.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <netdev.h>
> diff --git a/board/sr1500/socfpga.c b/board/sr1500/socfpga.c
> index c9e32e3960..83663c7e4d 100644
> --- a/board/sr1500/socfpga.c
> +++ b/board/sr1500/socfpga.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch/reset_manager.h>
>  #include <asm/gpio.h>
>  #include <asm/io.h>
> diff --git a/board/st/stih410-b2260/board.c b/board/st/stih410-b2260/board.c
> index 35bf497156..b1147f2e1a 100644
> --- a/board/st/stih410-b2260/board.c
> +++ b/board/st/stih410-b2260/board.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <asm/cache.h>
>  #include <linux/usb/otg.h>
>  #include <dwc3-sti-glue.h>
> diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c
> index 500dc5fe3a..5b0744ff6b 100644
> --- a/board/st/stm32f429-discovery/stm32f429-discovery.c
> +++ b/board/st/stm32f429-discovery/stm32f429-discovery.c
> @@ -12,6 +12,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.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 8ab2fa5d59..1570d110bf 100644
> --- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c
> +++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.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 70d23d90f4..d9bcb39bea 100644
> --- a/board/st/stm32f469-discovery/stm32f469-discovery.c
> +++ b/board/st/stm32f469-discovery/stm32f469-discovery.c
> @@ -6,6 +6,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>
>  #include <asm/io.h>
>  #include <asm/arch/stm32.h>
> diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
> index fbcb87092b..d5a9f1386e 100644
> --- a/board/st/stv0991/stv0991.c
> +++ b/board/st/stv0991/stv0991.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <bootstage.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <asm/arch/stv0991_periph.h>
> diff --git a/board/ste/stemmy/stemmy.c b/board/ste/stemmy/stemmy.c
> index 8cf6f18755..f7834c08fc 100644
> --- a/board/ste/stemmy/stemmy.c
> +++ b/board/ste/stemmy/stemmy.c
> @@ -3,6 +3,7 @@
>   * Copyright (C) 2019 Stephan Gerhold <stephan at gerhold.net>
>   */
>  #include <common.h>
> +#include <init.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/board/sunxi/dram_sun4i_auto.c b/board/sunxi/dram_sun4i_auto.c
> index 7d4409b51e..e8bbee4ee5 100644
> --- a/board/sunxi/dram_sun4i_auto.c
> +++ b/board/sunxi/dram_sun4i_auto.c
> @@ -1,4 +1,5 @@
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch/dram.h>
>
>  static struct dram_para dram_para = {
> diff --git a/board/sunxi/dram_sun5i_auto.c b/board/sunxi/dram_sun5i_auto.c
> index e3fa243267..a5f4f8b743 100644
> --- a/board/sunxi/dram_sun5i_auto.c
> +++ b/board/sunxi/dram_sun5i_auto.c
> @@ -1,6 +1,7 @@
>  /* DRAM parameters for auto dram configuration on sun5i and sun7i */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch/dram.h>
>
>  static struct dram_para dram_para = {
> diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c
> index 4bd88f85a6..b4a1d4c5df 100644
> --- a/board/synopsys/axs10x/axs10x.c
> +++ b/board/synopsys/axs10x/axs10x.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <dwmmc.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <asm/arcregs.h>
>  #include "axs10x.h"
> diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c
> index c09ed8cff8..d98e606426 100644
> --- a/board/synopsys/emsdp/emsdp.c
> +++ b/board/synopsys/emsdp/emsdp.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <dwmmc.h>
> +#include <init.h>
>  #include <malloc.h>
>
>  #include <asm/arcregs.h>
> diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c
> index 36aa8f6ae5..05b63e415b 100644
> --- a/board/synopsys/iot_devkit/iot_devkit.c
> +++ b/board/synopsys/iot_devkit/iot_devkit.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <dwmmc.h>
>  #include <linux/libfdt.h>
> diff --git a/board/synopsys/nsim/nsim.c b/board/synopsys/nsim/nsim.c
> index f384f707f6..00e5cc3641 100644
> --- a/board/synopsys/nsim/nsim.c
> +++ b/board/synopsys/nsim/nsim.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <dm/device.h>
>  #include <virtio_types.h>
>  #include <virtio.h>
> diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c
> index b4fd183394..d32517f998 100644
> --- a/board/tbs/tbs2910/tbs2910.c
> +++ b/board/tbs/tbs2910/tbs2910.c
> @@ -3,6 +3,7 @@
>   * Copyright (C) 2014 Soeren Moch <smoch at web.de>
>   */
>
> +#include <init.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/arch/iomux.h>
> diff --git a/board/technexion/pico-imx6/pico-imx6.c b/board/technexion/pico-imx6/pico-imx6.c
> index 146bbc26d6..eac30368f7 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 at gmail.com>
>   */
>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/crm_regs.h>
> diff --git a/board/technexion/pico-imx6/spl.c b/board/technexion/pico-imx6/spl.c
> index 983f98beec..fe3c584662 100644
> --- a/board/technexion/pico-imx6/spl.c
> +++ b/board/technexion/pico-imx6/spl.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <image.h>
> +#include <init.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/imx-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 4294f3ed54..e4ca83a5ff 100644
> --- a/board/technexion/pico-imx6ul/pico-imx6ul.c
> +++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
> @@ -5,6 +5,7 @@
>   * Author: Richard Hu <richard.hu at technexion.com>
>   */
>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/iomux.h>
> diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c
> index 69db77412c..a651a00c1a 100644
> --- a/board/technexion/pico-imx7d/spl.c
> +++ b/board/technexion/pico-imx7d/spl.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <cpu_func.h>
> +#include <init.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/arch/crm_regs.h>
> diff --git a/board/technexion/tao3530/tao3530.c b/board/technexion/tao3530/tao3530.c
> index b604ee951b..8ce3637731 100644
> --- a/board/technexion/tao3530/tao3530.c
> +++ b/board/technexion/tao3530/tao3530.c
> @@ -5,6 +5,7 @@
>   */
>  #include <common.h>
>  #include <bootstage.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <netdev.h>
>  #include <twl4030.h>
> diff --git a/board/technologic/ts4600/ts4600.c b/board/technologic/ts4600/ts4600.c
> index f9cc2e8f10..2a63e84ec3 100644
> --- a/board/technologic/ts4600/ts4600.c
> +++ b/board/technologic/ts4600/ts4600.c
> @@ -14,6 +14,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/gpio.h>
>  #include <asm/io.h>
>  #include <asm/arch/imx-regs.h>
> diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
> index 7ff4766947..7e7effe56e 100644
> --- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
> +++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <env.h>
> +#include <init.h>
>  #include <misc.h>
>  #include <spl.h>
>  #include <syscon.h>
> diff --git a/board/ti/am3517crane/am3517crane.c b/board/ti/am3517crane/am3517crane.c
> index 5d4e57ffc5..888aa5b9ca 100644
> --- a/board/ti/am3517crane/am3517crane.c
> +++ b/board/ti/am3517crane/am3517crane.c
> @@ -10,6 +10,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/arch/mmc_host_def.h>
>  #include <asm/arch/mem.h>
> diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
> index 439b023da8..9139ad87d4 100644
> --- a/board/ti/beagle/beagle.c
> +++ b/board/ti/beagle/beagle.c
> @@ -16,6 +16,7 @@
>  #include <bootstage.h>
>  #include <dm.h>
>  #include <env.h>
> +#include <init.h>
>  #include <net.h>
>  #include <ns16550.h>
>  #include <serial.h>
> diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
> index 7161c934cd..d6d21bae1f 100644
> --- a/board/ti/evm/evm.c
> +++ b/board/ti/evm/evm.c
> @@ -13,6 +13,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <env.h>
> +#include <init.h>
>  #include <net.h>
>  #include <ns16550.h>
>  #include <netdev.h>
> diff --git a/board/ti/ks2_evm/board_k2e.c b/board/ti/ks2_evm/board_k2e.c
> index 350cc68e49..39abb24e15 100644
> --- a/board/ti/ks2_evm/board_k2e.c
> +++ b/board/ti/ks2_evm/board_k2e.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <image.h>
> +#include <init.h>
>  #include <asm/arch/ddr3.h>
>  #include <asm/arch/hardware.h>
>  #include <asm/ti-common/keystone_net.h>
> diff --git a/board/ti/ks2_evm/board_k2hk.c b/board/ti/ks2_evm/board_k2hk.c
> index 1eb6cd761e..12c4649c3c 100644
> --- a/board/ti/ks2_evm/board_k2hk.c
> +++ b/board/ti/ks2_evm/board_k2hk.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <image.h>
> +#include <init.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/hardware.h>
>  #include <asm/ti-common/keystone_net.h>
> diff --git a/board/ti/ks2_evm/board_k2l.c b/board/ti/ks2_evm/board_k2l.c
> index 5ff11ee0d6..f759ee3646 100644
> --- a/board/ti/ks2_evm/board_k2l.c
> +++ b/board/ti/ks2_evm/board_k2l.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <image.h>
> +#include <init.h>
>  #include <asm/arch/ddr3.h>
>  #include <asm/arch/hardware.h>
>  #include <asm/ti-common/keystone_net.h>
> diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
> index 0d19ad018a..fab48a70ef 100644
> --- a/board/ti/omap5_uevm/evm.c
> +++ b/board/ti/omap5_uevm/evm.c
> @@ -6,6 +6,7 @@
>   * Steve Sakoman  <steve at sakoman.com>
>   */
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <palmas.h>
>  #include <asm/arch/omap.h>
> diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
> index b1e51bc431..c9413af350 100644
> --- a/board/ti/panda/panda.c
> +++ b/board/ti/panda/panda.c
> @@ -5,6 +5,7 @@
>   * Steve Sakoman  <steve at sakoman.com>
>   */
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/mach-types.h>
>  #include <asm/arch/sys_proto.h>
> diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c
> index 97da5ccf0d..a5b3504045 100644
> --- a/board/ti/sdp4430/sdp.c
> +++ b/board/ti/sdp4430/sdp.c
> @@ -6,6 +6,7 @@
>   * Steve Sakoman  <steve at sakoman.com>
>   */
>  #include <common.h>
> +#include <init.h>
>  #include <net.h>
>  #include <twl6030.h>
>  #include <asm/arch/sys_proto.h>
> diff --git a/board/ti/ti814x/evm.c b/board/ti/ti814x/evm.c
> index 7f82e71228..8ed80d2f46 100644
> --- a/board/ti/ti814x/evm.c
> +++ b/board/ti/ti814x/evm.c
> @@ -11,6 +11,7 @@
>  #include <cpsw.h>
>  #include <env.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <net.h>
>  #include <spl.h>
>  #include <asm/arch/cpu.h>
> diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c
> index e895a216fe..590c15676a 100644
> --- a/board/ti/ti816x/evm.c
> +++ b/board/ti/ti816x/evm.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <env.h>
> +#include <init.h>
>  #include <net.h>
>  #include <spl.h>
>  #include <asm/cache.h>
> diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
> index b037d725c3..cbb219931d 100644
> --- a/board/timll/devkit8000/devkit8000.c
> +++ b/board/timll/devkit8000/devkit8000.c
> @@ -18,6 +18,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <env.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <ns16550.h>
>  #include <twl4030.h>
> diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
> index bc98858ae0..81329a6131 100644
> --- a/board/toradex/apalis-tk1/apalis-tk1.c
> +++ b/board/toradex/apalis-tk1/apalis-tk1.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <asm/arch-tegra/ap.h>
>  #include <asm/gpio.h>
>  #include <asm/io.h>
> diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
> index df9bc8e707..b750d66aae 100644
> --- a/board/toradex/apalis_t30/apalis_t30.c
> +++ b/board/toradex/apalis_t30/apalis_t30.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch/gp_padctrl.h>
>  #include <asm/arch/pinmux.h>
>  #include <asm/arch-tegra/ap.h>
> diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c
> index 93693712a9..d9b09ae461 100644
> --- a/board/toradex/colibri_pxa270/colibri_pxa270.c
> +++ b/board/toradex/colibri_pxa270/colibri_pxa270.c
> @@ -9,6 +9,7 @@
>  #include <common.h>
>  #include <cpu_func.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/arch/hardware.h>
>  #include <asm/arch/pxa.h>
> diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
> index e0b27e92f8..6cecbe5e28 100644
> --- a/board/toradex/colibri_t20/colibri_t20.c
> +++ b/board/toradex/colibri_t20/colibri_t20.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.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 b6b00e3860..d21ff544f4 100644
> --- a/board/toradex/colibri_t30/colibri_t30.c
> +++ b/board/toradex/colibri_t30/colibri_t30.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch/gp_padctrl.h>
>  #include <asm/arch/pinmux.h>
>  #include <asm/arch-tegra/ap.h>
> diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
> index e9441a7979..e8de923f3e 100644
> --- a/board/toradex/common/tdx-common.c
> +++ b/board/toradex/common/tdx-common.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <env.h>
>  #include <g_dnl.h>
> +#include <init.h>
>  #include <linux/libfdt.h>
>
>  #include "tdx-cfg-block.h"
> diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
> index c614fc7a3f..338952ea71 100644
> --- a/board/toradex/verdin-imx8mm/spl.c
> +++ b/board/toradex/verdin-imx8mm/spl.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <image.h>
> +#include <init.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/ddr.h>
>  #include <asm/arch/imx8mm_pins.h>
> diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
> index 35866e096a..ff05c7d552 100644
> --- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c
> +++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/sys_proto.h>
>  #include <asm/io.h>
> diff --git a/board/tplink/wdr4300/wdr4300.c b/board/tplink/wdr4300/wdr4300.c
> index 4dacaa4285..7e7339553b 100644
> --- a/board/tplink/wdr4300/wdr4300.c
> +++ b/board/tplink/wdr4300/wdr4300.c
> @@ -4,6 +4,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/io.h>
>  #include <asm/addrspace.h>
>  #include <asm/types.h>
> diff --git a/board/udoo/udoo_spl.c b/board/udoo/udoo_spl.c
> index 1a3b136529..09fc23a901 100644
> --- a/board/udoo/udoo_spl.c
> +++ b/board/udoo/udoo_spl.c
> @@ -7,6 +7,7 @@
>   */
>
>  #include <common.h>
> +#include <init.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 0f00506d7a..a4f449d2e2 100644
> --- a/board/variscite/dart_6ul/dart_6ul.c
> +++ b/board/variscite/dart_6ul/dart_6ul.c
> @@ -4,6 +4,7 @@
>   * Copyright (C) 2019 Parthiban Nallathambi <parthitce at gmail.com>
>   */
>
> +#include <init.h>
>  #include <net.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/crm_regs.h>
> diff --git a/board/variscite/dart_6ul/spl.c b/board/variscite/dart_6ul/spl.c
> index 798523d0d0..1b06a66060 100644
> --- a/board/variscite/dart_6ul/spl.c
> +++ b/board/variscite/dart_6ul/spl.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <spl.h>
>  #include <asm/arch/clock.h>
>  #include <asm/io.h>
> diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
> index cac00e0467..54d15accbd 100644
> --- a/board/varisys/cyrus/ddr.c
> +++ b/board/varisys/cyrus/ddr.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <hwconfig.h>
> +#include <init.h>
>  #include <asm/mmu.h>
>  #include <fsl_ddr_sdram.h>
>  #include <fsl_ddr_dimm_params.h>
> diff --git a/board/wandboard/spl.c b/board/wandboard/spl.c
> index 250043a26d..816b9cb6fc 100644
> --- a/board/wandboard/spl.c
> +++ b/board/wandboard/spl.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/arch/iomux.h>
> diff --git a/board/xes/common/board.c b/board/xes/common/board.c
> index 43575bc302..053b07a0b7 100644
> --- a/board/xes/common/board.c
> +++ b/board/xes/common/board.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <env.h>
>  #include "fsl_8xxx_misc.h"
> +#include <init.h>
>
>  int checkboard(void)
>  {
> diff --git a/board/xilinx/zynqmp_r5/board.c b/board/xilinx/zynqmp_r5/board.c
> index 1c45ee7196..5c5a2e9386 100644
> --- a/board/xilinx/zynqmp_r5/board.c
> +++ b/board/xilinx/zynqmp_r5/board.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <fdtdec.h>
> +#include <init.h>
>
>  int board_init(void)
>  {
> diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c
> index 82a3feee69..3f71e3da44 100644
> --- a/board/zyxel/nsa310s/nsa310s.c
> +++ b/board/zyxel/nsa310s/nsa310s.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <miiphy.h>
>  #include <net.h>
>  #include <asm/arch/cpu.h>
> diff --git a/cmd/pci.c b/cmd/pci.c
> index 0043471fc7..b2174e2a9c 100644
> --- a/cmd/pci.c
> +++ b/cmd/pci.c
> @@ -18,6 +18,7 @@
>  #include <command.h>
>  #include <console.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <asm/processor.h>
>  #include <asm/io.h>
>  #include <pci.h>
> diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
> index 8b768f3108..b5f293ba7f 100644
> --- a/cmd/tlv_eeprom.c
> +++ b/cmd/tlv_eeprom.c
> @@ -15,6 +15,7 @@
>  #include <i2c.h>
>  #include <i2c_eeprom.h>
>  #include <env.h>
> +#include <init.h>
>  #include <net.h>
>  #include <linux/ctype.h>
>  #include <u-boot/crc.h>
> diff --git a/common/board_info.c b/common/board_info.c
> index a392bece62..a6db087f96 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 <init.h>
>  #include <linux/libfdt.h>
>  #include <linux/compiler.h>
>
> diff --git a/common/init/board_init.c b/common/init/board_init.c
> index 4c4f0ced53..8c8a5eac05 100644
> --- a/common/init/board_init.c
> +++ b/common/init/board_init.c
> @@ -8,6 +8,7 @@
>
>  #include <common.h>
>  #include <bootstage.h>
> +#include <init.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
>
> diff --git a/common/lcd.c b/common/lcd.c
> index c421090c87..4acf91e623 100644
> --- a/common/lcd.c
> +++ b/common/lcd.c
> @@ -13,6 +13,7 @@
>  #include <cpu_func.h>
>  #include <env_callback.h>
>  #include <asm/cache.h>
> +#include <init.h>
>  #include <linux/types.h>
>  #include <stdio_dev.h>
>  #include <lcd.h>
> diff --git a/common/spl/spl.c b/common/spl/spl.c
> index ab62b8b79e..c59808b924 100644
> --- a/common/spl/spl.c
> +++ b/common/spl/spl.c
> @@ -13,6 +13,7 @@
>  #include <dm.h>
>  #include <handoff.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <irq_func.h>
>  #include <serial.h>
>  #include <spl.h>
> diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
> index 50df8425bf..a70388b750 100644
> --- a/drivers/clk/clk_stm32mp1.c
> +++ b/drivers/clk/clk_stm32mp1.c
> @@ -7,6 +7,7 @@
>  #include <clk-uclass.h>
>  #include <div64.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <regmap.h>
>  #include <spl.h>
>  #include <syscon.h>
> diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
> index fc047473f5..613c836049 100644
> --- a/drivers/cpu/bmips_cpu.c
> +++ b/drivers/cpu/bmips_cpu.c
> @@ -11,6 +11,7 @@
>  #include <cpu.h>
>  #include <dm.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <asm/io.h>
>
>  #define REV_CHIPID_SHIFT               16
> diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c
> index 049f202e03..d1dec58295 100644
> --- a/drivers/ddr/altera/sdram_arria10.c
> +++ b/drivers/ddr/altera/sdram_arria10.c
> @@ -7,6 +7,7 @@
>  #include <cpu_func.h>
>  #include <errno.h>
>  #include <fdtdec.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <wait_bit.h>
>  #include <watchdog.h>
> diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
> index c06fba92f8..1a69b0328a 100644
> --- a/drivers/ddr/altera/sdram_soc64.c
> +++ b/drivers/ddr/altera/sdram_soc64.c
> @@ -11,6 +11,7 @@
>  #include <div64.h>
>  #include <fdtdec.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <reset.h>
>  #include "sdram_soc64.h"
> diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
> index 0aa6aedae7..794ff55378 100644
> --- a/drivers/ddr/fsl/main.c
> +++ b/drivers/ddr/fsl/main.c
> @@ -14,6 +14,7 @@
>  #include <i2c.h>
>  #include <fsl_ddr_sdram.h>
>  #include <fsl_ddr.h>
> +#include <init.h>
>
>  /*
>   * CONFIG_SYS_FSL_DDR_SDRAM_BASE_PHY is the physical address from the view
> diff --git a/drivers/dma/lpc32xx_dma.c b/drivers/dma/lpc32xx_dma.c
> index d3ce141eef..1637e329df 100644
> --- a/drivers/dma/lpc32xx_dma.c
> +++ b/drivers/dma/lpc32xx_dma.c
> @@ -9,6 +9,7 @@
>
>  #include <common.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <asm/arch/dma.h>
>  #include <asm/arch/cpu.h>
>  #include <asm/arch/clk.h>
> diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c
> index 0917871d49..f7e5556805 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 <init.h>
>  #include <xilinx.h>             /* xilinx specific definitions */
>  #include <altera.h>             /* altera specific definitions */
>  #include <lattice.h>
> diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
> index 036cf0b4a1..16cdfe3978 100644
> --- a/drivers/mtd/cfi_flash.c
> +++ b/drivers/mtd/cfi_flash.c
> @@ -23,6 +23,7 @@
>  #include <errno.h>
>  #include <fdt_support.h>
>  #include <flash.h>
> +#include <init.h>
>  #include <irq_func.h>
>  #include <asm/processor.h>
>  #include <asm/io.h>
> diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c
> index 8fff818e42..1766ba4802 100644
> --- a/drivers/mtd/pic32_flash.c
> +++ b/drivers/mtd/pic32_flash.c
> @@ -10,6 +10,7 @@
>  #include <dm.h>
>  #include <fdt_support.h>
>  #include <flash.h>
> +#include <init.h>
>  #include <irq_func.h>
>  #include <mach/pic32.h>
>  #include <wait_bit.h>
> diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
> index ab5e49941f..c4eeb9b67c 100644
> --- a/drivers/pci/fsl_pci_init.c
> +++ b/drivers/pci/fsl_pci_init.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <env.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <asm/fsl_serdes.h>
>
> diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
> index 7f46e901fb..93cfc1cade 100644
> --- a/drivers/pci/pci-uclass.c
> +++ b/drivers/pci/pci-uclass.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <pci.h>
>  #include <asm/io.h>
> diff --git a/drivers/pci/pci_ftpci100.c b/drivers/pci/pci_ftpci100.c
> index 736befdc3b..f5eb702723 100644
> --- a/drivers/pci/pci_ftpci100.c
> +++ b/drivers/pci/pci_ftpci100.c
> @@ -7,6 +7,7 @@
>   * Macpaul Lin, Andes Technology Corporation <macpaul at andestech.com>
>   */
>  #include <common.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <pci.h>
>
> diff --git a/drivers/pci/pci_gt64120.c b/drivers/pci/pci_gt64120.c
> index 55f4800781..62f213d122 100644
> --- a/drivers/pci/pci_gt64120.c
> +++ b/drivers/pci/pci_gt64120.c
> @@ -10,6 +10,7 @@
>
>  #include <common.h>
>  #include <gt64120.h>
> +#include <init.h>
>  #include <pci.h>
>  #include <pci_gt64120.h>
>
> diff --git a/drivers/pci/pci_msc01.c b/drivers/pci/pci_msc01.c
> index 504eb65c27..04838200a8 100644
> --- a/drivers/pci/pci_msc01.c
> +++ b/drivers/pci/pci_msc01.c
> @@ -5,6 +5,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <msc01.h>
>  #include <pci.h>
>  #include <pci_msc01.h>
> diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c
> index ec6acbb138..0d6750beb7 100644
> --- a/drivers/pci/pcie_layerscape_fixup.c
> +++ b/drivers/pci/pcie_layerscape_fixup.c
> @@ -6,6 +6,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <pci.h>
>  #include <asm/arch/fsl_serdes.h>
>  #include <asm/io.h>
> diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
> index b010a6300c..c11c691b86 100644
> --- a/drivers/pci/pcie_layerscape_fixup_common.c
> +++ b/drivers/pci/pcie_layerscape_fixup_common.c
> @@ -8,6 +8,7 @@
>   */
>
>  #include <common.h>
> +#include <init.h>
>  #include <asm/arch/clock.h>
>  #include <asm/arch/soc.h>
>  #include "pcie_layerscape_fixup_common.h"
> diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
> index ac15e94f00..6e20432f31 100644
> --- a/drivers/ram/imxrt_sdram.c
> +++ b/drivers/ram/imxrt_sdram.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <clk.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <asm/io.h>
>  #include <linux/err.h>
> diff --git a/drivers/ram/rockchip/sdram_px30.c b/drivers/ram/rockchip/sdram_px30.c
> index 729255493a..ac7d96540f 100644
> --- a/drivers/ram/rockchip/sdram_px30.c
> +++ b/drivers/ram/rockchip/sdram_px30.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <debug_uart.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <syscon.h>
>  #include <asm/io.h>
> diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
> index 9b5eb38ecc..4f3ed739fb 100644
> --- a/drivers/ram/rockchip/sdram_rk3188.c
> +++ b/drivers/ram/rockchip/sdram_rk3188.c
> @@ -12,6 +12,7 @@
>  #include <dt-structs.h>
>  #include <errno.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <regmap.h>
>  #include <syscon.h>
> diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
> index 223f048161..0b11b48697 100644
> --- a/drivers/ram/rockchip/sdram_rk322x.c
> +++ b/drivers/ram/rockchip/sdram_rk322x.c
> @@ -7,6 +7,7 @@
>  #include <dm.h>
>  #include <dt-structs.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <regmap.h>
>  #include <syscon.h>
> diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
> index 9f6f555147..23fd7956a7 100644
> --- a/drivers/ram/rockchip/sdram_rk3288.c
> +++ b/drivers/ram/rockchip/sdram_rk3288.c
> @@ -12,6 +12,7 @@
>  #include <dt-structs.h>
>  #include <errno.h>
>  #include <hang.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <regmap.h>
>  #include <syscon.h>
> diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c
> index 8329f4a352..36e0d2e840 100644
> --- a/drivers/ram/rockchip/sdram_rk3328.c
> +++ b/drivers/ram/rockchip/sdram_rk3328.c
> @@ -7,6 +7,7 @@
>  #include <debug_uart.h>
>  #include <dm.h>
>  #include <dt-structs.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <regmap.h>
>  #include <syscon.h>
> diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
> index d69ef01d08..7b95c954a6 100644
> --- a/drivers/ram/rockchip/sdram_rk3399.c
> +++ b/drivers/ram/rockchip/sdram_rk3399.c
> @@ -9,6 +9,7 @@
>  #include <clk.h>
>  #include <dm.h>
>  #include <dt-structs.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <regmap.h>
>  #include <syscon.h>
> diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
> index 2d03333b1b..2e06b526e2 100644
> --- a/drivers/ram/stm32_sdram.c
> +++ b/drivers/ram/stm32_sdram.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <clk.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <ram.h>
>  #include <asm/io.h>
>  #include <dm/device_compat.h>
> diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c
> index 4837b0645b..f4942a5500 100644
> --- a/drivers/timer/cadence-ttc.c
> +++ b/drivers/timer/cadence-ttc.c
> @@ -7,6 +7,7 @@
>  #include <bootstage.h>
>  #include <dm.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <timer.h>
>  #include <asm/io.h>
>  #include <linux/err.h>
> diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c
> index 0cbdc279a5..7534e0363e 100644
> --- a/drivers/timer/rockchip_timer.c
> +++ b/drivers/timer/rockchip_timer.c
> @@ -6,6 +6,7 @@
>  #include <common.h>
>  #include <bootstage.h>
>  #include <dm.h>
> +#include <init.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 b619200f00..14dde950a1 100644
> --- a/drivers/timer/timer-uclass.c
> +++ b/drivers/timer/timer-uclass.c
> @@ -5,6 +5,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <dm/lists.h>
>  #include <dm/device-internal.h>
>  #include <dm/root.h>
> diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
> index ee646fdd5c..dea17b9209 100644
> --- a/drivers/usb/gadget/f_thor.c
> +++ b/drivers/usb/gadget/f_thor.c
> @@ -18,6 +18,7 @@
>  #include <errno.h>
>  #include <common.h>
>  #include <console.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <memalign.h>
>  #include <version.h>
> diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
> index 04e7c5e37f..450caf056c 100644
> --- a/drivers/usb/host/ehci-pci.c
> +++ b/drivers/usb/host/ehci-pci.c
> @@ -7,6 +7,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <pci.h>
>  #include <usb.h>
>  #include <asm/io.h>
> diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c
> index 34a4b00dda..8ddced3d10 100644
> --- a/drivers/usb/host/ohci-lpc32xx.c
> +++ b/drivers/usb/host/ohci-lpc32xx.c
> @@ -10,6 +10,7 @@
>  #include <common.h>
>  #include <dm.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <wait_bit.h>
>  #include <asm/io.h>
>  #include <asm/arch/cpu.h>
> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> index c1f60da541..b095612ada 100644
> --- a/drivers/usb/host/xhci-pci.c
> +++ b/drivers/usb/host/xhci-pci.c
> @@ -7,6 +7,7 @@
>
>  #include <common.h>
>  #include <dm.h>
> +#include <init.h>
>  #include <pci.h>
>  #include <usb.h>
>  #include <usb/xhci.h>
> diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
> index 8148055f67..1389268b5f 100644
> --- a/fs/ubifs/io.c
> +++ b/fs/ubifs/io.c
> @@ -59,6 +59,7 @@
>   */
>
>  #ifndef __UBOOT__
> +#include <init.h>
>  #include <dm/devres.h>
>  #include <linux/crc32.h>
>  #include <linux/slab.h>
> diff --git a/include/common.h b/include/common.h
> index a87c062880..d69cda339c 100644
> --- a/include/common.h
> +++ b/include/common.h
> @@ -31,7 +31,6 @@
>  #include <log.h>
>  #include <asm/u-boot.h> /* boot information for Linux kernel */
>  #include <asm/global_data.h>   /* global data used for startup functions */
> -#include <init.h>
>  #include <display_options.h>
>  #include <vsprintf.h>
>  #endif /* __ASSEMBLY__ */
> diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
> index 7c64077d42..b7e19c3475 100644
> --- a/lib/efi/efi_app.c
> +++ b/lib/efi/efi_app.c
> @@ -13,6 +13,7 @@
>  #include <debug_uart.h>
>  #include <dm.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <malloc.h>
>  #include <linux/err.h>
>  #include <linux/types.h>
> diff --git a/lib/time.c b/lib/time.c
> index 1395f28715..3d6447d7c0 100644
> --- a/lib/time.c
> +++ b/lib/time.c
> @@ -8,6 +8,7 @@
>  #include <bootstage.h>
>  #include <dm.h>
>  #include <errno.h>
> +#include <init.h>
>  #include <time.h>
>  #include <timer.h>
>  #include <watchdog.h>
> --
> 2.26.2.645.ge9eca65c58-goog
>
Masahiro Yamada May 11, 2020, 7:04 a.m. | #2
On Mon, May 11, 2020 at 3:44 PM Masahiro Yamada <masahiroy at kernel.org> wrote:
>
> Simon,
>
> On Mon, May 11, 2020 at 7:58 AM Simon Glass <sjg at chromium.org> wrote:
> >
> > Move this uncommon header out of the common header.
> >
> > Signed-off-by: Simon Glass <sjg at chromium.org>
>
>
> Why are you adding <init.h> to
> arch/arm/mach-uniphier/cpu-info.c,
> which does not include <common.h>
> in the first place?
>
>
> This seems a wrong conversion.
>
> For uniphier, NACK.



Hmm, are you fixing -Wmissing-prototypes,
which is displayed with W=1 builds.

If so, adding <init.h> to arch/arm/mach-uniphier/cpu-info.c
makes sense although it is unclear from commit log.


But, I still do not understand why you are adding <init.h> to
arch/arm/mach-uniphier/dram/umc-pxs2.c

It looks fine to me as-is.
Simon Glass May 11, 2020, 8:28 p.m. | #3
Hi Masahiro,

On Mon, 11 May 2020 at 01:05, Masahiro Yamada <masahiroy at kernel.org> wrote:
>
> On Mon, May 11, 2020 at 3:44 PM Masahiro Yamada <masahiroy at kernel.org> wrote:
> >
> > Simon,
> >
> > On Mon, May 11, 2020 at 7:58 AM Simon Glass <sjg at chromium.org> wrote:
> > >
> > > Move this uncommon header out of the common header.
> > >
> > > Signed-off-by: Simon Glass <sjg at chromium.org>
> >
> >
> > Why are you adding <init.h> to
> > arch/arm/mach-uniphier/cpu-info.c,
> > which does not include <common.h>
> > in the first place?
> >
> >
> > This seems a wrong conversion.
> >
> > For uniphier, NACK.
>
>
>
> Hmm, are you fixing -Wmissing-prototypes,
> which is displayed with W=1 builds.

I wonder how bad it would be if we enabled that option?

>
> If so, adding <init.h> to arch/arm/mach-uniphier/cpu-info.c
> makes sense although it is unclear from commit log.
>
>
> But, I still do not understand why you are adding <init.h> to
> arch/arm/mach-uniphier/dram/umc-pxs2.c
>
> It looks fine to me as-is.

Yes it is not needed - the dram_init() is throwing things off.

However given the scale of this series this seems like a small problem.

Regards,
Simon
Tom Rini May 19, 2020, 5:32 p.m. | #4
On Sun, May 10, 2020 at 11:40:02AM -0600, Simon Glass wrote:

> Move this uncommon header out of the common header.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>

Applied to u-boot/master, thanks!

Patch

diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c
index 83246550ec..f032f3e2f2 100644
--- a/arch/arc/lib/cpu.c
+++ b/arch/arc/lib/cpu.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <malloc.h>
 #include <vsprintf.h>
 #include <asm/arcregs.h>
diff --git a/arch/arc/lib/init_helpers.c b/arch/arc/lib/init_helpers.c
index c853f25d34..023eae1907 100644
--- a/arch/arc/lib/init_helpers.c
+++ b/arch/arc/lib/init_helpers.c
@@ -3,6 +3,7 @@ 
  * Copyright (C) 2013-2015 Synopsys, Inc. All rights reserved.
  */
 
+#include <init.h>
 #include <asm/cache.h>
 #include <common.h>
 
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
index 3f6af6f5a3..a3d4f14796 100644
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <div64.h>
+#include <init.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c
index 3d07ee6809..a913860491 100644
--- a/arch/arm/cpu/arm1136/mx31/timer.c
+++ b/arch/arm/cpu/arm1136/mx31/timer.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
index c78f2cbfc9..4c45810fbe 100644
--- a/arch/arm/cpu/arm1136/mx35/generic.c
+++ b/arch/arm/cpu/arm1136/mx35/generic.c
@@ -9,6 +9,7 @@ 
 #include <common.h>
 #include <clock_legacy.h>
 #include <div64.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <linux/errno.h>
diff --git a/arch/arm/cpu/arm1136/mx35/timer.c b/arch/arm/cpu/arm1136/mx35/timer.c
index c1cdf35fb2..cb351ecf76 100644
--- a/arch/arm/cpu/arm1136/mx35/timer.c
+++ b/arch/arm/cpu/arm1136/mx35/timer.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/crm_regs.h>
diff --git a/arch/arm/cpu/arm920t/ep93xx/timer.c b/arch/arm/cpu/arm920t/ep93xx/timer.c
index 4829c996be..0ee6034220 100644
--- a/arch/arm/cpu/arm920t/ep93xx/timer.c
+++ b/arch/arm/cpu/arm920t/ep93xx/timer.c
@@ -12,6 +12,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <linux/types.h>
 #include <asm/arch/ep93xx.h>
diff --git a/arch/arm/cpu/arm926ejs/armada100/cpu.c b/arch/arm/cpu/arm926ejs/armada100/cpu.c
index 0c81de7e36..96726b3144 100644
--- a/arch/arm/cpu/arm926ejs/armada100/cpu.c
+++ b/arch/arm/cpu/arm926ejs/armada100/cpu.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.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 f4e1f0db09..da0615faf1 100644
--- a/arch/arm/cpu/arm926ejs/armada100/dram.c
+++ b/arch/arm/cpu/arm926ejs/armada100/dram.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.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 f4962ec45f..b9941fcb2f 100644
--- a/arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <time.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/armada100.h>
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
index 2bc3513abf..ee15a9453d 100644
--- a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
+++ b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <net.h>
 #include <netdev.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/timer.c b/arch/arm/cpu/arm926ejs/lpc32xx/timer.c
index 3a896d10ca..46b7b46659 100644
--- a/arch/arm/cpu/arm926ejs/lpc32xx/timer.c
+++ b/arch/arm/cpu/arm926ejs/lpc32xx/timer.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index ef8d2d202d..8f6cd4dc19 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -11,6 +11,7 @@ 
 #include <common.h>
 #include <clock_legacy.h>
 #include <div64.h>
+#include <init.h>
 #include <net.h>
 #include <netdev.h>
 #include <vsprintf.h>
diff --git a/arch/arm/cpu/arm926ejs/mx25/timer.c b/arch/arm/cpu/arm926ejs/mx25/timer.c
index 04698fe563..7e2698b605 100644
--- a/arch/arm/cpu/arm926ejs/mx25/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx25/timer.c
@@ -20,6 +20,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.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 f51f0df8ec..193588ea10 100644
--- a/arch/arm/cpu/arm926ejs/mx27/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx27/timer.c
@@ -17,6 +17,7 @@ 
 
 #include <common.h>
 #include <div64.h>
+#include <init.h>
 #include <time.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 f65053c4b6..72988417ac 100644
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -12,6 +12,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <hang.h>
+#include <init.h>
 #include <net.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 9168b91f27..83dd8b625e 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <config.h>
+#include <init.h>
 #include <serial.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c
index 226401dd6e..b6fdc88be7 100644
--- a/arch/arm/cpu/arm926ejs/mxs/timer.c
+++ b/arch/arm/cpu/arm926ejs/mxs/timer.c
@@ -10,6 +10,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c
index 51c4a730f4..f5192240e4 100644
--- a/arch/arm/cpu/arm926ejs/spear/cpu.c
+++ b/arch/arm/cpu/arm926ejs/spear/cpu.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/spr_misc.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c
index a919a455eb..7b14ba05b4 100644
--- a/arch/arm/cpu/arm926ejs/spear/spl.c
+++ b/arch/arm/cpu/arm926ejs/spear/spl.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <spl.h>
 #include <version.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c
index 28c09e9fd6..9db1c74b36 100644
--- a/arch/arm/cpu/arm926ejs/spear/timer.c
+++ b/arch/arm/cpu/arm926ejs/spear/timer.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/cpu/armv7/arch_timer.c b/arch/arm/cpu/armv7/arch_timer.c
index 2eb571050a..871629c233 100644
--- a/arch/arm/cpu/armv7/arch_timer.c
+++ b/arch/arm/cpu/armv7/arch_timer.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <div64.h>
diff --git a/arch/arm/cpu/armv7/iproc-common/timer.c b/arch/arm/cpu/armv7/iproc-common/timer.c
index 668b5e11a6..5c109764e9 100644
--- a/arch/arm/cpu/armv7/iproc-common/timer.c
+++ b/arch/arm/cpu/armv7/iproc-common/timer.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <div64.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/iproc-common/timer.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index c544f38641..e9464ee7e4 100644
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <net.h>
 #include <vsprintf.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c
index a5f4e31ac7..46ade4ae86 100644
--- a/arch/arm/cpu/armv7/ls102xa/timer.c
+++ b/arch/arm/cpu/armv7/ls102xa/timer.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <div64.h>
diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
index 5f4076d6b7..7790f087a0 100644
--- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c
+++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c
@@ -5,6 +5,7 @@ 
  */
 #include <common.h>
 #include <fdtdec.h>
+#include <init.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 e54cfb06dc..d2b5b4d3fc 100644
--- a/arch/arm/cpu/armv7/s5p-common/timer.c
+++ b/arch/arm/cpu/armv7/s5p-common/timer.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <div64.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/pwm.h>
diff --git a/arch/arm/cpu/armv7/stv0991/timer.c b/arch/arm/cpu/armv7/stv0991/timer.c
index 695bdd7a5c..5adccab012 100644
--- a/arch/arm/cpu/armv7/stv0991/timer.c
+++ b/arch/arm/cpu/armv7/stv0991/timer.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch-stv0991/hardware.h>
diff --git a/arch/arm/cpu/armv7/sunxi/timer.c b/arch/arm/cpu/armv7/sunxi/timer.c
index 6bda5fbbb6..4f6a66d803 100644
--- a/arch/arm/cpu/armv7/sunxi/timer.c
+++ b/arch/arm/cpu/armv7/sunxi/timer.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/timer.h>
diff --git a/arch/arm/cpu/armv7/vf610/generic.c b/arch/arm/cpu/armv7/vf610/generic.c
index c1ba69893f..da43e34394 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 <cpu_func.h>
+#include <init.h>
 #include <net.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv7/vf610/timer.c b/arch/arm/cpu/armv7/vf610/timer.c
index f858de953d..229e9e959e 100644
--- a/arch/arm/cpu/armv7/vf610/timer.c
+++ b/arch/arm/cpu/armv7/vf610/timer.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <div64.h>
diff --git a/arch/arm/cpu/armv7m/systick-timer.c b/arch/arm/cpu/armv7m/systick-timer.c
index 5c310d306d..dbe1b61977 100644
--- a/arch/arm/cpu/armv7m/systick-timer.c
+++ b/arch/arm/cpu/armv7m/systick-timer.c
@@ -22,6 +22,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
index c0201341ea..ec40df41f6 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c
@@ -8,6 +8,7 @@ 
 #include <cpu_func.h>
 #include <env.h>
 #include <image.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/arch/arm/cpu/armv8/s32v234/cpu.c b/arch/arm/cpu/armv8/s32v234/cpu.c
index f910b6ed72..5394a6697e 100644
--- a/arch/arm/cpu/armv8/s32v234/cpu.c
+++ b/arch/arm/cpu/armv8/s32v234/cpu.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.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 98f526e252..bc07dae318 100644
--- a/arch/arm/cpu/armv8/s32v234/generic.c
+++ b/arch/arm/cpu/armv8/s32v234/generic.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <clock_legacy.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/arch/arm/cpu/pxa/cpuinfo.c b/arch/arm/cpu/pxa/cpuinfo.c
index 5379e13e2b..0d9542f998 100644
--- a/arch/arm/cpu/pxa/cpuinfo.c
+++ b/arch/arm/cpu/pxa/cpuinfo.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <linux/compiler.h>
diff --git a/arch/arm/cpu/pxa/pxa2xx.c b/arch/arm/cpu/pxa/pxa2xx.c
index ecf85d2f14..ea91d8aaec 100644
--- a/arch/arm/cpu/pxa/pxa2xx.c
+++ b/arch/arm/cpu/pxa/pxa2xx.c
@@ -11,6 +11,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <irq_func.h>
 #include <asm/arch/pxa-regs.h>
 #include <asm/cache.h>
diff --git a/arch/arm/cpu/pxa/timer.c b/arch/arm/cpu/pxa/timer.c
index 169fed808b..8e9d610441 100644
--- a/arch/arm/cpu/pxa/timer.c
+++ b/arch/arm/cpu/pxa/timer.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 
 int timer_init(void)
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index 8a24e34f62..5d5437cbbc 100644
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -9,6 +9,7 @@ 
 
 #include <common.h>
 #include <config.h>
+#include <init.h>
 #include <spl.h>
 #include <image.h>
 #include <asm/cache.h>
diff --git a/arch/arm/lib/stack.c b/arch/arm/lib/stack.c
index c89a219dd2..96a248c0a9 100644
--- a/arch/arm/lib/stack.c
+++ b/arch/arm/lib/stack.c
@@ -11,6 +11,7 @@ 
  * Marius Groeger <mgroeger at sysgo.de>
  */
 #include <common.h>
+#include <init.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-aspeed/ast2500-board.c b/arch/arm/mach-aspeed/ast2500-board.c
index e7edd544e2..20594e0efb 100644
--- a/arch/arm/mach-aspeed/ast2500-board.c
+++ b/arch/arm/mach-aspeed/ast2500-board.c
@@ -4,6 +4,7 @@ 
  */
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <ram.h>
 #include <timer.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/arm920t/cpu.c b/arch/arm/mach-at91/arm920t/cpu.c
index 42d0d2269f..44c079c0fd 100644
--- a/arch/arm/mach-at91/arm920t/cpu.c
+++ b/arch/arm/mach-at91/arm920t/cpu.c
@@ -11,6 +11,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/clk.h>
diff --git a/arch/arm/mach-at91/arm920t/timer.c b/arch/arm/mach-at91/arm920t/timer.c
index 3aef9538b4..1e014ad9c9 100644
--- a/arch/arm/mach-at91/arm920t/timer.c
+++ b/arch/arm/mach-at91/arm920t/timer.c
@@ -14,6 +14,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 
 #include <asm/io.h>
diff --git a/arch/arm/mach-at91/arm926ejs/cpu.c b/arch/arm/mach-at91/arm926ejs/cpu.c
index e9b4e06595..761edb6df5 100644
--- a/arch/arm/mach-at91/arm926ejs/cpu.c
+++ b/arch/arm/mach-at91/arm926ejs/cpu.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/arm926ejs/timer.c b/arch/arm/mach-at91/arm926ejs/timer.c
index 31ad0bf702..42ef349966 100644
--- a/arch/arm/mach-at91/arm926ejs/timer.c
+++ b/arch/arm/mach-at91/arm926ejs/timer.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/armv7/cpu.c b/arch/arm/mach-at91/armv7/cpu.c
index 4474a96743..a8f4356ce9 100644
--- a/arch/arm/mach-at91/armv7/cpu.c
+++ b/arch/arm/mach-at91/armv7/cpu.c
@@ -10,6 +10,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <vsprintf.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/armv7/timer.c b/arch/arm/mach-at91/armv7/timer.c
index 15c036cc27..a6346c01b2 100644
--- a/arch/arm/mach-at91/armv7/timer.c
+++ b/arch/arm/mach-at91/armv7/timer.c
@@ -9,6 +9,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-at91/spl_at91.c b/arch/arm/mach-at91/spl_at91.c
index 822f877de7..b78cafdd9c 100644
--- a/arch/arm/mach-at91/spl_at91.c
+++ b/arch/arm/mach-at91/spl_at91.c
@@ -10,6 +10,7 @@ 
 
 #include <common.h>
 #include <hang.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91sam9_matrix.h>
diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c
index 6ee0e1c24c..f40bc531d4 100644
--- a/arch/arm/mach-at91/spl_atmel.c
+++ b/arch/arm/mach-at91/spl_atmel.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <hang.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pit.h>
diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
index 9966d6c833..f4d00d892d 100644
--- a/arch/arm/mach-bcm283x/init.c
+++ b/arch/arm/mach-bcm283x/init.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.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 9fd6564d04..40dd44af67 100644
--- a/arch/arm/mach-davinci/cpu.c
+++ b/arch/arm/mach-davinci/cpu.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/hardware.h>
 #include <asm/io.h>
 
diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c
index 822e0dc4a1..07bf19b5e4 100644
--- a/arch/arm/mach-davinci/da850_lowlevel.c
+++ b/arch/arm/mach-davinci/da850_lowlevel.c
@@ -6,6 +6,7 @@ 
  * Heiko Schocher, DENX Software Engineering, hs at denx.de.
  */
 #include <common.h>
+#include <init.h>
 #include <nand.h>
 #include <ns16550.h>
 #include <post.h>
diff --git a/arch/arm/mach-davinci/spl.c b/arch/arm/mach-davinci/spl.c
index d44e840aa0..5fea935d6e 100644
--- a/arch/arm/mach-davinci/spl.c
+++ b/arch/arm/mach-davinci/spl.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <config.h>
 #include <hang.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
diff --git a/arch/arm/mach-davinci/timer.c b/arch/arm/mach-davinci/timer.c
index 9846463c60..ebe985f795 100644
--- a/arch/arm/mach-davinci/timer.c
+++ b/arch/arm/mach-davinci/timer.c
@@ -21,6 +21,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/timer_defs.h>
diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index ecd0105121..97d6ca8fc2 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -27,6 +27,7 @@ 
 #include <config.h>
 #include <debug_uart.h>
 #include <asm/system.h>
+#include <init.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/dmc.h>
 #include <asm/arch/power.h>
diff --git a/arch/arm/mach-exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
index 8b2c5c79c0..d9672e79ef 100644
--- a/arch/arm/mach-exynos/spl_boot.c
+++ b/arch/arm/mach-exynos/spl_boot.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <config.h>
+#include <init.h>
 
 #include <asm/cache.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-highbank/timer.c b/arch/arm/mach-highbank/timer.c
index cd08ff444d..2423a0e378 100644
--- a/arch/arm/mach-highbank/timer.c
+++ b/arch/arm/mach-highbank/timer.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch-armv7/systimer.h>
 
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c
index 0a2c43378f..97464391d5 100644
--- a/arch/arm/mach-imx/cpu.c
+++ b/arch/arm/mach-imx/cpu.c
@@ -8,6 +8,7 @@ 
 
 #include <bootm.h>
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <netdev.h>
 #include <linux/errno.h>
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 89229da3b6..1551717cc0 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/imxrt/soc.c b/arch/arm/mach-imx/imxrt/soc.c
index e1eea23035..8d5fae9a97 100644
--- a/arch/arm/mach-imx/imxrt/soc.c
+++ b/arch/arm/mach-imx/imxrt/soc.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/armv7_mpu.h>
 
diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c
index 4aafeed188..60e688c518 100644
--- a/arch/arm/mach-imx/mx7/soc.c
+++ b/arch/arm/mach-imx/mx7/soc.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index fd3fa04600..4af3e6985c 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <hang.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-imx/syscounter.c b/arch/arm/mach-imx/syscounter.c
index 5a292c3964..db1c2c1e01 100644
--- a/arch/arm/mach-imx/syscounter.c
+++ b/arch/arm/mach-imx/syscounter.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <div64.h>
diff --git a/arch/arm/mach-imx/timer.c b/arch/arm/mach-imx/timer.c
index 5fe5c51f6a..fa1941aec4 100644
--- a/arch/arm/mach-imx/timer.c
+++ b/arch/arm/mach-imx/timer.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <div64.h>
diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c
index b692806352..ddc9f3c4f4 100644
--- a/arch/arm/mach-k3/am6_init.c
+++ b/arch/arm/mach-k3/am6_init.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.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 af1020be95..53cad78dd5 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -9,6 +9,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <image.h>
+#include <init.h>
 #include <spl.h>
 #include "common.h"
 #include <dm.h>
diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c
index 71fc20c30b..7a999f9d9c 100644
--- a/arch/arm/mach-k3/j721e_init.c
+++ b/arch/arm/mach-k3/j721e_init.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/armv7_mpu.h>
diff --git a/arch/arm/mach-keystone/init.c b/arch/arm/mach-keystone/init.c
index 59fd029e4c..d947d40eac 100644
--- a/arch/arm/mach-keystone/init.c
+++ b/arch/arm/mach-keystone/init.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <ns16550.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index 7441052a55..1d79927ac7 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.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 c56620dc5a..d328fee8bd 100644
--- a/arch/arm/mach-kirkwood/cpu.c
+++ b/arch/arm/mach-kirkwood/cpu.c
@@ -9,6 +9,7 @@ 
 #include <command.h>
 #include <cpu_func.h>
 #include <env.h>
+#include <init.h>
 #include <net.h>
 #include <netdev.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-mediatek/cpu.c b/arch/arm/mach-mediatek/cpu.c
index 5e5f3f0842..c329e7cc98 100644
--- a/arch/arm/mach-mediatek/cpu.c
+++ b/arch/arm/mach-mediatek/cpu.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <init.h>
 #include <wdt.h>
 #include <dm/uclass-internal.h>
 
diff --git a/arch/arm/mach-mediatek/mt7622/init.c b/arch/arm/mach-mediatek/mt7622/init.c
index a715378127..7f6ce80f37 100644
--- a/arch/arm/mach-mediatek/mt7622/init.c
+++ b/arch/arm/mach-mediatek/mt7622/init.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
 
diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c
index ba91a6eaa6..098892802b 100644
--- a/arch/arm/mach-mediatek/mt7629/init.c
+++ b/arch/arm/mach-mediatek/mt7629/init.c
@@ -8,6 +8,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <ram.h>
 #include <asm/arch/misc.h>
 #include <asm/sections.h>
diff --git a/arch/arm/mach-mediatek/mt8512/init.c b/arch/arm/mach-mediatek/mt8512/init.c
index 4e6b710c11..9680251941 100644
--- a/arch/arm/mach-mediatek/mt8512/init.c
+++ b/arch/arm/mach-mediatek/mt8512/init.c
@@ -10,6 +10,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <ram.h>
 #include <wdt.h>
 #include <asm/arch/misc.h>
diff --git a/arch/arm/mach-mediatek/mt8516/init.c b/arch/arm/mach-mediatek/mt8516/init.c
index b038437a17..13be391221 100644
--- a/arch/arm/mach-mediatek/mt8516/init.c
+++ b/arch/arm/mach-mediatek/mt8516/init.c
@@ -10,6 +10,7 @@ 
 #include <cpu_func.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <ram.h>
 #include <asm/arch/misc.h>
 #include <asm/armv8/mmu.h>
diff --git a/arch/arm/mach-mediatek/mt8518/init.c b/arch/arm/mach-mediatek/mt8518/init.c
index c46cc5fcaf..531a403da1 100644
--- a/arch/arm/mach-mediatek/mt8518/init.c
+++ b/arch/arm/mach-mediatek/mt8518/init.c
@@ -11,6 +11,7 @@ 
 #include <cpu_func.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <ram.h>
 #include <asm/arch/misc.h>
 #include <asm/armv8/mmu.h>
diff --git a/arch/arm/mach-mediatek/spl.c b/arch/arm/mach-mediatek/spl.c
index 37f1f219b2..927175c5a3 100644
--- a/arch/arm/mach-mediatek/spl.c
+++ b/arch/arm/mach-mediatek/spl.c
@@ -7,6 +7,7 @@ 
 #include <clk.h>
 #include <common.h>
 #include <hang.h>
+#include <init.h>
 #include <spl.h>
 
 #include "init.h"
diff --git a/arch/arm/mach-meson/board-info.c b/arch/arm/mach-meson/board-info.c
index 4b88afa9b7..bfae0c36ea 100644
--- a/arch/arm/mach-meson/board-info.c
+++ b/arch/arm/mach-meson/board-info.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <dm.h>
 #include <linux/bitfield.h>
diff --git a/arch/arm/mach-mvebu/armada3700/cpu.c b/arch/arm/mach-mvebu/armada3700/cpu.c
index 17d2d43bab..d6e84f1e20 100644
--- a/arch/arm/mach-mvebu/armada3700/cpu.c
+++ b/arch/arm/mach-mvebu/armada3700/cpu.c
@@ -8,6 +8,7 @@ 
 #include <cpu_func.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <linux/libfdt.h>
 #include <asm/io.h>
 #include <asm/system.h>
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index fb241c7e4d..ab8b02956b 100644
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <ahci.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <linux/mbus.h>
 #include <asm/io.h>
 #include <asm/pl310.h>
diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index 70fef3b573..c6ecd5bee0 100644
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -8,6 +8,7 @@ 
 #include <debug_uart.h>
 #include <fdtdec.h>
 #include <hang.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-mvebu/timer.c b/arch/arm/mach-mvebu/timer.c
index 2f6b4d1702..50b78cb07b 100644
--- a/arch/arm/mach-mvebu/timer.c
+++ b/arch/arm/mach-mvebu/timer.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/soc.h>
 
diff --git a/arch/arm/mach-omap2/am33xx/chilisom.c b/arch/arm/mach-omap2/am33xx/chilisom.c
index 3942305108..15b6b35ae7 100644
--- a/arch/arm/mach-omap2/am33xx/chilisom.c
+++ b/arch/arm/mach-omap2/am33xx/chilisom.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.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/clock.c b/arch/arm/mach-omap2/am33xx/clock.c
index 8c61547ee9..862c5e0905 100644
--- a/arch/arm/mach-omap2/am33xx/clock.c
+++ b/arch/arm/mach-omap2/am33xx/clock.c
@@ -9,6 +9,7 @@ 
  */
 #include <common.h>
 #include <hang.h>
+#include <init.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-omap2/am33xx/sys_info.c b/arch/arm/mach-omap2/am33xx/sys_info.c
index 17b46619b5..338f6afcae 100644
--- a/arch/arm/mach-omap2/am33xx/sys_info.c
+++ b/arch/arm/mach-omap2/am33xx/sys_info.c
@@ -12,6 +12,7 @@ 
  */
 
 #include <common.h>
+#include <init.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 9aff83e9df..f968a26d64 100644
--- a/arch/arm/mach-omap2/clocks-common.c
+++ b/arch/arm/mach-omap2/clocks-common.c
@@ -15,6 +15,7 @@ 
 #include <common.h>
 #include <hang.h>
 #include <i2c.h>
+#include <init.h>
 #include <asm/omap_common.h>
 #include <asm/gpio.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c
index 772b4c4db5..7a7086776e 100644
--- a/arch/arm/mach-omap2/hwinit-common.c
+++ b/arch/arm/mach-omap2/hwinit-common.c
@@ -13,6 +13,7 @@ 
 #include <common.h>
 #include <debug_uart.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/arch/sys_proto.h>
 #include <linux/sizes.h>
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
index 60de0d6052..b893fb732e 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 <dm.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-omap2/omap3/emif4.c b/arch/arm/mach-omap2/omap3/emif4.c
index a8bd428e0c..4cfa132388 100644
--- a/arch/arm/mach-omap2/omap3/emif4.c
+++ b/arch/arm/mach-omap2/omap3/emif4.c
@@ -10,6 +10,7 @@ 
  */
 
 #include <common.h>
+#include <init.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 861d01d6df..1d65ed6227 100644
--- a/arch/arm/mach-omap2/omap3/sdrc.c
+++ b/arch/arm/mach-omap2/omap3/sdrc.c
@@ -22,6 +22,7 @@ 
  */
 
 #include <common.h>
+#include <init.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 dbb68f718d..7752dd1565 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -16,6 +16,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/arm/mach-orion5x/cpu.c b/arch/arm/mach-orion5x/cpu.c
index 7d57dd257f..d9abcacbb4 100644
--- a/arch/arm/mach-orion5x/cpu.c
+++ b/arch/arm/mach-orion5x/cpu.c
@@ -10,6 +10,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <net.h>
 #include <netdev.h>
 #include <asm/cache.h>
diff --git a/arch/arm/mach-orion5x/timer.c b/arch/arm/mach-orion5x/timer.c
index 077eb63e74..a64d572112 100644
--- a/arch/arm/mach-orion5x/timer.c
+++ b/arch/arm/mach-orion5x/timer.c
@@ -8,6 +8,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 
diff --git a/arch/arm/mach-owl/soc.c b/arch/arm/mach-owl/soc.c
index 8a434bd496..7d3f6f6285 100644
--- a/arch/arm/mach-owl/soc.c
+++ b/arch/arm/mach-owl/soc.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <cpu_func.h>
+#include <init.h>
 #include <asm/cache.h>
 #include <linux/arm-smccc.h>
 #include <linux/psci.h>
diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-rmobile/board.c
index 8a2d3ce621..a10371f74e 100644
--- a/arch/arm/mach-rmobile/board.c
+++ b/arch/arm/mach-rmobile/board.c
@@ -4,6 +4,7 @@ 
  * (C) Copyright 2012 Renesas Solutions Corp.
  */
 #include <common.h>
+#include <init.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 9b34cba047..fdbbd72e28 100644
--- a/arch/arm/mach-rmobile/cpu_info.c
+++ b/arch/arm/mach-rmobile/cpu_info.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <asm/cache.h>
+#include <init.h>
 #include <asm/io.h>
 #include <env.h>
 #include <linux/ctype.h>
diff --git a/arch/arm/mach-rmobile/timer.c b/arch/arm/mach-rmobile/timer.c
index 9fcab446a5..f88ccfde9f 100644
--- a/arch/arm/mach-rmobile/timer.c
+++ b/arch/arm/mach-rmobile/timer.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <div64.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/arch-armv7/globaltimer.h>
diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c
index 4b0e99299a..08b7d3519d 100644
--- a/arch/arm/mach-rockchip/cpu-info.c
+++ b/arch/arm/mach-rockchip/cpu-info.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
 #include <asm/arch-rockchip/cru.h>
diff --git a/arch/arm/mach-rockchip/px30-board-tpl.c b/arch/arm/mach-rockchip/px30-board-tpl.c
index 8c8976f61c..085e650620 100644
--- a/arch/arm/mach-rockchip/px30-board-tpl.c
+++ b/arch/arm/mach-rockchip/px30-board-tpl.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <debug_uart.h>
 #include <dm.h>
+#include <init.h>
 #include <ram.h>
 #include <spl.h>
 #include <version.h>
diff --git a/arch/arm/mach-rockchip/px30/px30.c b/arch/arm/mach-rockchip/px30/px30.c
index 5014ee83d7..6fcef63c1b 100644
--- a/arch/arm/mach-rockchip/px30/px30.c
+++ b/arch/arm/mach-rockchip/px30/px30.c
@@ -5,6 +5,7 @@ 
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <init.h>
 #include <asm/armv8/mmu.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/grf_px30.h>
diff --git a/arch/arm/mach-rockchip/rk3036-board-spl.c b/arch/arm/mach-rockchip/rk3036-board-spl.c
index fbc89b66c4..6eb89e15b8 100644
--- a/arch/arm/mach-rockchip/rk3036-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3036-board-spl.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <debug_uart.h>
+#include <init.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 e0a6e4b025..e9e020ff3f 100644
--- a/arch/arm/mach-rockchip/rk3036/rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036/rk3036.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.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/rk3036/sdram_rk3036.c b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
index c39cbb8111..3874716e52 100644
--- a/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
+++ b/arch/arm/mach-rockchip/rk3036/sdram_rk3036.c
@@ -3,6 +3,7 @@ 
  * (C) Copyright 2015 Rockchip Electronics Co., Ltd
  */
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <asm/arch-rockchip/cru_rk3036.h>
diff --git a/arch/arm/mach-rockchip/rk3128/rk3128.c b/arch/arm/mach-rockchip/rk3128/rk3128.c
index ee176de80b..740bd2ba07 100644
--- a/arch/arm/mach-rockchip/rk3128/rk3128.c
+++ b/arch/arm/mach-rockchip/rk3128/rk3128.c
@@ -3,6 +3,7 @@ 
  * Copyright (c) 2017 Rockchip Electronics Co., Ltd
  */
 #include <common.h>
+#include <init.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c
index e52466fb6f..dca9de28d4 100644
--- a/arch/arm/mach-rockchip/rk3188/rk3188.c
+++ b/arch/arm/mach-rockchip/rk3188/rk3188.c
@@ -5,6 +5,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <hang.h>
+#include <init.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
diff --git a/arch/arm/mach-rockchip/rk322x/rk322x.c b/arch/arm/mach-rockchip/rk322x/rk322x.c
index 562117e6c1..ad4ac62e51 100644
--- a/arch/arm/mach-rockchip/rk322x/rk322x.c
+++ b/arch/arm/mach-rockchip/rk322x/rk322x.c
@@ -2,6 +2,7 @@ 
 /*
  * (C) Copyright 2019 Rockchip Electronics Co., Ltd
  */
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/grf_rk322x.h>
diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
index edf5994709..35a5c79728 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 <init.h>
 #include <malloc.h>
 #include <asm/io.h>
 #include <asm/arch/grf_rk3308.h>
diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c
index 8c81242e5d..7c85b2663c 100644
--- a/arch/arm/mach-rockchip/rk3328/rk3328.c
+++ b/arch/arm/mach-rockchip/rk3328/rk3328.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/grf_rk3328.h>
diff --git a/arch/arm/mach-rockchip/rk3368/rk3368.c b/arch/arm/mach-rockchip/rk3368/rk3368.c
index 20ae797794..bcc230c900 100644
--- a/arch/arm/mach-rockchip/rk3368/rk3368.c
+++ b/arch/arm/mach-rockchip/rk3368/rk3368.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <syscon.h>
 #include <asm/armv8/mmu.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index 3a51194108..aaa7246393 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <fdt_support.h>
+#include <init.h>
 #include <spl.h>
 #include <spl_gpio.h>
 #include <syscon.h>
diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c
index 2796e41369..0d74989adb 100644
--- a/arch/arm/mach-rockchip/spl.c
+++ b/arch/arm/mach-rockchip/spl.c
@@ -8,6 +8,7 @@ 
 #include <dm.h>
 #include <hang.h>
 #include <image.h>
+#include <init.h>
 #include <ram.h>
 #include <spl.h>
 #include <asm/arch-rockchip/bootrom.h>
diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c
index a2b8d31cbd..2de4e980e4 100644
--- a/arch/arm/mach-rockchip/tpl.c
+++ b/arch/arm/mach-rockchip/tpl.c
@@ -7,6 +7,7 @@ 
 #include <debug_uart.h>
 #include <dm.h>
 #include <hang.h>
+#include <init.h>
 #include <ram.h>
 #include <spl.h>
 #include <version.h>
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
index 7c8c05cc31..340abf9305 100644
--- a/arch/arm/mach-socfpga/board.c
+++ b/arch/arm/mach-socfpga/board.c
@@ -8,6 +8,7 @@ 
 #include <common.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <init.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.c b/arch/arm/mach-socfpga/clock_manager.c
index dbb10ecb68..0a6025fffa 100644
--- a/arch/arm/mach-socfpga/clock_manager.c
+++ b/arch/arm/mach-socfpga/clock_manager.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <asm/arch/clock_manager.h>
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 0158f4f04c..557305c703 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -7,6 +7,7 @@ 
 #include <cpu_func.h>
 #include <hang.h>
 #include <asm/cache.h>
+#include <init.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <fdtdec.h>
diff --git a/arch/arm/mach-socfpga/misc_arria10.c b/arch/arm/mach-socfpga/misc_arria10.c
index d56349b7f3..bf978053ca 100644
--- a/arch/arm/mach-socfpga/misc_arria10.c
+++ b/arch/arm/mach-socfpga/misc_arria10.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <miiphy.h>
 #include <netdev.h>
 #include <ns16550.h>
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index 21eb934e56..39acc8cfdb 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.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 a3f5b4364e..a87dd44181 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -9,6 +9,7 @@ 
 #include <env.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <miiphy.h>
 #include <netdev.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach-socfpga/spl_a10.c
index d2f52f2f2c..45aea4ab6c 100644
--- a/arch/arm/mach-socfpga/spl_a10.c
+++ b/arch/arm/mach-socfpga/spl_a10.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <hang.h>
+#include <init.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 aa9f3e646c..0192cccbd1 100644
--- a/arch/arm/mach-socfpga/spl_agilex.c
+++ b/arch/arm/mach-socfpga/spl_agilex.c
@@ -4,6 +4,7 @@ 
  *
  */
 
+#include <init.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 e9967ac450..6c9f45396d 100644
--- a/arch/arm/mach-socfpga/spl_gen5.c
+++ b/arch/arm/mach-socfpga/spl_gen5.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <hang.h>
+#include <init.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 08427dd83e..0f8588ba0c 100644
--- a/arch/arm/mach-socfpga/spl_s10.c
+++ b/arch/arm/mach-socfpga/spl_s10.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <hang.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
diff --git a/arch/arm/mach-socfpga/timer.c b/arch/arm/mach-socfpga/timer.c
index f1c0262ae5..a58f1cf9d3 100644
--- a/arch/arm/mach-socfpga/timer.c
+++ b/arch/arm/mach-socfpga/timer.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/timer.h>
 
diff --git a/arch/arm/mach-socfpga/timer_s10.c b/arch/arm/mach-socfpga/timer_s10.c
index 57237892c3..3ad98bdb25 100644
--- a/arch/arm/mach-socfpga/timer_s10.c
+++ b/arch/arm/mach-socfpga/timer_s10.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/timer.h>
 
diff --git a/arch/arm/mach-stm32/soc.c b/arch/arm/mach-stm32/soc.c
index 41338a1a33..1f12da401c 100644
--- a/arch/arm/mach-stm32/soc.c
+++ b/arch/arm/mach-stm32/soc.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/armv7_mpu.h>
 
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c
index 603c690a3d..001c246635 100644
--- a/arch/arm/mach-stm32mp/cpu.c
+++ b/arch/arm/mach-stm32mp/cpu.c
@@ -7,6 +7,7 @@ 
 #include <cpu_func.h>
 #include <debug_uart.h>
 #include <env.h>
+#include <init.h>
 #include <misc.h>
 #include <net.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
index 7688b3e315..f4cc609d2d 100644
--- a/arch/arm/mach-stm32mp/dram_init.c
+++ b/arch/arm/mach-stm32mp/dram_init.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <ram.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-stm32mp/spl.c b/arch/arm/mach-stm32mp/spl.c
index f85391c6af..fefb255419 100644
--- a/arch/arm/mach-stm32mp/spl.c
+++ b/arch/arm/mach-stm32mp/spl.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <hang.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c
index 11b333b563..32e3664265 100644
--- a/arch/arm/mach-sunxi/board.c
+++ b/arch/arm/mach-sunxi/board.c
@@ -11,6 +11,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <mmc.h>
 #include <i2c.h>
 #include <serial.h>
diff --git a/arch/arm/mach-sunxi/cpu_info.c b/arch/arm/mach-sunxi/cpu_info.c
index ae4745bfec..875e5a1a8a 100644
--- a/arch/arm/mach-sunxi/cpu_info.c
+++ b/arch/arm/mach-sunxi/cpu_info.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-sunxi/dram_sun50i_h6.c b/arch/arm/mach-sunxi/dram_sun50i_h6.c
index 9375db76a1..411a612393 100644
--- a/arch/arm/mach-sunxi/dram_sun50i_h6.c
+++ b/arch/arm/mach-sunxi/dram_sun50i_h6.c
@@ -1,11 +1,12 @@ 
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * sun50i H6 platform dram controller init
  *
  * (C) Copyright 2017      Icenowy Zheng <icenowy at aosc.io>
  *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
+#include <init.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 f473230bb5..8e781267c5 100644
--- a/arch/arm/mach-sunxi/dram_sun6i.c
+++ b/arch/arm/mach-sunxi/dram_sun6i.c
@@ -11,6 +11,7 @@ 
  */
 #include <common.h>
 #include <errno.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a23.c b/arch/arm/mach-sunxi/dram_sun8i_a23.c
index 9f00fefb77..221f92869c 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a23.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a23.c
@@ -21,6 +21,7 @@ 
 
 #include <common.h>
 #include <errno.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a33.c b/arch/arm/mach-sunxi/dram_sun8i_a33.c
index 5da01922bf..179acc7e6f 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a33.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a33.c
@@ -9,6 +9,7 @@ 
  */
 #include <common.h>
 #include <errno.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a83t.c b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
index 2c43b3ceba..2febb23654 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a83t.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a83t.c
@@ -9,6 +9,7 @@ 
  */
 #include <common.h>
 #include <errno.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
diff --git a/arch/arm/mach-sunxi/dram_sun9i.c b/arch/arm/mach-sunxi/dram_sun9i.c
index 77cc60623e..58ce05db6d 100644
--- a/arch/arm/mach-sunxi/dram_sun9i.c
+++ b/arch/arm/mach-sunxi/dram_sun9i.c
@@ -13,6 +13,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
 #include <ram.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-sunxi/dram_sunxi_dw.c b/arch/arm/mach-sunxi/dram_sunxi_dw.c
index 85e7a1874e..ea5fe108eb 100644
--- a/arch/arm/mach-sunxi/dram_sunxi_dw.c
+++ b/arch/arm/mach-sunxi/dram_sunxi_dw.c
@@ -9,6 +9,7 @@ 
  * (C) Copyright 2015      Jens Kuske <jenskuske at gmail.com>
  */
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/dram.h>
diff --git a/arch/arm/mach-tegra/cboot.c b/arch/arm/mach-tegra/cboot.c
index 4416827220..7cfbb6270f 100644
--- a/arch/arm/mach-tegra/cboot.c
+++ b/arch/arm/mach-tegra/cboot.c
@@ -8,6 +8,7 @@ 
 #include <fdt_support.h>
 #include <fdtdec.h>
 #include <hang.h>
+#include <init.h>
 #include <malloc.h>
 #include <net.h>
 #include <stdlib.h>
diff --git a/arch/arm/mach-tegra/sys_info.c b/arch/arm/mach-tegra/sys_info.c
index 5dc998a52b..5ad586ac17 100644
--- a/arch/arm/mach-tegra/sys_info.c
+++ b/arch/arm/mach-tegra/sys_info.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.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 ad09cc52eb..8d662c23d0 100644
--- a/arch/arm/mach-tegra/tegra114/clock.c
+++ b/arch/arm/mach-tegra/tegra114/clock.c
@@ -7,6 +7,7 @@ 
 /* Tegra114 Clock control functions */
 
 #include <common.h>
+#include <init.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 70916ea3c1..f02f8b0532 100644
--- a/arch/arm/mach-tegra/tegra124/clock.c
+++ b/arch/arm/mach-tegra/tegra124/clock.c
@@ -7,6 +7,7 @@ 
 /* Tegra124 Clock control functions */
 
 #include <common.h>
+#include <init.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 8f1bb4f069..4e607816a7 100644
--- a/arch/arm/mach-tegra/tegra20/clock.c
+++ b/arch/arm/mach-tegra/tegra20/clock.c
@@ -9,6 +9,7 @@ 
 
 #include <common.h>
 #include <errno.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/tegra.h>
diff --git a/arch/arm/mach-tegra/tegra210/clock.c b/arch/arm/mach-tegra/tegra210/clock.c
index 492f4d8c11..ed0ad2ee8b 100644
--- a/arch/arm/mach-tegra/tegra210/clock.c
+++ b/arch/arm/mach-tegra/tegra210/clock.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <errno.h>
+#include <init.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/tegra30/clock.c b/arch/arm/mach-tegra/tegra30/clock.c
index dd1193be14..ea17d14536 100644
--- a/arch/arm/mach-tegra/tegra30/clock.c
+++ b/arch/arm/mach-tegra/tegra30/clock.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <errno.h>
+#include <init.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 20f5ff3398..ab05b8a51b 100644
--- a/arch/arm/mach-u8500/cpuinfo.c
+++ b/arch/arm/mach-u8500/cpuinfo.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 
 #define U8500_BOOTROM_BASE	0x90000000
diff --git a/arch/arm/mach-uniphier/arm32/timer.c b/arch/arm/mach-uniphier/arm32/timer.c
index 899b539104..b3c907b508 100644
--- a/arch/arm/mach-uniphier/arm32/timer.c
+++ b/arch/arm/mach-uniphier/arm32/timer.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <linux/io.h>
 
 #include "arm-mpcore.h"
diff --git a/arch/arm/mach-uniphier/cpu-info.c b/arch/arm/mach-uniphier/cpu-info.c
index 6a7b203a44..1ede50771e 100644
--- a/arch/arm/mach-uniphier/cpu-info.c
+++ b/arch/arm/mach-uniphier/cpu-info.c
@@ -5,6 +5,7 @@ 
  *   Author: Masahiro Yamada <yamada.masahiro at socionext.com>
  */
 
+#include <init.h>
 #include <stdio.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 5392ffa603..b013571f36 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 <init.h>
 #include <linux/delay.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 5f9d90fe6d..1127373b20 100644
--- a/arch/arm/mach-uniphier/dram_init.c
+++ b/arch/arm/mach-uniphier/dram_init.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-versal/clk.c b/arch/arm/mach-versal/clk.c
index 9184714e47..b1e34796d0 100644
--- a/arch/arm/mach-versal/clk.c
+++ b/arch/arm/mach-versal/clk.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c
index 71731f324f..61c0b663fc 100644
--- a/arch/arm/mach-versal/cpu.c
+++ b/arch/arm/mach-versal/cpu.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-zynq/clk.c b/arch/arm/mach-zynq/clk.c
index b578f6538a..1ace117fc8 100644
--- a/arch/arm/mach-zynq/clk.c
+++ b/arch/arm/mach-zynq/clk.c
@@ -6,6 +6,7 @@ 
 #include <clk.h>
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <malloc.h>
 #include <asm/arch/clk.h>
 
diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c
index 43c5ca39d4..77b7cb1307 100644
--- a/arch/arm/mach-zynq/cpu.c
+++ b/arch/arm/mach-zynq/cpu.c
@@ -5,6 +5,7 @@ 
  */
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <zynqpl.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-zynq/spl.c b/arch/arm/mach-zynq/spl.c
index 627c84ceba..05f42e6e8b 100644
--- a/arch/arm/mach-zynq/spl.c
+++ b/arch/arm/mach-zynq/spl.c
@@ -6,6 +6,7 @@ 
 #include <debug_uart.h>
 #include <hang.h>
 #include <image.h>
+#include <init.h>
 #include <spl.h>
 #include <generated/dt.h>
 
diff --git a/arch/arm/mach-zynq/timer.c b/arch/arm/mach-zynq/timer.c
index d822e20d2b..cc0e24cbfe 100644
--- a/arch/arm/mach-zynq/timer.c
+++ b/arch/arm/mach-zynq/timer.c
@@ -31,6 +31,7 @@ 
 #include <common.h>
 #include <div64.h>
 #include <dm.h>
+#include <init.h>
 #include <time.h>
 #include <malloc.h>
 #include <asm/io.h>
diff --git a/arch/arm/mach-zynqmp-r5/cpu.c b/arch/arm/mach-zynqmp-r5/cpu.c
index aa5de863eb..b3402d7189 100644
--- a/arch/arm/mach-zynqmp-r5/cpu.c
+++ b/arch/arm/mach-zynqmp-r5/cpu.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <asm/armv7_mpu.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-zynqmp/clk.c b/arch/arm/mach-zynqmp/clk.c
index db2b4a8be2..5067b339c2 100644
--- a/arch/arm/mach-zynqmp/clk.c
+++ b/arch/arm/mach-zynqmp/clk.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
diff --git a/arch/arm/mach-zynqmp/cpu.c b/arch/arm/mach-zynqmp/cpu.c
index d832406434..3eb8e8f448 100644
--- a/arch/arm/mach-zynqmp/cpu.c
+++ b/arch/arm/mach-zynqmp/cpu.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/sys_proto.h>
diff --git a/arch/m68k/cpu/mcf5227x/cpu.c b/arch/m68k/cpu/mcf5227x/cpu.c
index 34534d876b..1590d4a954 100644
--- a/arch/m68k/cpu/mcf5227x/cpu.c
+++ b/arch/m68k/cpu/mcf5227x/cpu.c
@@ -9,6 +9,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <vsprintf.h>
 #include <watchdog.h>
 #include <command.h>
diff --git a/arch/m68k/cpu/mcf5227x/cpu_init.c b/arch/m68k/cpu/mcf5227x/cpu_init.c
index 7cde4c6105..4ab13b4d8e 100644
--- a/arch/m68k/cpu/mcf5227x/cpu_init.c
+++ b/arch/m68k/cpu/mcf5227x/cpu_init.c
@@ -10,6 +10,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <watchdog.h>
 
 #include <asm/immap.h>
diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index 8c808a6b0c..225bdc2d25 100644
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -9,6 +9,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/m68k/cpu/mcf523x/cpu_init.c b/arch/m68k/cpu/mcf523x/cpu_init.c
index 8c6e12d548..87effa71dc 100644
--- a/arch/m68k/cpu/mcf523x/cpu_init.c
+++ b/arch/m68k/cpu/mcf523x/cpu_init.c
@@ -10,6 +10,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <watchdog.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 5eee856392..1f70d90f0b 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -14,6 +14,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c
index f39fe19baf..9d4a10f028 100644
--- a/arch/m68k/cpu/mcf52x2/cpu_init.c
+++ b/arch/m68k/cpu/mcf52x2/cpu_init.c
@@ -19,6 +19,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <watchdog.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf530x/cpu.c b/arch/m68k/cpu/mcf530x/cpu.c
index a76deebc68..bef9047b35 100644
--- a/arch/m68k/cpu/mcf530x/cpu.c
+++ b/arch/m68k/cpu/mcf530x/cpu.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <vsprintf.h>
 #include <asm/immap.h>
 #include <asm/io.h>
diff --git a/arch/m68k/cpu/mcf530x/cpu_init.c b/arch/m68k/cpu/mcf530x/cpu_init.c
index 166720aef5..83529408eb 100644
--- a/arch/m68k/cpu/mcf530x/cpu_init.c
+++ b/arch/m68k/cpu/mcf530x/cpu_init.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <watchdog.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 32c477a5fd..52b64a94a7 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -9,6 +9,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c
index bd130c1b0c..1311f3967c 100644
--- a/arch/m68k/cpu/mcf532x/cpu_init.c
+++ b/arch/m68k/cpu/mcf532x/cpu_init.c
@@ -10,6 +10,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <watchdog.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 1602369080..cb1514c600 100644
--- a/arch/m68k/cpu/mcf5445x/cpu.c
+++ b/arch/m68k/cpu/mcf5445x/cpu.c
@@ -9,6 +9,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c
index 6ee23f0db2..9deab51d07 100644
--- a/arch/m68k/cpu/mcf5445x/cpu_init.c
+++ b/arch/m68k/cpu/mcf5445x/cpu_init.c
@@ -10,6 +10,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <watchdog.h>
 #include <asm/immap.h>
 #include <asm/processor.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu.c b/arch/m68k/cpu/mcf547x_8x/cpu.c
index 51281549a3..2a64c7b6f6 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu.c
@@ -9,6 +9,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <vsprintf.h>
 #include <watchdog.h>
diff --git a/arch/m68k/cpu/mcf547x_8x/cpu_init.c b/arch/m68k/cpu/mcf547x_8x/cpu_init.c
index 8779384c0a..8e42b63141 100644
--- a/arch/m68k/cpu/mcf547x_8x/cpu_init.c
+++ b/arch/m68k/cpu/mcf547x_8x/cpu_init.c
@@ -11,6 +11,7 @@ 
 #include <common.h>
 #include <MCD_dma.h>
 #include <cpu_func.h>
+#include <init.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 885659e342..c4988f9031 100644
--- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
+++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <irq_func.h>
 
 #include <asm/timer.h>
diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index bde1f4c228..eab6e2088e 100644
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <irq_func.h>
 #include <time.h>
 
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 805eac7fa3..e07fc628d1 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <time.h>
 #include <asm/microblaze_timer.h>
 #include <asm/microblaze_intc.h>
diff --git a/arch/mips/cpu/cpu.c b/arch/mips/cpu/cpu.c
index a403ff729b..682bee6be2 100644
--- a/arch/mips/cpu/cpu.c
+++ b/arch/mips/cpu/cpu.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <command.h>
+#include <init.h>
 #include <linux/compiler.h>
 #include <asm/cache.h>
 #include <asm/mipsregs.h>
diff --git a/arch/mips/lib/stack.c b/arch/mips/lib/stack.c
index 99fd056905..4d1d98c3ad 100644
--- a/arch/mips/lib/stack.c
+++ b/arch/mips/lib/stack.c
@@ -1,6 +1,7 @@ 
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <init.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/mips/mach-ath79/cpu.c b/arch/mips/mach-ath79/cpu.c
index 9afc672602..31e87d6206 100644
--- a/arch/mips/mach-ath79/cpu.c
+++ b/arch/mips/mach-ath79/cpu.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.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 87ced7c5d5..764ce89231 100644
--- a/arch/mips/mach-bmips/dram.c
+++ b/arch/mips/mach-bmips/dram.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <ram.h>
 #include <dm.h>
 
diff --git a/arch/mips/mach-jz47xx/jz4780/sdram.c b/arch/mips/mach-jz47xx/jz4780/sdram.c
index 65afefe53e..3049a63d57 100644
--- a/arch/mips/mach-jz47xx/jz4780/sdram.c
+++ b/arch/mips/mach-jz47xx/jz4780/sdram.c
@@ -11,6 +11,7 @@ 
 
 #include <common.h>
 #include <hang.h>
+#include <init.h>
 #include <asm/io.h>
 #include <mach/jz4780.h>
 #include <mach/jz4780_dram.h>
diff --git a/arch/mips/mach-jz47xx/jz4780/timer.c b/arch/mips/mach-jz47xx/jz4780/timer.c
index b32a2f5643..340e35e6fc 100644
--- a/arch/mips/mach-jz47xx/jz4780/timer.c
+++ b/arch/mips/mach-jz47xx/jz4780/timer.c
@@ -9,6 +9,7 @@ 
 #include <config.h>
 #include <common.h>
 #include <div64.h>
+#include <init.h>
 #include <irq_func.h>
 #include <time.h>
 #include <asm/io.h>
diff --git a/arch/mips/mach-mscc/cpu.c b/arch/mips/mach-mscc/cpu.c
index 3ee589891b..8273a0f5aa 100644
--- a/arch/mips/mach-mscc/cpu.c
+++ b/arch/mips/mach-mscc/cpu.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 
 #include <asm/io.h>
 #include <asm/types.h>
diff --git a/arch/mips/mach-mscc/dram.c b/arch/mips/mach-mscc/dram.c
index 72c70c9e84..b12bac63c2 100644
--- a/arch/mips/mach-mscc/dram.c
+++ b/arch/mips/mach-mscc/dram.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.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 459a9673eb..9ee5c7fdf6 100644
--- a/arch/mips/mach-mtmips/cpu.c
+++ b/arch/mips/mach-mtmips/cpu.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <malloc.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
diff --git a/arch/mips/mach-mtmips/spl.c b/arch/mips/mach-mtmips/spl.c
index 2a24af70c3..38d9e9160d 100644
--- a/arch/mips/mach-mtmips/spl.c
+++ b/arch/mips/mach-mtmips/spl.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <fdt.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/sections.h>
 #include <linux/sizes.h>
diff --git a/arch/mips/mach-pic32/cpu.c b/arch/mips/mach-pic32/cpu.c
index 8075d93d41..1d8c397144 100644
--- a/arch/mips/mach-pic32/cpu.c
+++ b/arch/mips/mach-pic32/cpu.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <init.h>
 #include <malloc.h>
 #include <mach/pic32.h>
 #include <mach/ddr.h>
diff --git a/arch/nds32/cpu/n1213/ag101/timer.c b/arch/nds32/cpu/n1213/ag101/timer.c
index f2e362102e..c59585692d 100644
--- a/arch/nds32/cpu/n1213/ag101/timer.c
+++ b/arch/nds32/cpu/n1213/ag101/timer.c
@@ -9,6 +9,7 @@ 
  */
 #ifndef CONFIG_TIMER
 #include <common.h>
+#include <init.h>
 #include <irq_func.h>
 #include <time.h>
 #include <asm/io.h>
diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
index 37ffa8f4a4..9008db6aa5 100644
--- a/arch/nios2/cpu/cpu.c
+++ b/arch/nios2/cpu/cpu.c
@@ -9,6 +9,7 @@ 
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
 #include <irq_func.h>
 #include <asm/cache.h>
 
diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c
index 665ac378c8..a183ed6343 100644
--- a/arch/powerpc/cpu/mpc83xx/pci.c
+++ b/arch/powerpc/cpu/mpc83xx/pci.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <pci.h>
 
 #if defined(CONFIG_OF_LIBFDT)
diff --git a/arch/powerpc/cpu/mpc85xx/cmd_errata.c b/arch/powerpc/cpu/mpc85xx/cmd_errata.c
index e455d8baf5..d3167f6cb9 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 <init.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 9f9eed165b..eff0d5d7e2 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 <init.h>
 #include <irq_func.h>
 #include <time.h>
 #include <vsprintf.h>
diff --git a/arch/powerpc/cpu/mpc86xx/cpu_init.c b/arch/powerpc/cpu/mpc86xx/cpu_init.c
index 89add62dc1..34752a34af 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu_init.c
@@ -11,6 +11,7 @@ 
 
 #include <config.h>
 #include <common.h>
+#include <init.h>
 #include <mpc86xx.h>
 #include <asm/mmu.h>
 #include <asm/fsl_law.h>
diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c
index 8bd6d0fbcf..c8d06b0508 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <watchdog.h>
 
 #include <mpc8xx.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index bb81f49ae7..da0a80e6fc 100644
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -11,6 +11,7 @@ 
 #include <common.h>
 #include <command.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <net.h>
 #include <tsec.h>
 #include <fm_eth.h>
diff --git a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
index afcb75ba17..29489b46e6 100644
--- a/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
+++ b/arch/powerpc/cpu/mpc8xxx/fsl_lbc.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <hang.h>
+#include <init.h>
 #include <asm/fsl_lbc.h>
 
 #ifdef CONFIG_MPC83xx
diff --git a/arch/powerpc/lib/stack.c b/arch/powerpc/lib/stack.c
index 9a956c221d..5840fe6349 100644
--- a/arch/powerpc/lib/stack.c
+++ b/arch/powerpc/lib/stack.c
@@ -11,6 +11,7 @@ 
  * Marius Groeger <mgroeger at sysgo.de>
  */
 #include <common.h>
+#include <init.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/powerpc/lib/time.c b/arch/powerpc/lib/time.c
index e1494fa129..58931f0e6e 100644
--- a/arch/powerpc/lib/time.c
+++ b/arch/powerpc/lib/time.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 
diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c
index e457f6acbf..1cebb0322e 100644
--- a/arch/riscv/cpu/cpu.c
+++ b/arch/riscv/cpu/cpu.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <cpu.h>
 #include <dm.h>
+#include <init.h>
 #include <log.h>
 #include <asm/encoding.h>
 #include <dm/uclass-internal.h>
diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c
index 4ca038b148..f3f603b76e 100644
--- a/arch/riscv/lib/spl.c
+++ b/arch/riscv/lib/spl.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <hang.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/smp.h>
 
diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index d5f683bbaa..b92db85c22 100644
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <hang.h>
+#include <init.h>
 #include <os.h>
 #include <spl.h>
 #include <asm/spl.h>
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c
index b6ff5c3d64..c6a2bbe468 100644
--- a/arch/sandbox/cpu/start.c
+++ b/arch/sandbox/cpu/start.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <command.h>
 #include <errno.h>
+#include <init.h>
 #include <os.h>
 #include <cli.h>
 #include <sort.h>
diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c
index 51e1cc1181..d09f782f5f 100644
--- a/arch/sh/lib/time.c
+++ b/arch/sh/lib/time.c
@@ -11,6 +11,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 
diff --git a/arch/sh/lib/time_sh2.c b/arch/sh/lib/time_sh2.c
index d82c1d2feb..ef7c6073cc 100644
--- a/arch/sh/lib/time_sh2.c
+++ b/arch/sh/lib/time_sh2.c
@@ -8,6 +8,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <time.h>
 #include <asm/io.h>
 #include <asm/processor.h>
diff --git a/arch/x86/cpu/apollolake/cpu_spl.c b/arch/x86/cpu/apollolake/cpu_spl.c
index e2509e391f..707ceb3e64 100644
--- a/arch/x86/cpu/apollolake/cpu_spl.c
+++ b/arch/x86/cpu/apollolake/cpu_spl.c
@@ -8,6 +8,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <ec_commands.h>
+#include <init.h>
 #include <log.h>
 #include <spi_flash.h>
 #include <spl.h>
diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
index fd6e73dfc8..30b820fdbc 100644
--- a/arch/x86/cpu/apollolake/fsp_s.c
+++ b/arch/x86/cpu/apollolake/fsp_s.c
@@ -8,6 +8,7 @@ 
 #include <binman.h>
 #include <bootstage.h>
 #include <dm.h>
+#include <init.h>
 #include <irq.h>
 #include <malloc.h>
 #include <acpi/acpi_s3.h>
diff --git a/arch/x86/cpu/braswell/braswell.c b/arch/x86/cpu/braswell/braswell.c
index 7a83b06005..3345049993 100644
--- a/arch/x86/cpu/braswell/braswell.c
+++ b/arch/x86/cpu/braswell/braswell.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/mrccache.h>
 #include <asm/post.h>
 
diff --git a/arch/x86/cpu/broadwell/cpu.c b/arch/x86/cpu/broadwell/cpu.c
index 55a7439f1c..793167937c 100644
--- a/arch/x86/cpu/broadwell/cpu.c
+++ b/arch/x86/cpu/broadwell/cpu.c
@@ -8,6 +8,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <cpu.h>
+#include <init.h>
 #include <asm/cpu.h>
 #include <asm/cpu_x86.h>
 #include <asm/cpu_common.h>
diff --git a/arch/x86/cpu/broadwell/cpu_from_spl.c b/arch/x86/cpu/broadwell/cpu_from_spl.c
index 2aa6f245e7..17ff43b58e 100644
--- a/arch/x86/cpu/broadwell/cpu_from_spl.c
+++ b/arch/x86/cpu/broadwell/cpu_from_spl.c
@@ -9,6 +9,7 @@ 
 #include <cpu_func.h>
 #include <debug_uart.h>
 #include <handoff.h>
+#include <init.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 895edeb4bc..3d42b1caac 100644
--- a/arch/x86/cpu/broadwell/cpu_full.c
+++ b/arch/x86/cpu/broadwell/cpu_full.c
@@ -8,6 +8,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <cpu.h>
+#include <init.h>
 #include <asm/cpu.h>
 #include <asm/cpu_x86.h>
 #include <asm/cpu_common.h>
diff --git a/arch/x86/cpu/broadwell/refcode.c b/arch/x86/cpu/broadwell/refcode.c
index f016489185..b944896e75 100644
--- a/arch/x86/cpu/broadwell/refcode.c
+++ b/arch/x86/cpu/broadwell/refcode.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <errno.h>
+#include <init.h>
 #include <asm/arch/pei_data.h>
 
 #define RMODULE_MAGIC		0xf8fe
diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 624caf67a6..d44db1347b 100644
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -8,6 +8,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <usb.h>
 #include <asm/io.h>
 #include <asm/msr.h>
diff --git a/arch/x86/cpu/efi/app.c b/arch/x86/cpu/efi/app.c
index 13077411dc..10677ecbc2 100644
--- a/arch/x86/cpu/efi/app.c
+++ b/arch/x86/cpu/efi/app.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <netdev.h>
 
 int arch_cpu_init(void)
diff --git a/arch/x86/cpu/intel_common/cpu_from_spl.c b/arch/x86/cpu/intel_common/cpu_from_spl.c
index b7bb524162..e4157c5734 100644
--- a/arch/x86/cpu/intel_common/cpu_from_spl.c
+++ b/arch/x86/cpu/intel_common/cpu_from_spl.c
@@ -7,6 +7,7 @@ 
 #include <dm.h>
 #include <errno.h>
 #include <handoff.h>
+#include <init.h>
 #include <asm/cpu_common.h>
 #include <asm/intel_regs.h>
 #include <asm/lapic.h>
diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c
index 8f30cdbe24..0639b5cf02 100644
--- a/arch/x86/cpu/ivybridge/cpu.c
+++ b/arch/x86/cpu/ivybridge/cpu.c
@@ -15,6 +15,7 @@ 
 #include <dm.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <pch.h>
 #include <asm/cpu.h>
 #include <asm/cpu_common.h>
diff --git a/arch/x86/cpu/ivybridge/ivybridge.c b/arch/x86/cpu/ivybridge/ivybridge.c
index 8d10fd6c54..eb3f362e4e 100644
--- a/arch/x86/cpu/ivybridge/ivybridge.c
+++ b/arch/x86/cpu/ivybridge/ivybridge.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/post.h>
 #include <asm/processor.h>
 
diff --git a/arch/x86/cpu/ivybridge/sdram_nop.c b/arch/x86/cpu/ivybridge/sdram_nop.c
index c55213ca2d..54e6acf262 100644
--- a/arch/x86/cpu/ivybridge/sdram_nop.c
+++ b/arch/x86/cpu/ivybridge/sdram_nop.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c
index 716351ad7f..044a429c13 100644
--- a/arch/x86/cpu/qemu/qemu.c
+++ b/arch/x86/cpu/qemu/qemu.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <pci.h>
 #include <qfw.h>
 #include <asm/irq.h>
diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c
index 46c6d00eb4..e2e2d9fe33 100644
--- a/arch/x86/cpu/quark/quark.c
+++ b/arch/x86/cpu/quark/quark.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <mmc.h>
 #include <asm/cache.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/queensbay/tnc.c b/arch/x86/cpu/queensbay/tnc.c
index 66737e655b..782ed863fe 100644
--- a/arch/x86/cpu/queensbay/tnc.c
+++ b/arch/x86/cpu/queensbay/tnc.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <dm/device-internal.h>
 #include <pci.h>
 #include <asm/io.h>
diff --git a/arch/x86/cpu/slimbootloader/slimbootloader.c b/arch/x86/cpu/slimbootloader/slimbootloader.c
index 21dcfb2142..889fba5473 100644
--- a/arch/x86/cpu/slimbootloader/slimbootloader.c
+++ b/arch/x86/cpu/slimbootloader/slimbootloader.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <asm/arch/slimbootloader.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/x86/cpu/tangier/tangier.c b/arch/x86/cpu/tangier/tangier.c
index 43bee1fb70..1e2f6cc8b7 100644
--- a/arch/x86/cpu/tangier/tangier.c
+++ b/arch/x86/cpu/tangier/tangier.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <asm/u-boot-x86.h>
 
 /*
diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c
index 4b64339f25..1b4d3971b0 100644
--- a/arch/x86/cpu/x86_64/cpu.c
+++ b/arch/x86/cpu/x86_64/cpu.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
+#include <init.h>
 
 /*
  * Global declaration of gd.
diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c
index 267527eb34..114d3d9cf8 100644
--- a/arch/x86/lib/fsp/fsp_common.c
+++ b/arch/x86/lib/fsp/fsp_common.c
@@ -7,6 +7,7 @@ 
 #include <cpu_func.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
 #include <rtc.h>
 #include <acpi/acpi_s3.h>
 #include <asm/cmos_layout.h>
diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c
index 98b762209f..0e71583a49 100644
--- a/arch/x86/lib/fsp/fsp_graphics.c
+++ b/arch/x86/lib/fsp/fsp_graphics.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <vbe.h>
 #include <video.h>
 #include <asm/fsp/fsp_support.h>
diff --git a/arch/x86/lib/fsp1/fsp_common.c b/arch/x86/lib/fsp1/fsp_common.c
index 0a726807c2..312283ae9d 100644
--- a/arch/x86/lib/fsp1/fsp_common.c
+++ b/arch/x86/lib/fsp1/fsp_common.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
 #include <malloc.h>
 #include <rtc.h>
 #include <acpi/acpi_s3.h>
diff --git a/arch/x86/lib/fsp1/fsp_dram.c b/arch/x86/lib/fsp1/fsp_dram.c
index 5ef89744b9..e3f9e30f6a 100644
--- a/arch/x86/lib/fsp1/fsp_dram.c
+++ b/arch/x86/lib/fsp1/fsp_dram.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/fsp/fsp_support.h>
 
 int dram_init(void)
diff --git a/arch/x86/lib/fsp2/fsp_dram.c b/arch/x86/lib/fsp2/fsp_dram.c
index 3869c53c5f..e2e6efd8b0 100644
--- a/arch/x86/lib/fsp2/fsp_dram.c
+++ b/arch/x86/lib/fsp2/fsp_dram.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <handoff.h>
+#include <init.h>
 #include <spl.h>
 #include <acpi/acpi_s3.h>
 #include <asm/arch/cpu.h>
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index bdae9291e7..fb8d40c02d 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -9,6 +9,7 @@ 
 #include <dm.h>
 #include <hang.h>
 #include <image.h>
+#include <init.h>
 #include <irq_func.h>
 #include <malloc.h>
 #include <spl.h>
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index f9dcf32d73..ac265b6744 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -8,6 +8,7 @@ 
 #include <dm.h>
 #include <hang.h>
 #include <image.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/cpu.h>
 #include <asm/mtrr.h>
diff --git a/arch/xtensa/cpu/cpu.c b/arch/xtensa/cpu/cpu.c
index 6f4b88f88e..85d3464607 100644
--- a/arch/xtensa/cpu/cpu.c
+++ b/arch/xtensa/cpu/cpu.c
@@ -10,6 +10,7 @@ 
 
 #include <common.h>
 #include <command.h>
+#include <init.h>
 #include <vsprintf.h>
 #include <linux/stringify.h>
 #include <asm/global_data.h>
diff --git a/board/BuR/brppt2/board.c b/board/BuR/brppt2/board.c
index c91d2f9494..f156b552a7 100644
--- a/board/BuR/brppt2/board.c
+++ b/board/BuR/brppt2/board.c
@@ -9,6 +9,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <hang.h>
+#include <init.h>
 #include <spl.h>
 #include <dm.h>
 #include <miiphy.h>
diff --git a/board/LaCie/net2big_v2/net2big_v2.c b/board/LaCie/net2big_v2/net2big_v2.c
index 50305656e8..8b97e1a533 100644
--- a/board/LaCie/net2big_v2/net2big_v2.c
+++ b/board/LaCie/net2big_v2/net2big_v2.c
@@ -12,6 +12,7 @@ 
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <net.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c
index b7ae58c645..f9bf527739 100644
--- a/board/LaCie/netspace_v2/netspace_v2.c
+++ b/board/LaCie/netspace_v2/netspace_v2.c
@@ -11,6 +11,7 @@ 
 #include <common.h>
 #include <command.h>
 #include <env.h>
+#include <init.h>
 #include <net.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/aspenite/aspenite.c b/board/Marvell/aspenite/aspenite.c
index c4e506ff3b..c1406d7489 100644
--- a/board/Marvell/aspenite/aspenite.c
+++ b/board/Marvell/aspenite/aspenite.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <mvmfp.h>
 #include <asm/mach-types.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
index 729516d9e1..a6f1167e39 100644
--- a/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
+++ b/board/Marvell/db-88f6281-bp/db-88f6281-bp.c
@@ -1,6 +1,7 @@ 
 // SPDX-License-Identifier: GPL-2.0+
 
 #include <common.h>
+#include <init.h>
 #include <net.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 3e975801b8..ba0a944b9a 100644
--- a/board/Marvell/db-88f6720/db-88f6720.c
+++ b/board/Marvell/db-88f6720/db-88f6720.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
diff --git a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
index 372beb3c43..f225f467bf 100644
--- a/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
+++ b/board/Marvell/db-88f6820-amc/db-88f6820-amc.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <i2c.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
diff --git a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
index f3df7e666b..53a80c949b 100644
--- a/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
+++ b/board/Marvell/db-88f6820-gp/db-88f6820-gp.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <i2c.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
index e7808f5a5c..cb65357844 100644
--- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
+++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
diff --git a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
index cae428ffd0..1153b188e7 100644
--- a/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
+++ b/board/Marvell/db-xc3-24g4xg/db-xc3-24g4xg.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <i2c.h>
+#include <init.h>
 #include <asm/gpio.h>
 #include <linux/mbus.h>
 #include <linux/io.h>
diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c
index 887dd1ed74..7d188c3279 100644
--- a/board/Marvell/dreamplug/dreamplug.c
+++ b/board/Marvell/dreamplug/dreamplug.c
@@ -9,6 +9,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <asm/arch/cpu.h>
diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
index fc2bc85f00..10236bd07f 100644
--- a/board/Marvell/gplugd/gplugd.c
+++ b/board/Marvell/gplugd/gplugd.c
@@ -12,6 +12,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <mvmfp.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/mfp.h>
diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c
index 71bee76bdc..f3981c66d2 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <asm/mach-types.h>
diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
index bef4e1767c..29bd6a9a40 100644
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <i2c.h>
+#include <init.h>
 #include <phy.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 ae9202895d..d9b5b213fe 100644
--- a/board/Marvell/openrd/openrd.c
+++ b/board/Marvell/openrd/openrd.c
@@ -11,6 +11,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <asm/mach-types.h>
diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c
index 6c6106c23c..6311ed3b2e 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <asm/mach-types.h>
diff --git a/board/Seagate/dockstar/dockstar.c b/board/Seagate/dockstar/dockstar.c
index 0ff8a9053e..85dd10e55a 100644
--- a/board/Seagate/dockstar/dockstar.c
+++ b/board/Seagate/dockstar/dockstar.c
@@ -10,6 +10,7 @@ 
 
 #include <common.h>
 #include <bootstage.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <asm/arch/soc.h>
diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c
index fd2f0df371..de1ec54466 100644
--- a/board/Seagate/goflexhome/goflexhome.c
+++ b/board/Seagate/goflexhome/goflexhome.c
@@ -13,6 +13,7 @@ 
 
 #include <common.h>
 #include <bootstage.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <asm/mach-types.h>
diff --git a/board/Seagate/nas220/nas220.c b/board/Seagate/nas220/nas220.c
index 99462052f0..3a027d083a 100644
--- a/board/Seagate/nas220/nas220.c
+++ b/board/Seagate/nas220/nas220.c
@@ -9,6 +9,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <asm/mach-types.h>
diff --git a/board/Synology/ds109/ds109.c b/board/Synology/ds109/ds109.c
index f2031ef3bb..c4cd95cd80 100644
--- a/board/Synology/ds109/ds109.c
+++ b/board/Synology/ds109/ds109.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <asm/setup.h>
diff --git a/board/Synology/ds414/ds414.c b/board/Synology/ds414/ds414.c
index d23e97c9b9..deb530fe78 100644
--- a/board/Synology/ds414/ds414.c
+++ b/board/Synology/ds414/ds414.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
index bb7913025d..772e21b9c5 100644
--- a/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
+++ b/board/advantech/imx8qm_rom7720_a1/imx8qm_rom7720_a1.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <errno.h>
+#include <init.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 6863da82d6..21ebd5dddb 100644
--- a/board/advantech/imx8qm_rom7720_a1/spl.c
+++ b/board/advantech/imx8qm_rom7720_a1/spl.c
@@ -5,6 +5,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <image.h>
+#include <init.h>
 #include <spl.h>
 #include <fsl_esdhc.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 8f4c587371..8499fc541f 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
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/fsp1/fsp_support.h>
 
 /* ALC262 Verb Table - 10EC0262 */
diff --git a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
index 1f3f293bd9..b96cf0b59c 100644
--- a/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
+++ b/board/alliedtelesis/SBx81LIFKW/sbx81lifkw.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <linux/io.h>
 #include <miiphy.h>
diff --git a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
index 889ce70d75..5c9124fbb4 100644
--- a/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
+++ b/board/alliedtelesis/SBx81LIFXCAT/sbx81lifxcat.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c
index 04b053dc20..1a6dec04a3 100644
--- a/board/alliedtelesis/x530/x530.c
+++ b/board/alliedtelesis/x530/x530.c
@@ -8,6 +8,7 @@ 
 #include <dm.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <wdt.h>
 #include <asm/gpio.h>
 #include <linux/mbus.h>
diff --git a/board/amazon/kc1/kc1.c b/board/amazon/kc1/kc1.c
index 9034c4fbff..fb1828ff44 100644
--- a/board/amazon/kc1/kc1.c
+++ b/board/amazon/kc1/kc1.c
@@ -8,6 +8,7 @@ 
 #include <config.h>
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <linux/ctype.h>
 #include <linux/usb/musb.h>
 #include <asm/omap_musb.h>
diff --git a/board/amlogic/p200/p200.c b/board/amlogic/p200/p200.c
index d7f7ebd962..8f1bf8bfda 100644
--- a/board/amlogic/p200/p200.c
+++ b/board/amlogic/p200/p200.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <env.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/gx.h>
diff --git a/board/amlogic/p201/p201.c b/board/amlogic/p201/p201.c
index cdac64ed92..597bb71cbf 100644
--- a/board/amlogic/p201/p201.c
+++ b/board/amlogic/p201/p201.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <env.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/gx.h>
diff --git a/board/amlogic/p212/p212.c b/board/amlogic/p212/p212.c
index 6ac5aadecf..fbc49e9565 100644
--- a/board/amlogic/p212/p212.c
+++ b/board/amlogic/p212/p212.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <env.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/gx.h>
diff --git a/board/amlogic/q200/q200.c b/board/amlogic/q200/q200.c
index ae9b888c12..62e6fa3d19 100644
--- a/board/amlogic/q200/q200.c
+++ b/board/amlogic/q200/q200.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <env.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/gx.h>
diff --git a/board/amlogic/s400/s400.c b/board/amlogic/s400/s400.c
index 79b867996b..7e2f0cdae3 100644
--- a/board/amlogic/s400/s400.c
+++ b/board/amlogic/s400/s400.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/axg.h>
diff --git a/board/amlogic/sei510/sei510.c b/board/amlogic/sei510/sei510.c
index 07a6a47ebc..70fe3559f6 100644
--- a/board/amlogic/sei510/sei510.c
+++ b/board/amlogic/sei510/sei510.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <env_internal.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/axg.h>
diff --git a/board/amlogic/sei610/sei610.c b/board/amlogic/sei610/sei610.c
index 5c24276d51..3c44fba516 100644
--- a/board/amlogic/sei610/sei610.c
+++ b/board/amlogic/sei610/sei610.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <env_internal.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/axg.h>
diff --git a/board/amlogic/u200/u200.c b/board/amlogic/u200/u200.c
index 4df7ff437e..373235d77a 100644
--- a/board/amlogic/u200/u200.c
+++ b/board/amlogic/u200/u200.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/axg.h>
diff --git a/board/amlogic/w400/w400.c b/board/amlogic/w400/w400.c
index 95bbdedbdd..47a51710dc 100644
--- a/board/amlogic/w400/w400.c
+++ b/board/amlogic/w400/w400.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <env_internal.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/eth.h>
diff --git a/board/aristainetos/aristainetos.c b/board/aristainetos/aristainetos.c
index 5095cf65d1..3a59b51c1c 100644
--- a/board/aristainetos/aristainetos.c
+++ b/board/aristainetos/aristainetos.c
@@ -10,6 +10,7 @@ 
  */
 
 #include <image.h>
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/armltd/vexpress64/pcie.c b/board/armltd/vexpress64/pcie.c
index 21156a4ca9..888434a6f8 100644
--- a/board/armltd/vexpress64/pcie.c
+++ b/board/armltd/vexpress64/pcie.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.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 912202d8eb..fbfa7a18f1 100644
--- a/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <init.h>
 #include <malloc.h>
 #include <errno.h>
 #include <net.h>
diff --git a/board/atmel/at91sam9260ek/led.c b/board/atmel/at91sam9260ek/led.c
index 2ea66b9b15..cc6d5d7a05 100644
--- a/board/atmel/at91sam9260ek/led.c
+++ b/board/atmel/at91sam9260ek/led.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/gpio.h>
 #include <status_led.h>
diff --git a/board/atmel/common/video_display.c b/board/atmel/common/video_display.c
index 5cc52139a7..2666b0b3cd 100644
--- a/board/atmel/common/video_display.c
+++ b/board/atmel/common/video_display.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <atmel_lcd.h>
 #include <dm.h>
+#include <init.h>
 #include <nand.h>
 #include <version.h>
 #include <video.h>
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index dd7863f7ac..db0da0ca2f 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/bachmann/ot1200/ot1200_spl.c b/board/bachmann/ot1200/ot1200_spl.c
index a3a822f65a..7fbd6f2c5d 100644
--- a/board/bachmann/ot1200/ot1200_spl.c
+++ b/board/bachmann/ot1200/ot1200_spl.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/arch/mx6-ddr.h>
 
diff --git a/board/barco/platinum/spl_picon.c b/board/barco/platinum/spl_picon.c
index ec6de460c1..253a64d28e 100644
--- a/board/barco/platinum/spl_picon.c
+++ b/board/barco/platinum/spl_picon.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <i2c.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/barco/platinum/spl_titanium.c b/board/barco/platinum/spl_titanium.c
index 263371a2b2..8c91b752ff 100644
--- a/board/barco/platinum/spl_titanium.c
+++ b/board/barco/platinum/spl_titanium.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <i2c.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/iomux.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/bluegiga/apx4devkit/apx4devkit.c b/board/bluegiga/apx4devkit/apx4devkit.c
index 2599db7bf7..be8eefb365 100644
--- a/board/bluegiga/apx4devkit/apx4devkit.c
+++ b/board/bluegiga/apx4devkit/apx4devkit.c
@@ -14,6 +14,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
index 03ba9e8c5e..b8dbe8ac53 100644
--- a/board/bosch/guardian/board.c
+++ b/board/bosch/guardian/board.c
@@ -14,6 +14,7 @@ 
 #include <env_internal.h>
 #include <errno.h>
 #include <i2c.h>
+#include <init.h>
 #include <led.h>
 #include <miiphy.h>
 #include <panel.h>
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index 4d40cb8ff5..8e29fd0095 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
diff --git a/board/broadcom/bcm963158/bcm963158.c b/board/broadcom/bcm963158/bcm963158.c
index db82cd570d..9feaee3c0f 100644
--- a/board/broadcom/bcm963158/bcm963158.c
+++ b/board/broadcom/bcm963158/bcm963158.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <linux/io.h>
 
 #ifdef CONFIG_ARM64
diff --git a/board/broadcom/bcm968360bg/bcm968360bg.c b/board/broadcom/bcm968360bg/bcm968360bg.c
index a5fbc1d297..90af6b88bd 100644
--- a/board/broadcom/bcm968360bg/bcm968360bg.c
+++ b/board/broadcom/bcm968360bg/bcm968360bg.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <linux/io.h>
 
 #ifdef CONFIG_ARM64
diff --git a/board/broadcom/bcm968580xref/bcm968580xref.c b/board/broadcom/bcm968580xref/bcm968580xref.c
index 2e547f5170..1bd723d49e 100644
--- a/board/broadcom/bcm968580xref/bcm968580xref.c
+++ b/board/broadcom/bcm968580xref/bcm968580xref.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <linux/io.h>
 
 #ifdef CONFIG_ARM64
diff --git a/board/bticino/mamoj/mamoj.c b/board/bticino/mamoj/mamoj.c
index 6ad7e31092..b7d37b7004 100644
--- a/board/bticino/mamoj/mamoj.c
+++ b/board/bticino/mamoj/mamoj.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/sys_proto.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/bticino/mamoj/spl.c b/board/bticino/mamoj/spl.c
index 620e4d1de0..ece37800bf 100644
--- a/board/bticino/mamoj/spl.c
+++ b/board/bticino/mamoj/spl.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <serial.h>
 #include <spl.h>
 
diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c
index 56a2c29e4c..6afb6bbdb5 100644
--- a/board/buffalo/lsxl/lsxl.c
+++ b/board/buffalo/lsxl/lsxl.c
@@ -12,6 +12,7 @@ 
 #include <env.h>
 #include <env_internal.h>
 #include <flash.h>
+#include <init.h>
 #include <net.h>
 #include <malloc.h>
 #include <netdev.h>
diff --git a/board/ccv/xpress/spl.c b/board/ccv/xpress/spl.c
index 90f655ab2e..38bda8d184 100644
--- a/board/ccv/xpress/spl.c
+++ b/board/ccv/xpress/spl.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/cirrus/edb93xx/edb93xx.c b/board/cirrus/edb93xx/edb93xx.c
index b64ec95e31..0318bf18cf 100644
--- a/board/cirrus/edb93xx/edb93xx.c
+++ b/board/cirrus/edb93xx/edb93xx.c
@@ -16,6 +16,7 @@ 
 #include <config.h>
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <irq_func.h>
 #include <net.h>
 #include <netdev.h>
diff --git a/board/cloudengines/pogo_e02/pogo_e02.c b/board/cloudengines/pogo_e02/pogo_e02.c
index 835c3279be..433e0de8a3 100644
--- a/board/cloudengines/pogo_e02/pogo_e02.c
+++ b/board/cloudengines/pogo_e02/pogo_e02.c
@@ -10,6 +10,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <asm/arch/cpu.h>
diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c
index b52358baac..b714712f2a 100644
--- a/board/compulab/cm_t35/cm_t35.c
+++ b/board/compulab/cm_t35/cm_t35.c
@@ -13,6 +13,7 @@ 
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <status_led.h>
 #include <netdev.h>
 #include <net.h>
diff --git a/board/corscience/tricorder/tricorder.c b/board/corscience/tricorder/tricorder.c
index cec819b36f..30974e8d92 100644
--- a/board/corscience/tricorder/tricorder.c
+++ b/board/corscience/tricorder/tricorder.c
@@ -10,6 +10,7 @@ 
  * Frederik Kriewitz <frederik at kriewitz.eu>
  */
 #include <common.h>
+#include <init.h>
 #include <malloc.h>
 #include <twl4030.h>
 #include <status_led.h>
diff --git a/board/cortina/presidio-asic/presidio.c b/board/cortina/presidio-asic/presidio.c
index b4fa01f368..427151c8df 100644
--- a/board/cortina/presidio-asic/presidio.c
+++ b/board/cortina/presidio-asic/presidio.c
@@ -4,6 +4,7 @@ 
  *
  */
 #include <common.h>
+#include <init.h>
 #include <malloc.h>
 #include <errno.h>
 #include <netdev.h>
diff --git a/board/creative/xfi3/xfi3.c b/board/creative/xfi3/xfi3.c
index 66781ef316..4a32893a79 100644
--- a/board/creative/xfi3/xfi3.c
+++ b/board/creative/xfi3/xfi3.c
@@ -11,6 +11,7 @@ 
 
 #include <common.h>
 #include <errno.h>
+#include <init.h>
 #include <net.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/d-link/dns325/dns325.c b/board/d-link/dns325/dns325.c
index dfdc683683..a0f3dada42 100644
--- a/board/d-link/dns325/dns325.c
+++ b/board/d-link/dns325/dns325.c
@@ -10,6 +10,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index d9019de6e0..a3b0f8bf09 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -12,6 +12,7 @@ 
 #include <dm.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <net.h>
 #include <spi.h>
 #include <spi_flash.h>
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c
index 608a7f28eb..adb56c6c87 100644
--- a/board/davinci/da8xxevm/omapl138_lcdk.c
+++ b/board/davinci/da8xxevm/omapl138_lcdk.c
@@ -11,6 +11,7 @@ 
 #include <common.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <net.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/davinci_nand.h>
diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
index f2c3ac3e28..fd6099c566 100644
--- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c
+++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/ea/mx7ulp_com/mx7ulp_com.c b/board/ea/mx7ulp_com/mx7ulp_com.c
index 6fc1631bf7..a9b8a32108 100644
--- a/board/ea/mx7ulp_com/mx7ulp_com.c
+++ b/board/ea/mx7ulp_com/mx7ulp_com.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mx7ulp-pins.h>
diff --git a/board/elgin/elgin_rv1108/elgin_rv1108.c b/board/elgin/elgin_rv1108/elgin_rv1108.c
index c5a1cc95e4..5d8f62244b 100644
--- a/board/elgin/elgin_rv1108/elgin_rv1108.c
+++ b/board/elgin/elgin_rv1108/elgin_rv1108.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c
index 4e18733001..ee5d4b41f2 100644
--- a/board/emulation/qemu-arm/qemu-arm.c
+++ b/board/emulation/qemu-arm/qemu-arm.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <virtio_types.h>
 #include <virtio.h>
 
diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c
index 6359fb3223..62b06783c9 100644
--- a/board/engicam/common/spl.c
+++ b/board/engicam/common/spl.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <image.h>
+#include <init.h>
 #include <serial.h>
 #include <spl.h>
 
diff --git a/board/freescale/b4860qds/ddr.c b/board/freescale/b4860qds/ddr.c
index de9f5f5f8b..c6cd3f4292 100644
--- a/board/freescale/b4860qds/ddr.c
+++ b/board/freescale/b4860qds/ddr.c
@@ -7,6 +7,7 @@ 
 #include <i2c.h>
 #include <hwconfig.h>
 #include <fsl_ddr.h>
+#include <init.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/bsc9131rdb/bsc9131rdb.c b/board/freescale/bsc9131rdb/bsc9131rdb.c
index 871d066d68..75c2aec75d 100644
--- a/board/freescale/bsc9131rdb/bsc9131rdb.c
+++ b/board/freescale/bsc9131rdb/bsc9131rdb.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <image.h>
+#include <init.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/cache.h>
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index c487e3a515..71af645b03 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -10,6 +10,7 @@ 
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <linux/ctype.h>
 #include <u-boot/crc.h>
 
diff --git a/board/freescale/corenet_ds/ddr.c b/board/freescale/corenet_ds/ddr.c
index 9c8731ce78..073f3ac704 100644
--- a/board/freescale/corenet_ds/ddr.c
+++ b/board/freescale/corenet_ds/ddr.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <vsprintf.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
diff --git a/board/freescale/imx8mm_evk/imx8mm_evk.c b/board/freescale/imx8mm_evk/imx8mm_evk.c
index 53ebb949df..1f95f3b0c4 100644
--- a/board/freescale/imx8mm_evk/imx8mm_evk.c
+++ b/board/freescale/imx8mm_evk/imx8mm_evk.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <netdev.h>
 
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c
index f73ade5549..3abf6be482 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/freescale/imx8mm_evk/spl.c
@@ -7,6 +7,7 @@ 
 #include <cpu_func.h>
 #include <hang.h>
 #include <image.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/freescale/imx8mn_evk/imx8mn_evk.c b/board/freescale/imx8mn_evk/imx8mn_evk.c
index 4f33c0e7c9..8bd54ea2aa 100644
--- a/board/freescale/imx8mn_evk/imx8mn_evk.c
+++ b/board/freescale/imx8mn_evk/imx8mn_evk.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c
index 7cb7f6e60b..fae1f0c9c7 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/freescale/imx8mn_evk/spl.c
@@ -8,6 +8,7 @@ 
 #include <cpu_func.h>
 #include <hang.h>
 #include <image.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/mach-imx/iomux-v3.h>
diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c
index f004af681b..aa5100f5bf 100644
--- a/board/freescale/imx8mp_evk/imx8mp_evk.c
+++ b/board/freescale/imx8mp_evk/imx8mp_evk.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <errno.h>
+#include <init.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 79b504d409..e84e470ac2 100644
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/freescale/imx8mp_evk/spl.c
@@ -8,6 +8,7 @@ 
 #include <cpu_func.h>
 #include <hang.h>
 #include <image.h>
+#include <init.h>
 #include <spl.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 8b5b240edf..69ca7c37f5 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -8,6 +8,7 @@ 
 #include <common.h>
 #include <hang.h>
 #include <image.h>
+#include <init.h>
 #include <asm/io.h>
 #include <errno.h>
 #include <asm/io.h>
diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c
index c5c07089a2..38a981cf8b 100644
--- a/board/freescale/imx8qm_mek/spl.c
+++ b/board/freescale/imx8qm_mek/spl.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <image.h>
+#include <init.h>
 #include <spl.h>
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c
index 3cbbc9b84c..74c2ea2e6c 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/freescale/imx8qxp_mek/spl.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <image.h>
+#include <init.h>
 #include <spl.h>
 #include <dm/uclass.h>
 #include <dm/device.h>
diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk.c b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
index bda03b5ea5..b6a0d2567e 100644
--- a/board/freescale/imxrt1050-evk/imxrt1050-evk.c
+++ b/board/freescale/imxrt1050-evk/imxrt1050-evk.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <ram.h>
 #include <spl.h>
 #include <asm/io.h>
diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c
index 8260e7f797..f63377fdd6 100644
--- a/board/freescale/ls1012afrdm/ls1012afrdm.c
+++ b/board/freescale/ls1012afrdm/ls1012afrdm.c
@@ -7,6 +7,7 @@ 
 #include <fdt_support.h>
 #include <i2c.h>
 #include <asm/cache.h>
+#include <init.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 e41f7e41bb..24978314a1 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/freescale/ls1012aqds/ls1012aqds.c
@@ -7,6 +7,7 @@ 
 #include <i2c.h>
 #include <fdt_support.h>
 #include <asm/cache.h>
+#include <init.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 8633268ed7..fc929c441c 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/freescale/ls1012ardb/ls1012ardb.c
@@ -8,6 +8,7 @@ 
 #include <hang.h>
 #include <i2c.h>
 #include <asm/cache.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/freescale/ls1021aqds/ddr.c
index d3e2e53321..d854b51155 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/freescale/ls1021aqds/ddr.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include "ddr.h"
diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c
index feeae9b406..fd7815e128 100644
--- a/board/freescale/ls1028a/ls1028a.c
+++ b/board/freescale/ls1028a/ls1028a.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <malloc.h>
 #include <errno.h>
 #include <fsl_ddr.h>
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c
index 2d4b18cdbc..032207af8a 100644
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/freescale/ls1043aqds/ls1043aqds.c
@@ -8,6 +8,7 @@ 
 #include <i2c.h>
 #include <fdt_support.h>
 #include <fsl_ddr_sdram.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c
index 26a192957b..0b5f26515a 100644
--- a/board/freescale/ls1043ardb/ls1043ardb.c
+++ b/board/freescale/ls1043ardb/ls1043ardb.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <i2c.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c
index 71ace192e2..e815bf84fb 100644
--- a/board/freescale/ls1046afrwy/ls1046afrwy.c
+++ b/board/freescale/ls1046afrwy/ls1046afrwy.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <fdt_support.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c
index e6648e9d70..b77b2ed40e 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/freescale/ls1046aqds/ls1046aqds.c
@@ -8,6 +8,7 @@ 
 #include <i2c.h>
 #include <fdt_support.h>
 #include <fsl_ddr_sdram.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c
index 5308cb2e1c..27e213f796 100644
--- a/board/freescale/ls1046ardb/ls1046ardb.c
+++ b/board/freescale/ls1046ardb/ls1046ardb.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <fdt_support.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/fsl_serdes.h>
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c
index 225e787c75..1b10aa759b 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/freescale/ls1088a/ls1088a.c
@@ -5,6 +5,7 @@ 
 #include <common.h>
 #include <env.h>
 #include <i2c.h>
+#include <init.h>
 #include <malloc.h>
 #include <errno.h>
 #include <netdev.h>
diff --git a/board/freescale/ls2080a/ls2080a.c b/board/freescale/ls2080a/ls2080a.c
index f144bf6b37..95e99eabd7 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 <init.h>
 #include <malloc.h>
 #include <errno.h>
 #include <net.h>
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c
index 4034bdee28..5f95f3c301 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/freescale/ls2080aqds/ls2080aqds.c
@@ -4,6 +4,7 @@ 
  */
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <malloc.h>
 #include <errno.h>
 #include <netdev.h>
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c
index 5e2fc7cc98..b1fa3297a3 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/freescale/ls2080ardb/ls2080ardb.c
@@ -5,6 +5,7 @@ 
  */
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <malloc.h>
 #include <errno.h>
 #include <netdev.h>
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index 0d94107def..fba068c824 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/freescale/lx2160a/lx2160a.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <clock_legacy.h>
 #include <dm.h>
+#include <init.h>
 #include <dm/platform_data/serial_pl01x.h>
 #include <i2c.h>
 #include <malloc.h>
diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c
index 87368564af..3197421781 100644
--- a/board/freescale/m5253demo/flash.c
+++ b/board/freescale/m5253demo/flash.c
@@ -9,6 +9,7 @@ 
 
 #include <common.h>
 #include <flash.h>
+#include <init.h>
 #include <irq_func.h>
 
 #include <asm/immap.h>
diff --git a/board/freescale/m5282evb/m5282evb.c b/board/freescale/m5282evb/m5282evb.c
index 065e3e71f5..251be667d4 100644
--- a/board/freescale/m5282evb/m5282evb.c
+++ b/board/freescale/m5282evb/m5282evb.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/immap.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c
index c8e30a0947..5874e1a924 100644
--- a/board/freescale/mpc8313erdb/sdram.c
+++ b/board/freescale/mpc8313erdb/sdram.c
@@ -8,6 +8,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <mpc83xx.h>
 #include <spd_sdram.h>
 
diff --git a/board/freescale/mpc8315erdb/sdram.c b/board/freescale/mpc8315erdb/sdram.c
index 2f0f29a0e5..13bfc1e5f1 100644
--- a/board/freescale/mpc8315erdb/sdram.c
+++ b/board/freescale/mpc8315erdb/sdram.c
@@ -8,6 +8,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <mpc83xx.h>
 #include <spd_sdram.h>
 
diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c
index 0996b87c0f..5451437f37 100644
--- a/board/freescale/mpc8349emds/mpc8349emds.c
+++ b/board/freescale/mpc8349emds/mpc8349emds.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <fdt_support.h>
+#include <init.h>
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <asm/mpc8349_pci.h>
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c
index a2e284f1a2..5d78fea336 100644
--- a/board/freescale/mpc8349itx/mpc8349itx.c
+++ b/board/freescale/mpc8349itx/mpc8349itx.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <fdt_support.h>
+#include <init.h>
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <i2c.h>
diff --git a/board/freescale/mx23evk/mx23evk.c b/board/freescale/mx23evk/mx23evk.c
index 6f4d34b9ed..6cfff04966 100644
--- a/board/freescale/mx23evk/mx23evk.c
+++ b/board/freescale/mx23evk/mx23evk.c
@@ -12,6 +12,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
diff --git a/board/freescale/mx28evk/mx28evk.c b/board/freescale/mx28evk/mx28evk.c
index e5fa4ae765..4272bacf5e 100644
--- a/board/freescale/mx28evk/mx28evk.c
+++ b/board/freescale/mx28evk/mx28evk.c
@@ -12,6 +12,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/freescale/mx6memcal/mx6memcal.c b/board/freescale/mx6memcal/mx6memcal.c
index d01127eccc..ea7a56369d 100644
--- a/board/freescale/mx6memcal/mx6memcal.c
+++ b/board/freescale/mx6memcal/mx6memcal.c
@@ -8,6 +8,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/sys_proto.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c
index be551bc375..c11eee51b6 100644
--- a/board/freescale/mx6memcal/spl.c
+++ b/board/freescale/mx6memcal/spl.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.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 3866020a6d..5c08ecbb96 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index 38fc30553c..7dd00bda38 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -5,6 +5,7 @@ 
  * Author: Fabio Estevam <fabio.estevam at freescale.com>
  */
 
+#include <init.h>
 #include <net.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
index c939514a5f..1594285860 100644
--- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c
+++ b/board/freescale/mx7ulp_evk/mx7ulp_evk.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <fdt_support.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch/mx7ulp-pins.h>
diff --git a/board/freescale/p2041rdb/ddr.c b/board/freescale/p2041rdb/ddr.c
index 8bcd2fb5a7..a30a0738dc 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/freescale/p2041rdb/ddr.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t102xqds/ddr.c b/board/freescale/t102xqds/ddr.c
index 998a2a5d3f..c3a60d6087 100644
--- a/board/freescale/t102xqds/ddr.c
+++ b/board/freescale/t102xqds/ddr.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c
index 043f0b5b84..2ab6e62c5a 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/freescale/t102xrdb/ddr.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t1040qds/ddr.c b/board/freescale/t1040qds/ddr.c
index 2b1d768f1b..c9639e9170 100644
--- a/board/freescale/t1040qds/ddr.c
+++ b/board/freescale/t1040qds/ddr.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
index 2b1b28da88..ae365652c2 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/freescale/t104xrdb/ddr.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t208xqds/ddr.c b/board/freescale/t208xqds/ddr.c
index a2a56540b5..5a97a84948 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/freescale/t208xqds/ddr.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t208xrdb/ddr.c b/board/freescale/t208xrdb/ddr.c
index 0b16982f06..78316ffe84 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/freescale/t208xrdb/ddr.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t4qds/ddr.c b/board/freescale/t4qds/ddr.c
index 08656b4e30..5a6d0eb69b 100644
--- a/board/freescale/t4qds/ddr.c
+++ b/board/freescale/t4qds/ddr.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/freescale/t4rdb/ddr.c b/board/freescale/t4rdb/ddr.c
index 787de6d7ad..3b67186cc2 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/freescale/t4rdb/ddr.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index 1443ef91ef..2ef213ce0f 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index 80fec5f9cf..3ccd65271e 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <env.h>
 #include <hang.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/mx6-ddr.h>
diff --git a/board/google/gru/gru.c b/board/google/gru/gru.c
index b6b4f19d84..7dfbc3ac86 100644
--- a/board/google/gru/gru.c
+++ b/board/google/gru/gru.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 
 #ifdef CONFIG_SPL_BUILD
 /* provided to defeat compiler optimisation in board_init_f() */
diff --git a/board/google/veyron/veyron.c b/board/google/veyron/veyron.c
index 6b9c34818b..4a847edd89 100644
--- a/board/google/veyron/veyron.c
+++ b/board/google/veyron/veyron.c
@@ -6,6 +6,7 @@ 
 #include <clk.h>
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <asm/arch-rockchip/clock.h>
 #include <dt-bindings/clock/rk3288-cru.h>
 #include <linux/err.h>
diff --git a/board/gumstix/duovero/duovero.c b/board/gumstix/duovero/duovero.c
index cbb1cd0f8f..7b6fd5c737 100644
--- a/board/gumstix/duovero/duovero.c
+++ b/board/gumstix/duovero/duovero.c
@@ -5,6 +5,7 @@ 
  * Maintainer: Ash Charles  <ash at gumstix.com>
  */
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <netdev.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/gumstix/pepper/board.c b/board/gumstix/pepper/board.c
index 2a6a449306..ebb5a560c3 100644
--- a/board/gumstix/pepper/board.c
+++ b/board/gumstix/pepper/board.c
@@ -9,6 +9,7 @@ 
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <net.h>
 #include <serial.h>
 #include <spl.h>
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index ffde1161d0..063831dfe8 100644
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -8,6 +8,7 @@ 
 #include <cpu_func.h>
 #include <env.h>
 #include <fdt_support.h>
+#include <init.h>
 #include <net.h>
 #include <netdev.h>
 #include <scsi.h>
diff --git a/board/hisilicon/hikey/hikey.c b/board/hisilicon/hikey/hikey.c
index 84400090b3..2a50b8458a 100644
--- a/board/hisilicon/hikey/hikey.c
+++ b/board/hisilicon/hikey/hikey.c
@@ -7,6 +7,7 @@ 
 #include <cpu_func.h>
 #include <dm.h>
 #include <fdt_support.h>
+#include <init.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 0ed62c7d84..89a922fb82 100644
--- a/board/hisilicon/hikey960/hikey960.c
+++ b/board/hisilicon/hikey960/hikey960.c
@@ -9,6 +9,7 @@ 
 #include <dm.h>
 #include <errno.h>
 #include <asm/cache.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/hi3660.h>
 #include <asm/armv8/mmu.h>
diff --git a/board/imgtec/boston/checkboard.c b/board/imgtec/boston/checkboard.c
index 46ec1e8d9c..1b8a47d254 100644
--- a/board/imgtec/boston/checkboard.c
+++ b/board/imgtec/boston/checkboard.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 
 #include <asm/io.h>
 #include <asm/mipsregs.h>
diff --git a/board/imgtec/ci20/ci20.c b/board/imgtec/ci20/ci20.c
index 170ea12c93..66c64f8056 100644
--- a/board/imgtec/ci20/ci20.c
+++ b/board/imgtec/ci20/ci20.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <net.h>
 #include <netdev.h>
 #include <asm/io.h>
diff --git a/board/imgtec/xilfpga/xilfpga.c b/board/imgtec/xilfpga/xilfpga.c
index 86645155e6..0b68bbde50 100644
--- a/board/imgtec/xilfpga/xilfpga.c
+++ b/board/imgtec/xilfpga/xilfpga.c
@@ -9,6 +9,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/intel/cougarcanyon2/cougarcanyon2.c b/board/intel/cougarcanyon2/cougarcanyon2.c
index 7aadd9e477..ce11eae59d 100644
--- a/board/intel/cougarcanyon2/cougarcanyon2.c
+++ b/board/intel/cougarcanyon2/cougarcanyon2.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
 #include <pci.h>
 #include <smsc_sio1007.h>
 #include <asm/ibmpc.h>
diff --git a/board/intel/crownbay/crownbay.c b/board/intel/crownbay/crownbay.c
index 57dce4185d..55095deead 100644
--- a/board/intel/crownbay/crownbay.c
+++ b/board/intel/crownbay/crownbay.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/ibmpc.h>
 #include <asm/pnp_def.h>
 #include <smsc_lpc47m.h>
diff --git a/board/intel/minnowmax/minnowmax.c b/board/intel/minnowmax/minnowmax.c
index e5fc939793..e486f9d7d9 100644
--- a/board/intel/minnowmax/minnowmax.c
+++ b/board/intel/minnowmax/minnowmax.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <asm/gpio.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
diff --git a/board/iomega/iconnect/iconnect.c b/board/iomega/iconnect/iconnect.c
index fc7847bd1d..79c794bfc8 100644
--- a/board/iomega/iconnect/iconnect.c
+++ b/board/iomega/iconnect/iconnect.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
diff --git a/board/isee/igep00x0/igep00x0.c b/board/isee/igep00x0/igep00x0.c
index 0ad601f39b..887ec6a66b 100644
--- a/board/isee/igep00x0/igep00x0.c
+++ b/board/isee/igep00x0/igep00x0.c
@@ -5,6 +5,7 @@ 
  */
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <malloc.h>
 #include <net.h>
 #include <status_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 25a5e4b9ba..01c8691f31 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
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/keymile/kmp204x/ddr.c b/board/keymile/kmp204x/ddr.c
index ee2e3d6b9a..bea9451aec 100644
--- a/board/keymile/kmp204x/ddr.c
+++ b/board/keymile/kmp204x/ddr.c
@@ -9,6 +9,7 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <hwconfig.h>
+#include <init.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 c6117b33bc..7bc66af193 100644
--- a/board/kmc/kzm9g/kzm9g.c
+++ b/board/kmc/kzm9g/kzm9g.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <net.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c
index f8134b7042..97b152664a 100644
--- a/board/kobol/helios4/helios4.c
+++ b/board/kobol/helios4/helios4.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <i2c.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
diff --git a/board/lego/ev3/legoev3.c b/board/lego/ev3/legoev3.c
index fa099e95f5..51b669a891 100644
--- a/board/lego/ev3/legoev3.c
+++ b/board/lego/ev3/legoev3.c
@@ -14,6 +14,7 @@ 
 
 #include <common.h>
 #include <i2c.h>
+#include <init.h>
 #include <spi.h>
 #include <spi_flash.h>
 #include <asm/arch/hardware.h>
diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c
index b4205d6ed4..2825eccc03 100644
--- a/board/lg/sniper/sniper.c
+++ b/board/lg/sniper/sniper.c
@@ -9,6 +9,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <env.h>
+#include <init.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 a362d25c01..b979ddd296 100644
--- a/board/liebherr/display5/display5.c
+++ b/board/liebherr/display5/display5.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <fdt_support.h>
+#include <init.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 0f5eab79b5..fc3ebaf145 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -8,6 +8,7 @@ 
 #include <cpu_func.h>
 #include <env.h>
 #include <image.h>
+#include <init.h>
 #include <serial.h>
 #include <spl.h>
 #include <linux/libfdt.h>
diff --git a/board/liebherr/mccmon6/spl.c b/board/liebherr/mccmon6/spl.c
index 8ed8e03295..f40e814f86 100644
--- a/board/liebherr/mccmon6/spl.c
+++ b/board/liebherr/mccmon6/spl.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <image.h>
+#include <init.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 95c9064066..41fa21292e 100644
--- a/board/liebherr/xea/xea.c
+++ b/board/liebherr/xea/xea.c
@@ -15,6 +15,7 @@ 
 
 #include <common.h>
 #include <fdt_support.h>
+#include <init.h>
 #include <net.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c
index 6ed3a9b847..b25b02b641 100644
--- a/board/logicpd/am3517evm/am3517evm.c
+++ b/board/logicpd/am3517evm/am3517evm.c
@@ -12,6 +12,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <net.h>
 #include <ns16550.h>
 #include <serial.h>
diff --git a/board/logicpd/zoom1/zoom1.c b/board/logicpd/zoom1/zoom1.c
index 7438d37923..53dc9762f8 100644
--- a/board/logicpd/zoom1/zoom1.c
+++ b/board/logicpd/zoom1/zoom1.c
@@ -16,6 +16,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <env.h>
+#include <init.h>
 #include <net.h>
 #include <ns16550.h>
 #include <netdev.h>
diff --git a/board/maxbcm/maxbcm.c b/board/maxbcm/maxbcm.c
index 395904f8c8..3c6422214f 100644
--- a/board/maxbcm/maxbcm.c
+++ b/board/maxbcm/maxbcm.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/mediatek/mt7622/mt7622_rfb.c b/board/mediatek/mt7622/mt7622_rfb.c
index b9296bede2..912b993240 100644
--- a/board/mediatek/mt7622/mt7622_rfb.c
+++ b/board/mediatek/mt7622/mt7622_rfb.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <config.h>
+#include <init.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/mediatek/mt8518/mt8518_ap1.c b/board/mediatek/mt8518/mt8518_ap1.c
index 2ac7c6cd18..72284a2689 100644
--- a/board/mediatek/mt8518/mt8518_ap1.c
+++ b/board/mediatek/mt8518/mt8518_ap1.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/microchip/mpfs_icicle/mpfs_icicle.c b/board/microchip/mpfs_icicle/mpfs_icicle.c
index 0ef243186d..8381361ec3 100644
--- a/board/microchip/mpfs_icicle/mpfs_icicle.c
+++ b/board/microchip/mpfs_icicle/mpfs_icicle.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <asm/io.h>
 
 #define MPFS_SYSREG_SOFT_RESET	((unsigned int *)0x20002088)
diff --git a/board/microchip/pic32mzda/pic32mzda.c b/board/microchip/pic32mzda/pic32mzda.c
index aa8aab39ce..e7337deea7 100644
--- a/board/microchip/pic32mzda/pic32mzda.c
+++ b/board/microchip/pic32mzda/pic32mzda.c
@@ -10,6 +10,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <clk.h>
+#include <init.h>
 #include <malloc.h>
 #include <dt-bindings/clock/microchip,clock.h>
 #include <mach/pic32.h>
diff --git a/board/mikrotik/crs305-1g-4s/crs305-1g-4s.c b/board/mikrotik/crs305-1g-4s/crs305-1g-4s.c
index d1d1f40092..4b67a4ba2d 100644
--- a/board/mikrotik/crs305-1g-4s/crs305-1g-4s.c
+++ b/board/mikrotik/crs305-1g-4s/crs305-1g-4s.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <i2c.h>
+#include <init.h>
 #include <asm/gpio.h>
 #include <linux/mbus.h>
 #include <linux/io.h>
diff --git a/board/netgear/dgnd3700v2/dgnd3700v2.c b/board/netgear/dgnd3700v2/dgnd3700v2.c
index 6840a21001..d9c0200f24 100644
--- a/board/netgear/dgnd3700v2/dgnd3700v2.c
+++ b/board/netgear/dgnd3700v2/dgnd3700v2.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 
 #define GPIO_BASE_6362			0x10000080
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 71ca79deab..92b5c20b51 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -23,6 +23,7 @@ 
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <watchdog.h>
 #include <malloc.h>
 #include <twl4030.h>
diff --git a/board/novtech/meerkat96/meerkat96.c b/board/novtech/meerkat96/meerkat96.c
index 5fb4d43997..b13e7ce3b1 100644
--- a/board/novtech/meerkat96/meerkat96.c
+++ b/board/novtech/meerkat96/meerkat96.c
@@ -4,6 +4,7 @@ 
  * Copyright (C) 2016 NXP Semiconductors
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx7-pins.h>
diff --git a/board/olimex/mx23_olinuxino/mx23_olinuxino.c b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
index f1d7cb8c93..cfe33d3072 100644
--- a/board/olimex/mx23_olinuxino/mx23_olinuxino.c
+++ b/board/olimex/mx23_olinuxino/mx23_olinuxino.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/iomux-mx23.h>
diff --git a/board/overo/overo.c b/board/overo/overo.c
index f7da1a95ea..7a54719e87 100644
--- a/board/overo/overo.c
+++ b/board/overo/overo.c
@@ -14,6 +14,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <env.h>
+#include <init.h>
 #include <malloc.h>
 #include <net.h>
 #include <ns16550.h>
diff --git a/board/pandora/pandora.c b/board/pandora/pandora.c
index a9aae7951d..bb310d9e68 100644
--- a/board/pandora/pandora.c
+++ b/board/pandora/pandora.c
@@ -14,6 +14,7 @@ 
  */
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <ns16550.h>
 #include <twl4030.h>
 #include <asm/io.h>
diff --git a/board/phytec/pcl063/spl.c b/board/phytec/pcl063/spl.c
index b5e080c072..48cb2e267c 100644
--- a/board/phytec/pcl063/spl.c
+++ b/board/phytec/pcl063/spl.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
diff --git a/board/phytec/pcm051/board.c b/board/phytec/pcm051/board.c
index e561c82253..6f1ada82c4 100644
--- a/board/phytec/pcm051/board.c
+++ b/board/phytec/pcm051/board.c
@@ -11,6 +11,7 @@ 
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <net.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
diff --git a/board/phytium/durian/durian.c b/board/phytium/durian/durian.c
index 91d13bdea4..7dceebdeae 100644
--- a/board/phytium/durian/durian.c
+++ b/board/phytium/durian/durian.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <asm/armv8/mmu.h>
 #include <asm/cache.h>
 #include <asm/system.h>
diff --git a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c
index 3f60235771..d79084614f 100644
--- a/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c
+++ b/board/pine64/rockpro64_rk3399/rockpro64-rk3399.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/board/ppcag/bg0900/bg0900.c b/board/ppcag/bg0900/bg0900.c
index 00afff3abf..70870797bb 100644
--- a/board/ppcag/bg0900/bg0900.c
+++ b/board/ppcag/bg0900/bg0900.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/qca/ap121/ap121.c b/board/qca/ap121/ap121.c
index 24acdcb2e6..60a2e19143 100644
--- a/board/qca/ap121/ap121.c
+++ b/board/qca/ap121/ap121.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/board/qca/ap143/ap143.c b/board/qca/ap143/ap143.c
index 8ee26ababa..ac65054136 100644
--- a/board/qca/ap143/ap143.c
+++ b/board/qca/ap143/ap143.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/board/qca/ap152/ap152.c b/board/qca/ap152/ap152.c
index 30cd56563b..1064705d26 100644
--- a/board/qca/ap152/ap152.c
+++ b/board/qca/ap152/ap152.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/board/qemu-mips/qemu-mips.c b/board/qemu-mips/qemu-mips.c
index b3e0830843..cf22ed5627 100644
--- a/board/qemu-mips/qemu-mips.c
+++ b/board/qemu-mips/qemu-mips.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <command.h>
+#include <init.h>
 #include <net.h>
 #include <asm/mipsregs.h>
 #include <asm/io.h>
diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c
index 3134415d80..c1ade5ce43 100644
--- a/board/qualcomm/dragonboard820c/dragonboard820c.c
+++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <cpu_func.h>
+#include <init.h>
 #include <asm/arch/sysmap-apq8096.h>
 #include <env.h>
 #include <asm/cache.h>
diff --git a/board/raidsonic/ib62x0/ib62x0.c b/board/raidsonic/ib62x0/ib62x0.c
index e8aae4cb81..db1b0adc38 100644
--- a/board/raidsonic/ib62x0/ib62x0.c
+++ b/board/raidsonic/ib62x0/ib62x0.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/board/renesas/MigoR/migo_r.c b/board/renesas/MigoR/migo_r.c
index 3ffd9ad75d..f8bdb4d48a 100644
--- a/board/renesas/MigoR/migo_r.c
+++ b/board/renesas/MigoR/migo_r.c
@@ -10,6 +10,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <netdev.h>
 #include <asm/io.h>
diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c
index a6d7cb48a2..de487ff4b7 100644
--- a/board/renesas/alt/alt.c
+++ b/board/renesas/alt/alt.c
@@ -9,6 +9,7 @@ 
 #include <cpu_func.h>
 #include <env.h>
 #include <hang.h>
+#include <init.h>
 #include <malloc.h>
 #include <dm.h>
 #include <dm/platform_data/serial_sh.h>
diff --git a/board/renesas/alt/alt_spl.c b/board/renesas/alt/alt_spl.c
index dbb210584d..a9c289447e 100644
--- a/board/renesas/alt/alt_spl.c
+++ b/board/renesas/alt/alt_spl.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <malloc.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 892f7e7260..400c166b90 100644
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <net.h>
 #include <asm/arch/mmc.h>
 #include <asm/arch/rcar-mstp.h>
diff --git a/board/renesas/condor/condor.c b/board/renesas/condor/condor.c
index 6505beda81..91afcdd85a 100644
--- a/board/renesas/condor/condor.c
+++ b/board/renesas/condor/condor.c
@@ -9,6 +9,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <hang.h>
+#include <init.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 2f9364c484..5f37a19600 100644
--- a/board/renesas/draak/draak.c
+++ b/board/renesas/draak/draak.c
@@ -9,6 +9,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <hang.h>
+#include <init.h>
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
diff --git a/board/renesas/eagle/eagle.c b/board/renesas/eagle/eagle.c
index cf06a173e4..6228f22e01 100644
--- a/board/renesas/eagle/eagle.c
+++ b/board/renesas/eagle/eagle.c
@@ -9,6 +9,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <hang.h>
+#include <init.h>
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
diff --git a/board/renesas/ebisu/ebisu.c b/board/renesas/ebisu/ebisu.c
index 81d7f8eafa..d164a36361 100644
--- a/board/renesas/ebisu/ebisu.c
+++ b/board/renesas/ebisu/ebisu.c
@@ -9,6 +9,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <hang.h>
+#include <init.h>
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c
index eb6ee6f6a4..aec947ab5a 100644
--- a/board/renesas/gose/gose.c
+++ b/board/renesas/gose/gose.c
@@ -9,6 +9,7 @@ 
 #include <cpu_func.h>
 #include <env.h>
 #include <hang.h>
+#include <init.h>
 #include <malloc.h>
 #include <dm.h>
 #include <dm/platform_data/serial_sh.h>
diff --git a/board/renesas/gose/gose_spl.c b/board/renesas/gose/gose_spl.c
index 42a6758148..b1b2ceb607 100644
--- a/board/renesas/gose/gose_spl.c
+++ b/board/renesas/gose/gose_spl.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <malloc.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
diff --git a/board/renesas/grpeach/grpeach.c b/board/renesas/grpeach/grpeach.c
index ba904609ae..b92e01ca98 100644
--- a/board/renesas/grpeach/grpeach.c
+++ b/board/renesas/grpeach/grpeach.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.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 e09d3d0a63..67ac85d580 100644
--- a/board/renesas/koelsch/koelsch.c
+++ b/board/renesas/koelsch/koelsch.c
@@ -10,6 +10,7 @@ 
 #include <cpu_func.h>
 #include <env.h>
 #include <hang.h>
+#include <init.h>
 #include <malloc.h>
 #include <dm.h>
 #include <dm/platform_data/serial_sh.h>
diff --git a/board/renesas/koelsch/koelsch_spl.c b/board/renesas/koelsch/koelsch_spl.c
index b3530d7ce7..a321678e1b 100644
--- a/board/renesas/koelsch/koelsch_spl.c
+++ b/board/renesas/koelsch/koelsch_spl.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <malloc.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index 9ac9515925..1a5877bf15 100644
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -12,6 +12,7 @@ 
 #include <env.h>
 #include <env_internal.h>
 #include <hang.h>
+#include <init.h>
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
diff --git a/board/renesas/lager/lager_spl.c b/board/renesas/lager/lager_spl.c
index d7db361b12..ceaf164e78 100644
--- a/board/renesas/lager/lager_spl.c
+++ b/board/renesas/lager/lager_spl.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <malloc.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index 097710b479..acff2e3b39 100644
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -10,6 +10,7 @@ 
 #include <cpu_func.h>
 #include <env.h>
 #include <hang.h>
+#include <init.h>
 #include <malloc.h>
 #include <dm.h>
 #include <dm/platform_data/serial_sh.h>
diff --git a/board/renesas/porter/porter_spl.c b/board/renesas/porter/porter_spl.c
index 026220d9e2..5b1f03cf7d 100644
--- a/board/renesas/porter/porter_spl.c
+++ b/board/renesas/porter/porter_spl.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <malloc.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
index 5a6aa8255b..b9e8cb4ce7 100644
--- a/board/renesas/rcar-common/common.c
+++ b/board/renesas/rcar-common/common.c
@@ -9,6 +9,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.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 a3e2aebe77..2b21a29de1 100644
--- a/board/renesas/rcar-common/gen3-spl.c
+++ b/board/renesas/rcar-common/gen3-spl.c
@@ -8,6 +8,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <image.h>
+#include <init.h>
 #include <asm/io.h>
 #include <spl.h>
 
diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index ecf0dde4ef..ff0409be98 100644
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -10,6 +10,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <image.h>
+#include <init.h>
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
diff --git a/board/renesas/sh7763rdp/sh7763rdp.c b/board/renesas/sh7763rdp/sh7763rdp.c
index 9bc2c55986..73a53c1e5a 100644
--- a/board/renesas/sh7763rdp/sh7763rdp.c
+++ b/board/renesas/sh7763rdp/sh7763rdp.c
@@ -8,6 +8,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 
diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c
index e7cbd75776..db88f0ddb6 100644
--- a/board/renesas/silk/silk.c
+++ b/board/renesas/silk/silk.c
@@ -10,6 +10,7 @@ 
 #include <cpu_func.h>
 #include <env.h>
 #include <hang.h>
+#include <init.h>
 #include <malloc.h>
 #include <dm.h>
 #include <dm/platform_data/serial_sh.h>
diff --git a/board/renesas/silk/silk_spl.c b/board/renesas/silk/silk_spl.c
index a2c397f935..9859977c77 100644
--- a/board/renesas/silk/silk_spl.c
+++ b/board/renesas/silk/silk_spl.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <malloc.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c
index 0a0ff5ff76..594070a9bf 100644
--- a/board/renesas/stout/stout.c
+++ b/board/renesas/stout/stout.c
@@ -10,6 +10,7 @@ 
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
diff --git a/board/renesas/stout/stout_spl.c b/board/renesas/stout/stout_spl.c
index 8d01efce56..a10752de1c 100644
--- a/board/renesas/stout/stout_spl.c
+++ b/board/renesas/stout/stout_spl.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <malloc.h>
 #include <dm/platform_data/serial_sh.h>
 #include <asm/processor.h>
diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index 04ca49572f..ebb379a82a 100644
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <image.h>
+#include <init.h>
 #include <malloc.h>
 #include <netdev.h>
 #include <dm.h>
diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c
index b9049abcc7..7909ef5c18 100644
--- a/board/rockchip/evb_rk3399/evb-rk3399.c
+++ b/board/rockchip/evb_rk3399/evb-rk3399.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <asm/arch-rockchip/periph.h>
 #include <power/regulator.h>
 
diff --git a/board/rockchip/evb_rv1108/evb_rv1108.c b/board/rockchip/evb_rv1108/evb_rv1108.c
index 5d622c3737..c57913828d 100644
--- a/board/rockchip/evb_rv1108/evb_rv1108.c
+++ b/board/rockchip/evb_rv1108/evb_rv1108.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/clock.h>
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 623e4abc21..a900ad1476 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/gpio.h>
 #include <asm/arch/mmc.h>
 #include <dm.h>
diff --git a/board/sandisk/sansa_fuze_plus/sfp.c b/board/sandisk/sansa_fuze_plus/sfp.c
index c2c9b9c7e7..ae965a80a5 100644
--- a/board/sandisk/sansa_fuze_plus/sfp.c
+++ b/board/sandisk/sansa_fuze_plus/sfp.c
@@ -11,6 +11,7 @@ 
 
 #include <common.h>
 #include <errno.h>
+#include <init.h>
 #include <net.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/sbc8349/sbc8349.c b/board/sbc8349/sbc8349.c
index 9051392cd0..2c05ebb1bd 100644
--- a/board/sbc8349/sbc8349.c
+++ b/board/sbc8349/sbc8349.c
@@ -9,6 +9,7 @@ 
 
 #include <common.h>
 #include <fdt_support.h>
+#include <init.h>
 #include <ioports.h>
 #include <mpc83xx.h>
 #include <asm/mpc8349_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 422f25c2e9..d2c5f807ad 100644
--- a/board/schulercontrol/sc_sps_1/sc_sps_1.c
+++ b/board/schulercontrol/sc_sps_1/sc_sps_1.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/seeed/linkit-smart-7688/board.c b/board/seeed/linkit-smart-7688/board.c
index d3d3d50c2c..492530ec4e 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 <init.h>
 #include <asm/io.h>
 
 #define MT76XX_GPIO1_MODE	0x10000060
diff --git a/board/siemens/capricorn/board.c b/board/siemens/capricorn/board.c
index 00fd4b9658..b4eae7f027 100644
--- a/board/siemens/capricorn/board.c
+++ b/board/siemens/capricorn/board.c
@@ -8,6 +8,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
 #include <netdev.h>
 #include <env_internal.h>
 #include <fsl_esdhc_imx.h>
diff --git a/board/siemens/capricorn/spl.c b/board/siemens/capricorn/spl.c
index 47fe86ccc0..8435bd3863 100644
--- a/board/siemens/capricorn/spl.c
+++ b/board/siemens/capricorn/spl.c
@@ -6,6 +6,7 @@ 
  *
  */
 #include <common.h>
+#include <init.h>
 #include <spl.h>
 #include <dm.h>
 #include <dm/uclass.h>
diff --git a/board/siemens/common/board.c b/board/siemens/common/board.c
index 24429d2837..f1bca4b27f 100644
--- a/board/siemens/common/board.c
+++ b/board/siemens/common/board.c
@@ -12,6 +12,7 @@ 
 #include <common.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <malloc.h>
 #include <serial.h>
 #include <spl.h>
diff --git a/board/sifive/fu540/fu540.c b/board/sifive/fu540/fu540.c
index 47a2090251..e9d1cf9a4b 100644
--- a/board/sifive/fu540/fu540.c
+++ b/board/sifive/fu540/fu540.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 
diff --git a/board/silica/pengwyn/board.c b/board/silica/pengwyn/board.c
index 08eafefb91..e3c9d9e755 100644
--- a/board/silica/pengwyn/board.c
+++ b/board/silica/pengwyn/board.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <net.h>
 #include <serial.h>
 #include <asm/arch/cpu.h>
diff --git a/board/sks-kinkel/sksimx6/sksimx6.c b/board/sks-kinkel/sksimx6/sksimx6.c
index 48e7ff2479..e5f6e90e0c 100644
--- a/board/sks-kinkel/sksimx6/sksimx6.c
+++ b/board/sks-kinkel/sksimx6/sksimx6.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 84644a85c7..c51f3e4f92 100644
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -13,6 +13,7 @@ 
 #include <common.h>
 #include <clock_legacy.h>
 #include <env.h>
+#include <init.h>
 #include <pci.h>
 #include <uuid.h>
 #include <asm/processor.h>
diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c
index 490ca9bc34..b8391a35c0 100644
--- a/board/solidrun/clearfog/clearfog.c
+++ b/board/solidrun/clearfog/clearfog.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <i2c.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <netdev.h>
diff --git a/board/sr1500/socfpga.c b/board/sr1500/socfpga.c
index c9e32e3960..83663c7e4d 100644
--- a/board/sr1500/socfpga.c
+++ b/board/sr1500/socfpga.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/st/stih410-b2260/board.c b/board/st/stih410-b2260/board.c
index 35bf497156..b1147f2e1a 100644
--- a/board/st/stih410-b2260/board.c
+++ b/board/st/stih410-b2260/board.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <asm/cache.h>
 #include <linux/usb/otg.h>
 #include <dwc3-sti-glue.h>
diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c
index 500dc5fe3a..5b0744ff6b 100644
--- a/board/st/stm32f429-discovery/stm32f429-discovery.c
+++ b/board/st/stm32f429-discovery/stm32f429-discovery.c
@@ -12,6 +12,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.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 8ab2fa5d59..1570d110bf 100644
--- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c
+++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.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 70d23d90f4..d9bcb39bea 100644
--- a/board/st/stm32f469-discovery/stm32f469-discovery.c
+++ b/board/st/stm32f469-discovery/stm32f469-discovery.c
@@ -6,6 +6,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 
 #include <asm/io.h>
 #include <asm/arch/stm32.h>
diff --git a/board/st/stv0991/stv0991.c b/board/st/stv0991/stv0991.c
index fbcb87092b..d5a9f1386e 100644
--- a/board/st/stv0991/stv0991.c
+++ b/board/st/stv0991/stv0991.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <bootstage.h>
 #include <dm.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <asm/arch/stv0991_periph.h>
diff --git a/board/ste/stemmy/stemmy.c b/board/ste/stemmy/stemmy.c
index 8cf6f18755..f7834c08fc 100644
--- a/board/ste/stemmy/stemmy.c
+++ b/board/ste/stemmy/stemmy.c
@@ -3,6 +3,7 @@ 
  * Copyright (C) 2019 Stephan Gerhold <stephan at gerhold.net>
  */
 #include <common.h>
+#include <init.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/sunxi/dram_sun4i_auto.c b/board/sunxi/dram_sun4i_auto.c
index 7d4409b51e..e8bbee4ee5 100644
--- a/board/sunxi/dram_sun4i_auto.c
+++ b/board/sunxi/dram_sun4i_auto.c
@@ -1,4 +1,5 @@ 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/dram.h>
 
 static struct dram_para dram_para = {
diff --git a/board/sunxi/dram_sun5i_auto.c b/board/sunxi/dram_sun5i_auto.c
index e3fa243267..a5f4f8b743 100644
--- a/board/sunxi/dram_sun5i_auto.c
+++ b/board/sunxi/dram_sun5i_auto.c
@@ -1,6 +1,7 @@ 
 /* DRAM parameters for auto dram configuration on sun5i and sun7i */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/dram.h>
 
 static struct dram_para dram_para = {
diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c
index 4bd88f85a6..b4a1d4c5df 100644
--- a/board/synopsys/axs10x/axs10x.c
+++ b/board/synopsys/axs10x/axs10x.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <dwmmc.h>
+#include <init.h>
 #include <malloc.h>
 #include <asm/arcregs.h>
 #include "axs10x.h"
diff --git a/board/synopsys/emsdp/emsdp.c b/board/synopsys/emsdp/emsdp.c
index c09ed8cff8..d98e606426 100644
--- a/board/synopsys/emsdp/emsdp.c
+++ b/board/synopsys/emsdp/emsdp.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <dwmmc.h>
+#include <init.h>
 #include <malloc.h>
 
 #include <asm/arcregs.h>
diff --git a/board/synopsys/iot_devkit/iot_devkit.c b/board/synopsys/iot_devkit/iot_devkit.c
index 36aa8f6ae5..05b63e415b 100644
--- a/board/synopsys/iot_devkit/iot_devkit.c
+++ b/board/synopsys/iot_devkit/iot_devkit.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <malloc.h>
 #include <dwmmc.h>
 #include <linux/libfdt.h>
diff --git a/board/synopsys/nsim/nsim.c b/board/synopsys/nsim/nsim.c
index f384f707f6..00e5cc3641 100644
--- a/board/synopsys/nsim/nsim.c
+++ b/board/synopsys/nsim/nsim.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <dm/device.h>
 #include <virtio_types.h>
 #include <virtio.h>
diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c
index b4fd183394..d32517f998 100644
--- a/board/tbs/tbs2910/tbs2910.c
+++ b/board/tbs/tbs2910/tbs2910.c
@@ -3,6 +3,7 @@ 
  * Copyright (C) 2014 Soeren Moch <smoch at web.de>
  */
 
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/technexion/pico-imx6/pico-imx6.c b/board/technexion/pico-imx6/pico-imx6.c
index 146bbc26d6..eac30368f7 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 at gmail.com>
  */
 
+#include <init.h>
 #include <net.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/technexion/pico-imx6/spl.c b/board/technexion/pico-imx6/spl.c
index 983f98beec..fe3c584662 100644
--- a/board/technexion/pico-imx6/spl.c
+++ b/board/technexion/pico-imx6/spl.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <image.h>
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-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 4294f3ed54..e4ca83a5ff 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -5,6 +5,7 @@ 
  * Author: Richard Hu <richard.hu at technexion.com>
  */
 
+#include <init.h>
 #include <net.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/iomux.h>
diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c
index 69db77412c..a651a00c1a 100644
--- a/board/technexion/pico-imx7d/spl.c
+++ b/board/technexion/pico-imx7d/spl.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <cpu_func.h>
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/technexion/tao3530/tao3530.c b/board/technexion/tao3530/tao3530.c
index b604ee951b..8ce3637731 100644
--- a/board/technexion/tao3530/tao3530.c
+++ b/board/technexion/tao3530/tao3530.c
@@ -5,6 +5,7 @@ 
  */
 #include <common.h>
 #include <bootstage.h>
+#include <init.h>
 #include <malloc.h>
 #include <netdev.h>
 #include <twl4030.h>
diff --git a/board/technologic/ts4600/ts4600.c b/board/technologic/ts4600/ts4600.c
index f9cc2e8f10..2a63e84ec3 100644
--- a/board/technologic/ts4600/ts4600.c
+++ b/board/technologic/ts4600/ts4600.c
@@ -14,6 +14,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
index 7ff4766947..7e7effe56e 100644
--- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
+++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <env.h>
+#include <init.h>
 #include <misc.h>
 #include <spl.h>
 #include <syscon.h>
diff --git a/board/ti/am3517crane/am3517crane.c b/board/ti/am3517crane/am3517crane.c
index 5d4e57ffc5..888aa5b9ca 100644
--- a/board/ti/am3517crane/am3517crane.c
+++ b/board/ti/am3517crane/am3517crane.c
@@ -10,6 +10,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mem.h>
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 439b023da8..9139ad87d4 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -16,6 +16,7 @@ 
 #include <bootstage.h>
 #include <dm.h>
 #include <env.h>
+#include <init.h>
 #include <net.h>
 #include <ns16550.h>
 #include <serial.h>
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index 7161c934cd..d6d21bae1f 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -13,6 +13,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <env.h>
+#include <init.h>
 #include <net.h>
 #include <ns16550.h>
 #include <netdev.h>
diff --git a/board/ti/ks2_evm/board_k2e.c b/board/ti/ks2_evm/board_k2e.c
index 350cc68e49..39abb24e15 100644
--- a/board/ti/ks2_evm/board_k2e.c
+++ b/board/ti/ks2_evm/board_k2e.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <image.h>
+#include <init.h>
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
diff --git a/board/ti/ks2_evm/board_k2hk.c b/board/ti/ks2_evm/board_k2hk.c
index 1eb6cd761e..12c4649c3c 100644
--- a/board/ti/ks2_evm/board_k2hk.c
+++ b/board/ti/ks2_evm/board_k2hk.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <image.h>
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
diff --git a/board/ti/ks2_evm/board_k2l.c b/board/ti/ks2_evm/board_k2l.c
index 5ff11ee0d6..f759ee3646 100644
--- a/board/ti/ks2_evm/board_k2l.c
+++ b/board/ti/ks2_evm/board_k2l.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <image.h>
+#include <init.h>
 #include <asm/arch/ddr3.h>
 #include <asm/arch/hardware.h>
 #include <asm/ti-common/keystone_net.h>
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index 0d19ad018a..fab48a70ef 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -6,6 +6,7 @@ 
  * Steve Sakoman  <steve at sakoman.com>
  */
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <palmas.h>
 #include <asm/arch/omap.h>
diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
index b1e51bc431..c9413af350 100644
--- a/board/ti/panda/panda.c
+++ b/board/ti/panda/panda.c
@@ -5,6 +5,7 @@ 
  * Steve Sakoman  <steve at sakoman.com>
  */
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <asm/mach-types.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c
index 97da5ccf0d..a5b3504045 100644
--- a/board/ti/sdp4430/sdp.c
+++ b/board/ti/sdp4430/sdp.c
@@ -6,6 +6,7 @@ 
  * Steve Sakoman  <steve at sakoman.com>
  */
 #include <common.h>
+#include <init.h>
 #include <net.h>
 #include <twl6030.h>
 #include <asm/arch/sys_proto.h>
diff --git a/board/ti/ti814x/evm.c b/board/ti/ti814x/evm.c
index 7f82e71228..8ed80d2f46 100644
--- a/board/ti/ti814x/evm.c
+++ b/board/ti/ti814x/evm.c
@@ -11,6 +11,7 @@ 
 #include <cpsw.h>
 #include <env.h>
 #include <errno.h>
+#include <init.h>
 #include <net.h>
 #include <spl.h>
 #include <asm/arch/cpu.h>
diff --git a/board/ti/ti816x/evm.c b/board/ti/ti816x/evm.c
index e895a216fe..590c15676a 100644
--- a/board/ti/ti816x/evm.c
+++ b/board/ti/ti816x/evm.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <net.h>
 #include <spl.h>
 #include <asm/cache.h>
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index b037d725c3..cbb219931d 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -18,6 +18,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <env.h>
+#include <init.h>
 #include <malloc.h>
 #include <ns16550.h>
 #include <twl4030.h>
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c
index bc98858ae0..81329a6131 100644
--- a/board/toradex/apalis-tk1/apalis-tk1.c
+++ b/board/toradex/apalis-tk1/apalis-tk1.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <asm/arch-tegra/ap.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
diff --git a/board/toradex/apalis_t30/apalis_t30.c b/board/toradex/apalis_t30/apalis_t30.c
index df9bc8e707..b750d66aae 100644
--- a/board/toradex/apalis_t30/apalis_t30.c
+++ b/board/toradex/apalis_t30/apalis_t30.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/gp_padctrl.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/ap.h>
diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c
index 93693712a9..d9b09ae461 100644
--- a/board/toradex/colibri_pxa270/colibri_pxa270.c
+++ b/board/toradex/colibri_pxa270/colibri_pxa270.c
@@ -9,6 +9,7 @@ 
 #include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
+#include <init.h>
 #include <net.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/pxa.h>
diff --git a/board/toradex/colibri_t20/colibri_t20.c b/board/toradex/colibri_t20/colibri_t20.c
index e0b27e92f8..6cecbe5e28 100644
--- a/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.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 b6b00e3860..d21ff544f4 100644
--- a/board/toradex/colibri_t30/colibri_t30.c
+++ b/board/toradex/colibri_t30/colibri_t30.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/gp_padctrl.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch-tegra/ap.h>
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index e9441a7979..e8de923f3e 100644
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <env.h>
 #include <g_dnl.h>
+#include <init.h>
 #include <linux/libfdt.h>
 
 #include "tdx-cfg-block.h"
diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c
index c614fc7a3f..338952ea71 100644
--- a/board/toradex/verdin-imx8mm/spl.c
+++ b/board/toradex/verdin-imx8mm/spl.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <image.h>
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/ddr.h>
 #include <asm/arch/imx8mm_pins.h>
diff --git a/board/toradex/verdin-imx8mm/verdin-imx8mm.c b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
index 35866e096a..ff05c7d552 100644
--- a/board/toradex/verdin-imx8mm/verdin-imx8mm.c
+++ b/board/toradex/verdin-imx8mm/verdin-imx8mm.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/io.h>
diff --git a/board/tplink/wdr4300/wdr4300.c b/board/tplink/wdr4300/wdr4300.c
index 4dacaa4285..7e7339553b 100644
--- a/board/tplink/wdr4300/wdr4300.c
+++ b/board/tplink/wdr4300/wdr4300.c
@@ -4,6 +4,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/addrspace.h>
 #include <asm/types.h>
diff --git a/board/udoo/udoo_spl.c b/board/udoo/udoo_spl.c
index 1a3b136529..09fc23a901 100644
--- a/board/udoo/udoo_spl.c
+++ b/board/udoo/udoo_spl.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <init.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 0f00506d7a..a4f449d2e2 100644
--- a/board/variscite/dart_6ul/dart_6ul.c
+++ b/board/variscite/dart_6ul/dart_6ul.c
@@ -4,6 +4,7 @@ 
  * Copyright (C) 2019 Parthiban Nallathambi <parthitce at gmail.com>
  */
 
+#include <init.h>
 #include <net.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/crm_regs.h>
diff --git a/board/variscite/dart_6ul/spl.c b/board/variscite/dart_6ul/spl.c
index 798523d0d0..1b06a66060 100644
--- a/board/variscite/dart_6ul/spl.c
+++ b/board/variscite/dart_6ul/spl.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <spl.h>
 #include <asm/arch/clock.h>
 #include <asm/io.h>
diff --git a/board/varisys/cyrus/ddr.c b/board/varisys/cyrus/ddr.c
index cac00e0467..54d15accbd 100644
--- a/board/varisys/cyrus/ddr.c
+++ b/board/varisys/cyrus/ddr.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <hwconfig.h>
+#include <init.h>
 #include <asm/mmu.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr_dimm_params.h>
diff --git a/board/wandboard/spl.c b/board/wandboard/spl.c
index 250043a26d..816b9cb6fc 100644
--- a/board/wandboard/spl.c
+++ b/board/wandboard/spl.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux.h>
diff --git a/board/xes/common/board.c b/board/xes/common/board.c
index 43575bc302..053b07a0b7 100644
--- a/board/xes/common/board.c
+++ b/board/xes/common/board.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <env.h>
 #include "fsl_8xxx_misc.h"
+#include <init.h>
 
 int checkboard(void)
 {
diff --git a/board/xilinx/zynqmp_r5/board.c b/board/xilinx/zynqmp_r5/board.c
index 1c45ee7196..5c5a2e9386 100644
--- a/board/xilinx/zynqmp_r5/board.c
+++ b/board/xilinx/zynqmp_r5/board.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <fdtdec.h>
+#include <init.h>
 
 int board_init(void)
 {
diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c
index 82a3feee69..3f71e3da44 100644
--- a/board/zyxel/nsa310s/nsa310s.c
+++ b/board/zyxel/nsa310s/nsa310s.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <miiphy.h>
 #include <net.h>
 #include <asm/arch/cpu.h>
diff --git a/cmd/pci.c b/cmd/pci.c
index 0043471fc7..b2174e2a9c 100644
--- a/cmd/pci.c
+++ b/cmd/pci.c
@@ -18,6 +18,7 @@ 
 #include <command.h>
 #include <console.h>
 #include <dm.h>
+#include <init.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <pci.h>
diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c
index 8b768f3108..b5f293ba7f 100644
--- a/cmd/tlv_eeprom.c
+++ b/cmd/tlv_eeprom.c
@@ -15,6 +15,7 @@ 
 #include <i2c.h>
 #include <i2c_eeprom.h>
 #include <env.h>
+#include <init.h>
 #include <net.h>
 #include <linux/ctype.h>
 #include <u-boot/crc.h>
diff --git a/common/board_info.c b/common/board_info.c
index a392bece62..a6db087f96 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 <init.h>
 #include <linux/libfdt.h>
 #include <linux/compiler.h>
 
diff --git a/common/init/board_init.c b/common/init/board_init.c
index 4c4f0ced53..8c8a5eac05 100644
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -8,6 +8,7 @@ 
 
 #include <common.h>
 #include <bootstage.h>
+#include <init.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/common/lcd.c b/common/lcd.c
index c421090c87..4acf91e623 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -13,6 +13,7 @@ 
 #include <cpu_func.h>
 #include <env_callback.h>
 #include <asm/cache.h>
+#include <init.h>
 #include <linux/types.h>
 #include <stdio_dev.h>
 #include <lcd.h>
diff --git a/common/spl/spl.c b/common/spl/spl.c
index ab62b8b79e..c59808b924 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -13,6 +13,7 @@ 
 #include <dm.h>
 #include <handoff.h>
 #include <hang.h>
+#include <init.h>
 #include <irq_func.h>
 #include <serial.h>
 #include <spl.h>
diff --git a/drivers/clk/clk_stm32mp1.c b/drivers/clk/clk_stm32mp1.c
index 50df8425bf..a70388b750 100644
--- a/drivers/clk/clk_stm32mp1.c
+++ b/drivers/clk/clk_stm32mp1.c
@@ -7,6 +7,7 @@ 
 #include <clk-uclass.h>
 #include <div64.h>
 #include <dm.h>
+#include <init.h>
 #include <regmap.h>
 #include <spl.h>
 #include <syscon.h>
diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c
index fc047473f5..613c836049 100644
--- a/drivers/cpu/bmips_cpu.c
+++ b/drivers/cpu/bmips_cpu.c
@@ -11,6 +11,7 @@ 
 #include <cpu.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
 #include <asm/io.h>
 
 #define REV_CHIPID_SHIFT		16
diff --git a/drivers/ddr/altera/sdram_arria10.c b/drivers/ddr/altera/sdram_arria10.c
index 049f202e03..d1dec58295 100644
--- a/drivers/ddr/altera/sdram_arria10.c
+++ b/drivers/ddr/altera/sdram_arria10.c
@@ -7,6 +7,7 @@ 
 #include <cpu_func.h>
 #include <errno.h>
 #include <fdtdec.h>
+#include <init.h>
 #include <malloc.h>
 #include <wait_bit.h>
 #include <watchdog.h>
diff --git a/drivers/ddr/altera/sdram_soc64.c b/drivers/ddr/altera/sdram_soc64.c
index c06fba92f8..1a69b0328a 100644
--- a/drivers/ddr/altera/sdram_soc64.c
+++ b/drivers/ddr/altera/sdram_soc64.c
@@ -11,6 +11,7 @@ 
 #include <div64.h>
 #include <fdtdec.h>
 #include <hang.h>
+#include <init.h>
 #include <ram.h>
 #include <reset.h>
 #include "sdram_soc64.h"
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index 0aa6aedae7..794ff55378 100644
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -14,6 +14,7 @@ 
 #include <i2c.h>
 #include <fsl_ddr_sdram.h>
 #include <fsl_ddr.h>
+#include <init.h>
 
 /*
  * CONFIG_SYS_FSL_DDR_SDRAM_BASE_PHY is the physical address from the view
diff --git a/drivers/dma/lpc32xx_dma.c b/drivers/dma/lpc32xx_dma.c
index d3ce141eef..1637e329df 100644
--- a/drivers/dma/lpc32xx_dma.c
+++ b/drivers/dma/lpc32xx_dma.c
@@ -9,6 +9,7 @@ 
 
 #include <common.h>
 #include <errno.h>
+#include <init.h>
 #include <asm/arch/dma.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c
index 0917871d49..f7e5556805 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 <init.h>
 #include <xilinx.h>             /* xilinx specific definitions */
 #include <altera.h>             /* altera specific definitions */
 #include <lattice.h>
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index 036cf0b4a1..16cdfe3978 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -23,6 +23,7 @@ 
 #include <errno.h>
 #include <fdt_support.h>
 #include <flash.h>
+#include <init.h>
 #include <irq_func.h>
 #include <asm/processor.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/pic32_flash.c b/drivers/mtd/pic32_flash.c
index 8fff818e42..1766ba4802 100644
--- a/drivers/mtd/pic32_flash.c
+++ b/drivers/mtd/pic32_flash.c
@@ -10,6 +10,7 @@ 
 #include <dm.h>
 #include <fdt_support.h>
 #include <flash.h>
+#include <init.h>
 #include <irq_func.h>
 #include <mach/pic32.h>
 #include <wait_bit.h>
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index ab5e49941f..c4eeb9b67c 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <env.h>
+#include <init.h>
 #include <malloc.h>
 #include <asm/fsl_serdes.h>
 
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 7f46e901fb..93cfc1cade 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
 #include <malloc.h>
 #include <pci.h>
 #include <asm/io.h>
diff --git a/drivers/pci/pci_ftpci100.c b/drivers/pci/pci_ftpci100.c
index 736befdc3b..f5eb702723 100644
--- a/drivers/pci/pci_ftpci100.c
+++ b/drivers/pci/pci_ftpci100.c
@@ -7,6 +7,7 @@ 
  * Macpaul Lin, Andes Technology Corporation <macpaul at andestech.com>
  */
 #include <common.h>
+#include <init.h>
 #include <malloc.h>
 #include <pci.h>
 
diff --git a/drivers/pci/pci_gt64120.c b/drivers/pci/pci_gt64120.c
index 55f4800781..62f213d122 100644
--- a/drivers/pci/pci_gt64120.c
+++ b/drivers/pci/pci_gt64120.c
@@ -10,6 +10,7 @@ 
 
 #include <common.h>
 #include <gt64120.h>
+#include <init.h>
 #include <pci.h>
 #include <pci_gt64120.h>
 
diff --git a/drivers/pci/pci_msc01.c b/drivers/pci/pci_msc01.c
index 504eb65c27..04838200a8 100644
--- a/drivers/pci/pci_msc01.c
+++ b/drivers/pci/pci_msc01.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <msc01.h>
 #include <pci.h>
 #include <pci_msc01.h>
diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c
index ec6acbb138..0d6750beb7 100644
--- a/drivers/pci/pcie_layerscape_fixup.c
+++ b/drivers/pci/pcie_layerscape_fixup.c
@@ -6,6 +6,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <pci.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/io.h>
diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c
index b010a6300c..c11c691b86 100644
--- a/drivers/pci/pcie_layerscape_fixup_common.c
+++ b/drivers/pci/pcie_layerscape_fixup_common.c
@@ -8,6 +8,7 @@ 
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/soc.h>
 #include "pcie_layerscape_fixup_common.h"
diff --git a/drivers/ram/imxrt_sdram.c b/drivers/ram/imxrt_sdram.c
index ac15e94f00..6e20432f31 100644
--- a/drivers/ram/imxrt_sdram.c
+++ b/drivers/ram/imxrt_sdram.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <init.h>
 #include <ram.h>
 #include <asm/io.h>
 #include <linux/err.h>
diff --git a/drivers/ram/rockchip/sdram_px30.c b/drivers/ram/rockchip/sdram_px30.c
index 729255493a..ac7d96540f 100644
--- a/drivers/ram/rockchip/sdram_px30.c
+++ b/drivers/ram/rockchip/sdram_px30.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <debug_uart.h>
 #include <dm.h>
+#include <init.h>
 #include <ram.h>
 #include <syscon.h>
 #include <asm/io.h>
diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
index 9b5eb38ecc..4f3ed739fb 100644
--- a/drivers/ram/rockchip/sdram_rk3188.c
+++ b/drivers/ram/rockchip/sdram_rk3188.c
@@ -12,6 +12,7 @@ 
 #include <dt-structs.h>
 #include <errno.h>
 #include <hang.h>
+#include <init.h>
 #include <ram.h>
 #include <regmap.h>
 #include <syscon.h>
diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c
index 223f048161..0b11b48697 100644
--- a/drivers/ram/rockchip/sdram_rk322x.c
+++ b/drivers/ram/rockchip/sdram_rk322x.c
@@ -7,6 +7,7 @@ 
 #include <dm.h>
 #include <dt-structs.h>
 #include <errno.h>
+#include <init.h>
 #include <ram.h>
 #include <regmap.h>
 #include <syscon.h>
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 9f6f555147..23fd7956a7 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -12,6 +12,7 @@ 
 #include <dt-structs.h>
 #include <errno.h>
 #include <hang.h>
+#include <init.h>
 #include <ram.h>
 #include <regmap.h>
 #include <syscon.h>
diff --git a/drivers/ram/rockchip/sdram_rk3328.c b/drivers/ram/rockchip/sdram_rk3328.c
index 8329f4a352..36e0d2e840 100644
--- a/drivers/ram/rockchip/sdram_rk3328.c
+++ b/drivers/ram/rockchip/sdram_rk3328.c
@@ -7,6 +7,7 @@ 
 #include <debug_uart.h>
 #include <dm.h>
 #include <dt-structs.h>
+#include <init.h>
 #include <ram.h>
 #include <regmap.h>
 #include <syscon.h>
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index d69ef01d08..7b95c954a6 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -9,6 +9,7 @@ 
 #include <clk.h>
 #include <dm.h>
 #include <dt-structs.h>
+#include <init.h>
 #include <ram.h>
 #include <regmap.h>
 #include <syscon.h>
diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index 2d03333b1b..2e06b526e2 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <clk.h>
 #include <dm.h>
+#include <init.h>
 #include <ram.h>
 #include <asm/io.h>
 #include <dm/device_compat.h>
diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c
index 4837b0645b..f4942a5500 100644
--- a/drivers/timer/cadence-ttc.c
+++ b/drivers/timer/cadence-ttc.c
@@ -7,6 +7,7 @@ 
 #include <bootstage.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
 #include <timer.h>
 #include <asm/io.h>
 #include <linux/err.h>
diff --git a/drivers/timer/rockchip_timer.c b/drivers/timer/rockchip_timer.c
index 0cbdc279a5..7534e0363e 100644
--- a/drivers/timer/rockchip_timer.c
+++ b/drivers/timer/rockchip_timer.c
@@ -6,6 +6,7 @@ 
 #include <common.h>
 #include <bootstage.h>
 #include <dm.h>
+#include <init.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 b619200f00..14dde950a1 100644
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -5,6 +5,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
 #include <dm/root.h>
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index ee646fdd5c..dea17b9209 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -18,6 +18,7 @@ 
 #include <errno.h>
 #include <common.h>
 #include <console.h>
+#include <init.h>
 #include <malloc.h>
 #include <memalign.h>
 #include <version.h>
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 04e7c5e37f..450caf056c 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -7,6 +7,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
 #include <pci.h>
 #include <usb.h>
 #include <asm/io.h>
diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c
index 34a4b00dda..8ddced3d10 100644
--- a/drivers/usb/host/ohci-lpc32xx.c
+++ b/drivers/usb/host/ohci-lpc32xx.c
@@ -10,6 +10,7 @@ 
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
 #include <wait_bit.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index c1f60da541..b095612ada 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -7,6 +7,7 @@ 
 
 #include <common.h>
 #include <dm.h>
+#include <init.h>
 #include <pci.h>
 #include <usb.h>
 #include <usb/xhci.h>
diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
index 8148055f67..1389268b5f 100644
--- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c
@@ -59,6 +59,7 @@ 
  */
 
 #ifndef __UBOOT__
+#include <init.h>
 #include <dm/devres.h>
 #include <linux/crc32.h>
 #include <linux/slab.h>
diff --git a/include/common.h b/include/common.h
index a87c062880..d69cda339c 100644
--- a/include/common.h
+++ b/include/common.h
@@ -31,7 +31,6 @@ 
 #include <log.h>
 #include <asm/u-boot.h> /* boot information for Linux kernel */
 #include <asm/global_data.h>	/* global data used for startup functions */
-#include <init.h>
 #include <display_options.h>
 #include <vsprintf.h>
 #endif	/* __ASSEMBLY__ */
diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
index 7c64077d42..b7e19c3475 100644
--- a/lib/efi/efi_app.c
+++ b/lib/efi/efi_app.c
@@ -13,6 +13,7 @@ 
 #include <debug_uart.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
 #include <malloc.h>
 #include <linux/err.h>
 #include <linux/types.h>
diff --git a/lib/time.c b/lib/time.c
index 1395f28715..3d6447d7c0 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -8,6 +8,7 @@ 
 #include <bootstage.h>
 #include <dm.h>
 #include <errno.h>
+#include <init.h>
 #include <time.h>
 #include <timer.h>
 #include <watchdog.h>