From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tom Rini <trini@konsulko.com>
Date: Wed, 19 Aug 2020 09:08:59 -0400
Subject: [RFCv2 07/16] common: Drop asm/u-boot.h from common header
In-Reply-To: <20200819130908.4303-1-trini@konsulko.com>
References: <20200802225940.51457-1-sjg@chromium.org>
 <20200819130908.4303-1-trini@konsulko.com>
Message-ID: <20200819130908.4303-8-trini@konsulko.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

From: Simon Glass <sjg@chromium.org>

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

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

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

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