diff --git a/arch/arm/boards/a9m2410/lowlevel_init.S b/arch/arm/boards/a9m2410/lowlevel_init.S
index 57d63e8de..b772b1f7f 100644
--- a/arch/arm/boards/a9m2410/lowlevel_init.S
+++ b/arch/arm/boards/a9m2410/lowlevel_init.S
@@ -3,7 +3,7 @@
  */
 
 #include <config.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/s3c-iomap.h>
 #include <asm/barebox-arm-head.h>
 
diff --git a/arch/arm/boards/a9m2440/lowlevel_init.S b/arch/arm/boards/a9m2440/lowlevel_init.S
index 87112011b..2c51e0580 100644
--- a/arch/arm/boards/a9m2440/lowlevel_init.S
+++ b/arch/arm/boards/a9m2440/lowlevel_init.S
@@ -3,7 +3,7 @@
  */
 
 #include <config.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/s3c-iomap.h>
 #include <mach/s3c24xx-gpio.h>
 #include <asm/barebox-arm-head.h>
diff --git a/arch/arm/boards/afi-gf/board.c b/arch/arm/boards/afi-gf/board.c
index dfcb579f2..14e260391 100644
--- a/arch/arm/boards/afi-gf/board.c
+++ b/arch/arm/boards/afi-gf/board.c
@@ -16,7 +16,7 @@
 #include <common.h>
 #include <string.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <envfs.h>
 #include <bootsource.h>
 #include <asm/armlinux.h>
diff --git a/arch/arm/boards/afi-gf/lowlevel.c b/arch/arm/boards/afi-gf/lowlevel.c
index fdc340c05..4aaecb9e8 100644
--- a/arch/arm/boards/afi-gf/lowlevel.c
+++ b/arch/arm/boards/afi-gf/lowlevel.c
@@ -1,5 +1,5 @@
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <asm/armlinux.h>
 #include <asm/barebox-arm-head.h>
diff --git a/arch/arm/boards/animeo_ip/init.c b/arch/arm/boards/animeo_ip/init.c
index ca64d6df8..f7268bd6e 100644
--- a/arch/arm/boards/animeo_ip/init.c
+++ b/arch/arm/boards/animeo_ip/init.c
@@ -17,7 +17,7 @@
 #include <io.h>
 #include <mach/hardware.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 #include <linux/clk.h>
 #include <mach/board.h>
diff --git a/arch/arm/boards/archosg9/board.c b/arch/arm/boards/archosg9/board.c
index 114c34ec2..0a3c0b9d9 100644
--- a/arch/arm/boards/archosg9/board.c
+++ b/arch/arm/boards/archosg9/board.c
@@ -18,7 +18,7 @@
 #include <mach/omap4-silicon.h>
 #include <mach/omap4-devices.h>
 #include <mach/omap4_rom_usb.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <i2c/i2c.h>
 #include <gpio.h>
 #include <gpio_keys.h>
diff --git a/arch/arm/boards/archosg9/lowlevel.c b/arch/arm/boards/archosg9/lowlevel.c
index 6813e0d18..c76d04b90 100644
--- a/arch/arm/boards/archosg9/lowlevel.c
+++ b/arch/arm/boards/archosg9/lowlevel.c
@@ -13,7 +13,7 @@
 #include <common.h>
 #include <io.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/generic.h>
 #include <mach/omap4-mux.h>
 #include <mach/omap4-silicon.h>
diff --git a/arch/arm/boards/at91rm9200ek/init.c b/arch/arm/boards/at91rm9200ek/init.c
index c444669ff..43c8b1b05 100644
--- a/arch/arm/boards/at91rm9200ek/init.c
+++ b/arch/arm/boards/at91rm9200ek/init.c
@@ -25,7 +25,7 @@
 #include <gpio.h>
 #include <fcntl.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/hardware.h>
 #include <mach/at91_pmc.h>
 #include <mach/board.h>
diff --git a/arch/arm/boards/at91sam9260ek/init.c b/arch/arm/boards/at91sam9260ek/init.c
index bc0c411d3..422feb209 100644
--- a/arch/arm/boards/at91sam9260ek/init.c
+++ b/arch/arm/boards/at91sam9260ek/init.c
@@ -19,7 +19,7 @@
 #include <generated/mach-types.h>
 #include <nand.h>
 #include <linux/mtd/nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/board.h>
 #include <mach/at91sam9_smc.h>
 #include <gpio.h>
diff --git a/arch/arm/boards/at91sam9261ek/init.c b/arch/arm/boards/at91sam9261ek/init.c
index 7b8ce98d5..a0b021919 100644
--- a/arch/arm/boards/at91sam9261ek/init.c
+++ b/arch/arm/boards/at91sam9261ek/init.c
@@ -26,7 +26,7 @@
 #include <io.h>
 #include <mach/hardware.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 #include <mach/at91_pmc.h>
 #include <mach/board.h>
diff --git a/arch/arm/boards/at91sam9263ek/init.c b/arch/arm/boards/at91sam9263ek/init.c
index c8a9d5c00..3bb2ddafa 100644
--- a/arch/arm/boards/at91sam9263ek/init.c
+++ b/arch/arm/boards/at91sam9263ek/init.c
@@ -28,7 +28,7 @@
 #include <io.h>
 #include <mach/hardware.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 #include <mach/at91_pmc.h>
 #include <mach/board.h>
diff --git a/arch/arm/boards/at91sam9m10g45ek/init.c b/arch/arm/boards/at91sam9m10g45ek/init.c
index cdd780684..e00908bc3 100644
--- a/arch/arm/boards/at91sam9m10g45ek/init.c
+++ b/arch/arm/boards/at91sam9m10g45ek/init.c
@@ -30,7 +30,7 @@
 #include <io.h>
 #include <mach/hardware.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 #include <mach/at91_pmc.h>
 #include <mach/board.h>
diff --git a/arch/arm/boards/at91sam9m10ihd/init.c b/arch/arm/boards/at91sam9m10ihd/init.c
index a432e5c41..dcd93c10b 100644
--- a/arch/arm/boards/at91sam9m10ihd/init.c
+++ b/arch/arm/boards/at91sam9m10ihd/init.c
@@ -17,7 +17,7 @@
 #include <io.h>
 #include <mach/hardware.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 #include <mach/board.h>
 #include <gpio.h>
diff --git a/arch/arm/boards/at91sam9n12ek/init.c b/arch/arm/boards/at91sam9n12ek/init.c
index 818a59890..26d08ae65 100644
--- a/arch/arm/boards/at91sam9n12ek/init.c
+++ b/arch/arm/boards/at91sam9n12ek/init.c
@@ -27,7 +27,7 @@
 #include <io.h>
 #include <mach/hardware.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 #include <mach/board.h>
 #include <mach/at91sam9_smc.h>
diff --git a/arch/arm/boards/at91sam9x5ek/init.c b/arch/arm/boards/at91sam9x5ek/init.c
index 183ddc705..e0c11a11e 100644
--- a/arch/arm/boards/at91sam9x5ek/init.c
+++ b/arch/arm/boards/at91sam9x5ek/init.c
@@ -27,7 +27,7 @@
 #include <io.h>
 #include <mach/hardware.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 #include <mach/board.h>
 #include <mach/at91sam9_smc.h>
diff --git a/arch/arm/boards/avnet-zedboard/board.c b/arch/arm/boards/avnet-zedboard/board.c
index ef9a8a878..722bda302 100644
--- a/arch/arm/boards/avnet-zedboard/board.c
+++ b/arch/arm/boards/avnet-zedboard/board.c
@@ -19,7 +19,7 @@
 #include <init.h>
 #include <mach/devices.h>
 #include <mach/zynq7000-regs.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 static int zedboard_mem_init(void)
 {
diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c
index 405496058..775621069 100644
--- a/arch/arm/boards/beagle/board.c
+++ b/arch/arm/boards/beagle/board.c
@@ -19,7 +19,7 @@
 #include <console.h>
 #include <init.h>
 #include <driver.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <ns16550.h>
 #include <asm/armlinux.h>
diff --git a/arch/arm/boards/beagle/lowlevel.c b/arch/arm/boards/beagle/lowlevel.c
index 62c98a9ce..d6e6b9f91 100644
--- a/arch/arm/boards/beagle/lowlevel.c
+++ b/arch/arm/boards/beagle/lowlevel.c
@@ -1,6 +1,6 @@
 #include <init.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <mach/control.h>
diff --git a/arch/arm/boards/beaglebone/board.c b/arch/arm/boards/beaglebone/board.c
index 3042189f6..f0177aaca 100644
--- a/arch/arm/boards/beaglebone/board.c
+++ b/arch/arm/boards/beaglebone/board.c
@@ -27,7 +27,7 @@
 #include <envfs.h>
 #include <environment.h>
 #include <globalvar.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <net.h>
 #include <envfs.h>
 #include <bootsource.h>
diff --git a/arch/arm/boards/beaglebone/lowlevel.c b/arch/arm/boards/beaglebone/lowlevel.c
index a742bbf7a..05b3e5f15 100644
--- a/arch/arm/boards/beaglebone/lowlevel.c
+++ b/arch/arm/boards/beaglebone/lowlevel.c
@@ -1,5 +1,5 @@
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <linux/string.h>
 #include <debug_ll.h>
diff --git a/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c b/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c
index a32e29c3e..7d859330f 100644
--- a/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c
+++ b/arch/arm/boards/boundarydevices-nitrogen6x/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/generic.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/canon-a1100/lowlevel.c b/arch/arm/boards/canon-a1100/lowlevel.c
index bbae82566..5f4297ea4 100644
--- a/arch/arm/boards/canon-a1100/lowlevel.c
+++ b/arch/arm/boards/canon-a1100/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 
diff --git a/arch/arm/boards/ccxmx51/ccxmx51.c b/arch/arm/boards/ccxmx51/ccxmx51.c
index 0960d1ecf..40cf76dc5 100644
--- a/arch/arm/boards/ccxmx51/ccxmx51.c
+++ b/arch/arm/boards/ccxmx51/ccxmx51.c
@@ -26,7 +26,7 @@
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <nand.h>
 #include <notifier.h>
 #include <spi/spi.h>
diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c
index 2e5fca5f5..5e569bcc9 100644
--- a/arch/arm/boards/chumby_falconwing/falconwing.c
+++ b/arch/arm/boards/chumby_falconwing/falconwing.c
@@ -19,7 +19,7 @@
 #include <envfs.h>
 #include <errno.h>
 #include <mci.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <usb/ehci.h>
 #include <asm/armlinux.h>
 #include <io.h>
diff --git a/arch/arm/boards/chumby_falconwing/lowlevel.c b/arch/arm/boards/chumby_falconwing/lowlevel.c
index d26562c02..bfc76cc7d 100644
--- a/arch/arm/boards/chumby_falconwing/lowlevel.c
+++ b/arch/arm/boards/chumby_falconwing/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <mach/imx23-regs.h>
diff --git a/arch/arm/boards/clep7212/clep7212.c b/arch/arm/boards/clep7212/clep7212.c
index e52164391..de125ea9e 100644
--- a/arch/arm/boards/clep7212/clep7212.c
+++ b/arch/arm/boards/clep7212/clep7212.c
@@ -12,7 +12,7 @@
 #include <init.h>
 #include <partition.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/armlinux.h>
 #include <asm/mmu.h>
 #include <generated/mach-types.h>
diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
index e6ebe8207..1412eff4a 100644
--- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
+++ b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
@@ -25,7 +25,7 @@
 #include <mci.h>
 #include <io.h>
 #include <net.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #include <i2c/i2c.h>
 #include <i2c/i2c-gpio.h>
diff --git a/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c b/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c
index aa3b09b2e..3c7248ef6 100644
--- a/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c
+++ b/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <mach/imx28-regs.h>
diff --git a/arch/arm/boards/datamodul-edm-qmx6/board.c b/arch/arm/boards/datamodul-edm-qmx6/board.c
index 25f45dfcc..81356e61c 100644
--- a/arch/arm/boards/datamodul-edm-qmx6/board.c
+++ b/arch/arm/boards/datamodul-edm-qmx6/board.c
@@ -23,7 +23,7 @@
 #include <partition.h>
 #include <common.h>
 #include <envfs.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <init.h>
 #include <gpio.h>
 #include <fec.h>
diff --git a/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c b/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c
index 914c275b8..28b4aa280 100644
--- a/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c
+++ b/arch/arm/boards/datamodul-edm-qmx6/lowlevel.c
@@ -13,7 +13,7 @@
  *
  */
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <debug_ll.h>
 #include <asm/sections.h>
diff --git a/arch/arm/boards/dfi-fs700-m60/board.c b/arch/arm/boards/dfi-fs700-m60/board.c
index e0dc5b242..bef4612d9 100644
--- a/arch/arm/boards/dfi-fs700-m60/board.c
+++ b/arch/arm/boards/dfi-fs700-m60/board.c
@@ -23,7 +23,7 @@
 #include <bootsource.h>
 #include <globalvar.h>
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <envfs.h>
 #include <init.h>
 #include <gpio.h>
diff --git a/arch/arm/boards/dfi-fs700-m60/lowlevel.c b/arch/arm/boards/dfi-fs700-m60/lowlevel.c
index 81b353046..b9b498e46 100644
--- a/arch/arm/boards/dfi-fs700-m60/lowlevel.c
+++ b/arch/arm/boards/dfi-fs700-m60/lowlevel.c
@@ -13,7 +13,7 @@
  *
  */
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <asm/sections.h>
 #include <asm/mmu.h>
diff --git a/arch/arm/boards/ebv-socrates/board.c b/arch/arm/boards/ebv-socrates/board.c
index b2f62dc2f..5d2d61991 100644
--- a/arch/arm/boards/ebv-socrates/board.c
+++ b/arch/arm/boards/ebv-socrates/board.c
@@ -5,7 +5,7 @@
 #include <asm/armlinux.h>
 #include <linux/micrel_phy.h>
 #include <linux/phy.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <fcntl.h>
 #include <fs.h>
 #include <mach/socfpga-regs.h>
diff --git a/arch/arm/boards/ebv-socrates/lowlevel.c b/arch/arm/boards/ebv-socrates/lowlevel.c
index 7fc81678e..66cb226b2 100644
--- a/arch/arm/boards/ebv-socrates/lowlevel.c
+++ b/arch/arm/boards/ebv-socrates/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/embedsky-e9/board.c b/arch/arm/boards/embedsky-e9/board.c
index 55b432021..1e7e06788 100644
--- a/arch/arm/boards/embedsky-e9/board.c
+++ b/arch/arm/boards/embedsky-e9/board.c
@@ -31,7 +31,7 @@
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <mach/generic.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <net.h>
 #include <mach/imx6.h>
 #include <mach/devices-imx6.h>
diff --git a/arch/arm/boards/embedsky-e9/lowlevel.c b/arch/arm/boards/embedsky-e9/lowlevel.c
index fee101170..fb1ba5f64 100644
--- a/arch/arm/boards/embedsky-e9/lowlevel.c
+++ b/arch/arm/boards/embedsky-e9/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/generic.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/embest-riotboard/board.c b/arch/arm/boards/embest-riotboard/board.c
index 3f5b4dec5..a885a08a7 100644
--- a/arch/arm/boards/embest-riotboard/board.c
+++ b/arch/arm/boards/embest-riotboard/board.c
@@ -26,7 +26,7 @@
 #include <mach/imx6.h>
 #include <mach/bbu.h>
 #include <mfd/imx6q-iomuxc-gpr.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/phy.h>
 
 static int ar8035_phy_fixup(struct phy_device *dev)
diff --git a/arch/arm/boards/embest-riotboard/lowlevel.c b/arch/arm/boards/embest-riotboard/lowlevel.c
index c4ef28786..fe21b9aad 100644
--- a/arch/arm/boards/embest-riotboard/lowlevel.c
+++ b/arch/arm/boards/embest-riotboard/lowlevel.c
@@ -1,6 +1,6 @@
 #include <debug_ll.h>
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/freescale-mx21-ads/imx21ads.c b/arch/arm/boards/freescale-mx21-ads/imx21ads.c
index bd7e46e16..5f0e7bda6 100644
--- a/arch/arm/boards/freescale-mx21-ads/imx21ads.c
+++ b/arch/arm/boards/freescale-mx21-ads/imx21ads.c
@@ -30,7 +30,7 @@
 #include <mach/weim.h>
 #include <partition.h>
 #include <fs.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <fcntl.h>
 #include <generated/mach-types.h>
 #include <mach/imx-nand.h>
diff --git a/arch/arm/boards/freescale-mx21-ads/lowlevel_init.S b/arch/arm/boards/freescale-mx21-ads/lowlevel_init.S
index 87b2f942f..16739b557 100644
--- a/arch/arm/boards/freescale-mx21-ads/lowlevel_init.S
+++ b/arch/arm/boards/freescale-mx21-ads/lowlevel_init.S
@@ -14,7 +14,7 @@
  */
 
 #include <config.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm-generic/memory_layout.h>
 #include <mach/imx21-regs.h>
 #include <asm/barebox-arm-head.h>
diff --git a/arch/arm/boards/freescale-mx23-evk/lowlevel.c b/arch/arm/boards/freescale-mx23-evk/lowlevel.c
index 2a26a7763..b260f3a7f 100644
--- a/arch/arm/boards/freescale-mx23-evk/lowlevel.c
+++ b/arch/arm/boards/freescale-mx23-evk/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <mach/imx23-regs.h>
diff --git a/arch/arm/boards/freescale-mx28-evk/lowlevel.c b/arch/arm/boards/freescale-mx28-evk/lowlevel.c
index aa3b09b2e..3c7248ef6 100644
--- a/arch/arm/boards/freescale-mx28-evk/lowlevel.c
+++ b/arch/arm/boards/freescale-mx28-evk/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <mach/imx28-regs.h>
diff --git a/arch/arm/boards/freescale-mx35-3ds/3stack.c b/arch/arm/boards/freescale-mx35-3ds/3stack.c
index 8f821adb7..cca0fe49e 100644
--- a/arch/arm/boards/freescale-mx35-3ds/3stack.c
+++ b/arch/arm/boards/freescale-mx35-3ds/3stack.c
@@ -30,7 +30,7 @@
 #include <init.h>
 #include <nand.h>
 #include <net.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <partition.h>
 #include <gpio.h>
 
diff --git a/arch/arm/boards/freescale-mx53-qsb/board.c b/arch/arm/boards/freescale-mx53-qsb/board.c
index 1128e686b..f65b55658 100644
--- a/arch/arm/boards/freescale-mx53-qsb/board.c
+++ b/arch/arm/boards/freescale-mx53-qsb/board.c
@@ -17,7 +17,7 @@
 #include <environment.h>
 #include <partition.h>
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <gpio.h>
 #include <init.h>
 #include <fs.h>
diff --git a/arch/arm/boards/freescale-mx53-smd/board.c b/arch/arm/boards/freescale-mx53-smd/board.c
index c81f43c15..196d20a45 100644
--- a/arch/arm/boards/freescale-mx53-smd/board.c
+++ b/arch/arm/boards/freescale-mx53-smd/board.c
@@ -23,7 +23,7 @@
 #include <nand.h>
 #include <net.h>
 #include <partition.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <gpio.h>
 
 #include <generated/mach-types.h>
diff --git a/arch/arm/boards/freescale-mx53-vmx53/board.c b/arch/arm/boards/freescale-mx53-vmx53/board.c
index b91bfdf5e..1859aaca2 100644
--- a/arch/arm/boards/freescale-mx53-vmx53/board.c
+++ b/arch/arm/boards/freescale-mx53-vmx53/board.c
@@ -18,7 +18,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #include <generated/mach-types.h>
 #include <mach/imx5.h>
diff --git a/arch/arm/boards/freescale-mx6-arm2/board.c b/arch/arm/boards/freescale-mx6-arm2/board.c
index 7a78400f2..3d5576c06 100644
--- a/arch/arm/boards/freescale-mx6-arm2/board.c
+++ b/arch/arm/boards/freescale-mx6-arm2/board.c
@@ -25,7 +25,7 @@
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <mach/generic.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/imx6.h>
 #include <mach/devices-imx6.h>
 #include <mach/iomux-mx6.h>
diff --git a/arch/arm/boards/freescale-mx6-arm2/lowlevel.c b/arch/arm/boards/freescale-mx6-arm2/lowlevel.c
index 5676711a1..f83389333 100644
--- a/arch/arm/boards/freescale-mx6-arm2/lowlevel.c
+++ b/arch/arm/boards/freescale-mx6-arm2/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <mach/generic.h>
diff --git a/arch/arm/boards/freescale-mx6-sabrelite/board.c b/arch/arm/boards/freescale-mx6-sabrelite/board.c
index 1f2654805..edf081140 100644
--- a/arch/arm/boards/freescale-mx6-sabrelite/board.c
+++ b/arch/arm/boards/freescale-mx6-sabrelite/board.c
@@ -28,7 +28,7 @@
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <mach/generic.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <net.h>
 #include <linux/micrel_phy.h>
 #include <mach/imx6.h>
diff --git a/arch/arm/boards/freescale-mx6-sabrelite/lowlevel.c b/arch/arm/boards/freescale-mx6-sabrelite/lowlevel.c
index 1b4796571..abfb77a15 100644
--- a/arch/arm/boards/freescale-mx6-sabrelite/lowlevel.c
+++ b/arch/arm/boards/freescale-mx6-sabrelite/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/generic.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/freescale-mx6-sabresd/board.c b/arch/arm/boards/freescale-mx6-sabresd/board.c
index 53aada7bb..734adde07 100644
--- a/arch/arm/boards/freescale-mx6-sabresd/board.c
+++ b/arch/arm/boards/freescale-mx6-sabresd/board.c
@@ -28,7 +28,7 @@
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <mach/generic.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <net.h>
 #include <mach/imx6.h>
 #include <mach/devices-imx6.h>
diff --git a/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c b/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c
index bf1845912..73eed1d06 100644
--- a/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c
+++ b/arch/arm/boards/freescale-mx6-sabresd/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/generic.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/freescale-mx6sx-sabresdb/board.c b/arch/arm/boards/freescale-mx6sx-sabresdb/board.c
index c21b43dc5..353b460a1 100644
--- a/arch/arm/boards/freescale-mx6sx-sabresdb/board.c
+++ b/arch/arm/boards/freescale-mx6sx-sabresdb/board.c
@@ -16,7 +16,7 @@
 #include <environment.h>
 #include <partition.h>
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <gpio.h>
 #include <init.h>
 #include <io.h>
diff --git a/arch/arm/boards/freescale-mx6sx-sabresdb/lowlevel.c b/arch/arm/boards/freescale-mx6sx-sabresdb/lowlevel.c
index 33f370028..4c5a74ea6 100644
--- a/arch/arm/boards/freescale-mx6sx-sabresdb/lowlevel.c
+++ b/arch/arm/boards/freescale-mx6sx-sabresdb/lowlevel.c
@@ -14,7 +14,7 @@
 
 #include <debug_ll.h>
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/generic.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/friendlyarm-mini2440/lowlevel_init.S b/arch/arm/boards/friendlyarm-mini2440/lowlevel_init.S
index 858351b13..43bf49c12 100644
--- a/arch/arm/boards/friendlyarm-mini2440/lowlevel_init.S
+++ b/arch/arm/boards/friendlyarm-mini2440/lowlevel_init.S
@@ -3,7 +3,7 @@
  */
 
 #include <config.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/s3c-iomap.h>
 #include <asm/barebox-arm-head.h>
 
diff --git a/arch/arm/boards/friendlyarm-mini6410/lowlevel.c b/arch/arm/boards/friendlyarm-mini6410/lowlevel.c
index a21a3f830..665c31b32 100644
--- a/arch/arm/boards/friendlyarm-mini6410/lowlevel.c
+++ b/arch/arm/boards/friendlyarm-mini6410/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/s3c-iomap.h>
diff --git a/arch/arm/boards/friendlyarm-tiny210/lowlevel.c b/arch/arm/boards/friendlyarm-tiny210/lowlevel.c
index 7e7085104..3ab8d6606 100644
--- a/arch/arm/boards/friendlyarm-tiny210/lowlevel.c
+++ b/arch/arm/boards/friendlyarm-tiny210/lowlevel.c
@@ -19,7 +19,7 @@
 #include <common.h>
 #include <init.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/sections.h>
diff --git a/arch/arm/boards/friendlyarm-tiny210/tiny210.c b/arch/arm/boards/friendlyarm-tiny210/tiny210.c
index a33af99aa..d84b3128a 100644
--- a/arch/arm/boards/friendlyarm-tiny210/tiny210.c
+++ b/arch/arm/boards/friendlyarm-tiny210/tiny210.c
@@ -27,7 +27,7 @@
 #include <common.h>
 #include <driver.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <generated/mach-types.h>
 #include <dm9000.h>
 #include <gpio.h>
diff --git a/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c b/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c
index a21a3f830..665c31b32 100644
--- a/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c
+++ b/arch/arm/boards/friendlyarm-tiny6410/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/s3c-iomap.h>
diff --git a/arch/arm/boards/gateworks-ventana/lowlevel.c b/arch/arm/boards/gateworks-ventana/lowlevel.c
index 10b2c4c78..746beb87e 100644
--- a/arch/arm/boards/gateworks-ventana/lowlevel.c
+++ b/arch/arm/boards/gateworks-ventana/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/generic.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/gk802/board.c b/arch/arm/boards/gk802/board.c
index 9dd22533f..0d1b07b0e 100644
--- a/arch/arm/boards/gk802/board.c
+++ b/arch/arm/boards/gk802/board.c
@@ -24,7 +24,7 @@
 #include <mach/imx6-regs.h>
 #include <mach/imx6.h>
 #include <mfd/imx6q-iomuxc-gpr.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <of.h>
 
 #define GK802_GPIO_RECOVERY_BTN	IMX_GPIO_NR(3, 16)	/* recovery button */
diff --git a/arch/arm/boards/gk802/lowlevel.c b/arch/arm/boards/gk802/lowlevel.c
index de744a205..b57196988 100644
--- a/arch/arm/boards/gk802/lowlevel.c
+++ b/arch/arm/boards/gk802/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/generic.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/globalscale-guruplug/lowlevel.c b/arch/arm/boards/globalscale-guruplug/lowlevel.c
index 508746a06..91bc1cf56 100644
--- a/arch/arm/boards/globalscale-guruplug/lowlevel.c
+++ b/arch/arm/boards/globalscale-guruplug/lowlevel.c
@@ -15,7 +15,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/lowlevel.h>
diff --git a/arch/arm/boards/globalscale-mirabox/lowlevel.c b/arch/arm/boards/globalscale-mirabox/lowlevel.c
index 92203b768..4f55d1acb 100644
--- a/arch/arm/boards/globalscale-mirabox/lowlevel.c
+++ b/arch/arm/boards/globalscale-mirabox/lowlevel.c
@@ -15,7 +15,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/lowlevel.h>
diff --git a/arch/arm/boards/guf-santaro/board.c b/arch/arm/boards/guf-santaro/board.c
index 8fbfe269b..b9a52ee25 100644
--- a/arch/arm/boards/guf-santaro/board.c
+++ b/arch/arm/boards/guf-santaro/board.c
@@ -20,7 +20,7 @@
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <mach/generic.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <bootsource.h>
 #include <bbu.h>
 #include <mach/bbu.h>
diff --git a/arch/arm/boards/guf-santaro/lowlevel.c b/arch/arm/boards/guf-santaro/lowlevel.c
index 02de84c7b..7753cea4e 100644
--- a/arch/arm/boards/guf-santaro/lowlevel.c
+++ b/arch/arm/boards/guf-santaro/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/guf-vincell/board.c b/arch/arm/boards/guf-vincell/board.c
index bacab0bd1..0c46ade9f 100644
--- a/arch/arm/boards/guf-vincell/board.c
+++ b/arch/arm/boards/guf-vincell/board.c
@@ -23,7 +23,7 @@
 #include <nand.h>
 #include <net.h>
 #include <partition.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <bbu.h>
 #include <gpio.h>
 #include <io.h>
diff --git a/arch/arm/boards/highbank/init.c b/arch/arm/boards/highbank/init.c
index 7b4f9637d..a0d4b30b4 100644
--- a/arch/arm/boards/highbank/init.c
+++ b/arch/arm/boards/highbank/init.c
@@ -14,7 +14,7 @@
 #include <mach/sysregs.h>
 #include <environment.h>
 #include <partition.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <of.h>
 
diff --git a/arch/arm/boards/highbank/lowlevel.c b/arch/arm/boards/highbank/lowlevel.c
index c0405ed3a..83f4c7ad1 100644
--- a/arch/arm/boards/highbank/lowlevel.c
+++ b/arch/arm/boards/highbank/lowlevel.c
@@ -5,7 +5,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <asm/system_info.h>
diff --git a/arch/arm/boards/imx233-olinuxino/lowlevel.c b/arch/arm/boards/imx233-olinuxino/lowlevel.c
index d26562c02..bfc76cc7d 100644
--- a/arch/arm/boards/imx233-olinuxino/lowlevel.c
+++ b/arch/arm/boards/imx233-olinuxino/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <mach/imx23-regs.h>
diff --git a/arch/arm/boards/karo-tx25/board.c b/arch/arm/boards/karo-tx25/board.c
index 59c81b2fa..ebebd58d8 100644
--- a/arch/arm/boards/karo-tx25/board.c
+++ b/arch/arm/boards/karo-tx25/board.c
@@ -22,7 +22,7 @@
 #include <common.h>
 #include <init.h>
 #include <driver.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <gpio.h>
 #include <environment.h>
 #include <mach/imx25-regs.h>
diff --git a/arch/arm/boards/karo-tx25/lowlevel.c b/arch/arm/boards/karo-tx25/lowlevel.c
index 861c27b8a..b7ff2d44c 100644
--- a/arch/arm/boards/karo-tx25/lowlevel.c
+++ b/arch/arm/boards/karo-tx25/lowlevel.c
@@ -21,7 +21,7 @@
 #include <mach/imx25-regs.h>
 #include <mach/esdctl.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/imx-nand.h>
 #include <mach/esdctl.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/karo-tx28/lowlevel.c b/arch/arm/boards/karo-tx28/lowlevel.c
index aa3b09b2e..3c7248ef6 100644
--- a/arch/arm/boards/karo-tx28/lowlevel.c
+++ b/arch/arm/boards/karo-tx28/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <mach/imx28-regs.h>
diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c
index 2aaceb442..c4c51099b 100644
--- a/arch/arm/boards/karo-tx28/tx28-stk5.c
+++ b/arch/arm/boards/karo-tx28/tx28-stk5.c
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <mci.h>
 #include <fec.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <net.h>
 #include <asm/sections.h>
diff --git a/arch/arm/boards/karo-tx53/board.c b/arch/arm/boards/karo-tx53/board.c
index e5c27aac9..b8164ca86 100644
--- a/arch/arm/boards/karo-tx53/board.c
+++ b/arch/arm/boards/karo-tx53/board.c
@@ -22,7 +22,7 @@
 #include <nand.h>
 #include <net.h>
 #include <partition.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <gpio.h>
 
 #include <generated/mach-types.h>
diff --git a/arch/arm/boards/karo-tx6x/lowlevel.c b/arch/arm/boards/karo-tx6x/lowlevel.c
index 00008d403..cd4be5e9e 100644
--- a/arch/arm/boards/karo-tx6x/lowlevel.c
+++ b/arch/arm/boards/karo-tx6x/lowlevel.c
@@ -18,7 +18,7 @@
 #include <asm/barebox-arm.h>
 #include <image-metadata.h>
 #include <mach/generic.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 static inline void setup_uart(void)
 {
diff --git a/arch/arm/boards/marvell-armada-xp-gp/lowlevel.c b/arch/arm/boards/marvell-armada-xp-gp/lowlevel.c
index 046057f56..59eaa29a5 100644
--- a/arch/arm/boards/marvell-armada-xp-gp/lowlevel.c
+++ b/arch/arm/boards/marvell-armada-xp-gp/lowlevel.c
@@ -15,7 +15,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/lowlevel.h>
diff --git a/arch/arm/boards/mioa701/lowlevel.c b/arch/arm/boards/mioa701/lowlevel.c
index aa4a82e59..bfb8bad1c 100644
--- a/arch/arm/boards/mioa701/lowlevel.c
+++ b/arch/arm/boards/mioa701/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 
diff --git a/arch/arm/boards/module-mb7707/lowlevel.c b/arch/arm/boards/module-mb7707/lowlevel.c
index 5f5e1d7af..0258be6e4 100644
--- a/arch/arm/boards/module-mb7707/lowlevel.c
+++ b/arch/arm/boards/module-mb7707/lowlevel.c
@@ -21,7 +21,7 @@
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #define MB7707_SRAM_BASE 0x40000000
 #define MB7707_SRAM_SIZE SZ_128M
diff --git a/arch/arm/boards/netx/platform.S b/arch/arm/boards/netx/platform.S
index 6c6622819..95ae46cc6 100644
--- a/arch/arm/boards/netx/platform.S
+++ b/arch/arm/boards/netx/platform.S
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  */
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 
 .globl barebox_arm_reset_vector
diff --git a/arch/arm/boards/nhk8815/lowlevel.c b/arch/arm/boards/nhk8815/lowlevel.c
index ce06f45c9..33a785fee 100644
--- a/arch/arm/boards/nhk8815/lowlevel.c
+++ b/arch/arm/boards/nhk8815/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 
diff --git a/arch/arm/boards/nvidia-beaver/entry.c b/arch/arm/boards/nvidia-beaver/entry.c
index 576fcb7a5..9b7e253b4 100644
--- a/arch/arm/boards/nvidia-beaver/entry.c
+++ b/arch/arm/boards/nvidia-beaver/entry.c
@@ -15,7 +15,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/lowlevel.h>
diff --git a/arch/arm/boards/nvidia-jetson-tk1/entry.c b/arch/arm/boards/nvidia-jetson-tk1/entry.c
index 76c95a877..8f112a3a9 100644
--- a/arch/arm/boards/nvidia-jetson-tk1/entry.c
+++ b/arch/arm/boards/nvidia-jetson-tk1/entry.c
@@ -15,7 +15,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/lowlevel.h>
diff --git a/arch/arm/boards/omap343xdsp/lowlevel.c b/arch/arm/boards/omap343xdsp/lowlevel.c
index 18ddff362..318bb9aeb 100644
--- a/arch/arm/boards/omap343xdsp/lowlevel.c
+++ b/arch/arm/boards/omap343xdsp/lowlevel.c
@@ -1,7 +1,7 @@
 #include <common.h>
 #include <init.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <mach/generic.h>
diff --git a/arch/arm/boards/omap3evm/board.c b/arch/arm/boards/omap3evm/board.c
index 2813d3d65..0fe69b61a 100644
--- a/arch/arm/boards/omap3evm/board.c
+++ b/arch/arm/boards/omap3evm/board.c
@@ -43,7 +43,7 @@
 #include <init.h>
 #include <driver.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <ns16550.h>
 #include <asm/armlinux.h>
 #include <mach/omap3-silicon.h>
diff --git a/arch/arm/boards/omap3evm/lowlevel.c b/arch/arm/boards/omap3evm/lowlevel.c
index 5c3e8902a..d8a1b9f61 100644
--- a/arch/arm/boards/omap3evm/lowlevel.c
+++ b/arch/arm/boards/omap3evm/lowlevel.c
@@ -1,6 +1,6 @@
 #include <io.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <mach/generic.h>
diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c
index c63602b4c..f7a3a0fa2 100644
--- a/arch/arm/boards/panda/board.c
+++ b/arch/arm/boards/panda/board.c
@@ -15,7 +15,7 @@
 #include <mach/control.h>
 #include <usb/ehci.h>
 #include <linux/err.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/mmu.h>
 #include <envfs.h>
 #include <i2c/i2c.h>
diff --git a/arch/arm/boards/panda/lowlevel.c b/arch/arm/boards/panda/lowlevel.c
index 2679ae469..005485ba4 100644
--- a/arch/arm/boards/panda/lowlevel.c
+++ b/arch/arm/boards/panda/lowlevel.c
@@ -19,7 +19,7 @@
 #include <common.h>
 #include <init.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/generic.h>
 #include <mach/omap4-mux.h>
 #include <mach/omap4-silicon.h>
diff --git a/arch/arm/boards/phytec-phycard-imx27/pca100.c b/arch/arm/boards/phytec-phycard-imx27/pca100.c
index 9475bfafc..0481113c6 100644
--- a/arch/arm/boards/phytec-phycard-imx27/pca100.c
+++ b/arch/arm/boards/phytec-phycard-imx27/pca100.c
@@ -21,7 +21,7 @@
 #include <mach/imx27-regs.h>
 #include <fec.h>
 #include <gpio.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/armlinux.h>
 #include <asm/sections.h>
 #include <generated/mach-types.h>
diff --git a/arch/arm/boards/phytec-phycard-imx6/lowlevel.c b/arch/arm/boards/phytec-phycard-imx6/lowlevel.c
index b31638cbb..dc106490e 100644
--- a/arch/arm/boards/phytec-phycard-imx6/lowlevel.c
+++ b/arch/arm/boards/phytec-phycard-imx6/lowlevel.c
@@ -14,7 +14,7 @@
  */
 #include <debug_ll.h>
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/phytec-phycard-omap3/lowlevel.c b/arch/arm/boards/phytec-phycard-omap3/lowlevel.c
index 57f638966..27b56b1e0 100644
--- a/arch/arm/boards/phytec-phycard-omap3/lowlevel.c
+++ b/arch/arm/boards/phytec-phycard-omap3/lowlevel.c
@@ -1,7 +1,7 @@
 #include <common.h>
 #include <io.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <mach/omap3-mux.h>
diff --git a/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c
index 68a17bf0c..1c2e7f742 100644
--- a/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c
+++ b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c
@@ -46,7 +46,7 @@
 #include <nand.h>
 #include <ns16550.h>
 #include <partition.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/armlinux.h>
 #include <asm/io.h>
 #include <generated/mach-types.h>
diff --git a/arch/arm/boards/phytec-phycard-omap4/lowlevel.c b/arch/arm/boards/phytec-phycard-omap4/lowlevel.c
index 841ac4b20..170ca6896 100644
--- a/arch/arm/boards/phytec-phycard-omap4/lowlevel.c
+++ b/arch/arm/boards/phytec-phycard-omap4/lowlevel.c
@@ -19,7 +19,7 @@
 #include <common.h>
 #include <init.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/generic.h>
 #include <mach/omap4-mux.h>
 #include <mach/omap4-silicon.h>
diff --git a/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c
index 64297224c..78890ba5a 100644
--- a/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c
+++ b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c
@@ -29,7 +29,7 @@
 #include <mach/syslib.h>
 #include <mach/control.h>
 #include <linux/err.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <partition.h>
 #include <nand.h>
 #include <asm/mmu.h>
diff --git a/arch/arm/boards/phytec-phycore-am335x/board.c b/arch/arm/boards/phytec-phycore-am335x/board.c
index a72cebda3..61a11cfaa 100644
--- a/arch/arm/boards/phytec-phycore-am335x/board.c
+++ b/arch/arm/boards/phytec-phycore-am335x/board.c
@@ -22,7 +22,7 @@
 #include <nand.h>
 #include <init.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <envfs.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
diff --git a/arch/arm/boards/phytec-phycore-am335x/lowlevel.c b/arch/arm/boards/phytec-phycore-am335x/lowlevel.c
index 5ab8b5b44..843929e94 100644
--- a/arch/arm/boards/phytec-phycore-am335x/lowlevel.c
+++ b/arch/arm/boards/phytec-phycore-am335x/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <init.h>
 #include <asm/barebox-arm-head.h>
diff --git a/arch/arm/boards/phytec-phycore-imx27/pcm038.c b/arch/arm/boards/phytec-phycore-imx27/pcm038.c
index a4305f6e4..01f6a55ad 100644
--- a/arch/arm/boards/phytec-phycore-imx27/pcm038.c
+++ b/arch/arm/boards/phytec-phycore-imx27/pcm038.c
@@ -20,7 +20,7 @@
 #include <init.h>
 #include <io.h>
 #include <notifier.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <envfs.h>
 #include <mach/devices-imx27.h>
 #include <mach/imx-pll.h>
diff --git a/arch/arm/boards/phytec-phycore-imx27/pcm970.c b/arch/arm/boards/phytec-phycore-imx27/pcm970.c
index b0c177ebb..73df2ad2a 100644
--- a/arch/arm/boards/phytec-phycore-imx27/pcm970.c
+++ b/arch/arm/boards/phytec-phycore-imx27/pcm970.c
@@ -16,7 +16,7 @@
 #include <init.h>
 #include <io.h>
 #include <platform_ide.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/imx27-regs.h>
 #include <mach/iomux-mx27.h>
 
diff --git a/arch/arm/boards/phytec-phycore-imx35/pcm043.c b/arch/arm/boards/phytec-phycore-imx35/pcm043.c
index d1dd28fc6..e31c79d15 100644
--- a/arch/arm/boards/phytec-phycore-imx35/pcm043.c
+++ b/arch/arm/boards/phytec-phycore-imx35/pcm043.c
@@ -26,7 +26,7 @@
 #include <environment.h>
 #include <fs.h>
 #include <gpio.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/imx35-regs.h>
 #include <asm/armlinux.h>
 #include <io.h>
diff --git a/arch/arm/boards/phytec-phycore-omap4460/board.c b/arch/arm/boards/phytec-phycore-omap4460/board.c
index baf88a380..6495a6f6a 100644
--- a/arch/arm/boards/phytec-phycore-omap4460/board.c
+++ b/arch/arm/boards/phytec-phycore-omap4460/board.c
@@ -32,7 +32,7 @@
 #include <mach/syslib.h>
 #include <mach/control.h>
 #include <linux/err.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <partition.h>
 #include <nand.h>
 #include <asm/mmu.h>
diff --git a/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c b/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c
index 8ea62c7f5..c0825949a 100644
--- a/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c
+++ b/arch/arm/boards/phytec-phycore-omap4460/lowlevel.c
@@ -19,7 +19,7 @@
 #include <common.h>
 #include <init.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/generic.h>
 #include <mach/omap4-mux.h>
 #include <mach/omap4-silicon.h>
diff --git a/arch/arm/boards/phytec-phycore-pxa270/board.c b/arch/arm/boards/phytec-phycore-pxa270/board.c
index 509569e81..833c4c81e 100644
--- a/arch/arm/boards/phytec-phycore-pxa270/board.c
+++ b/arch/arm/boards/phytec-phycore-pxa270/board.c
@@ -24,7 +24,7 @@
 #include <fs.h>
 #include <init.h>
 #include <partition.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #include <plat/gpio.h>
 #include <mach/mfp-pxa27x.h>
diff --git a/arch/arm/boards/phytec-phycore-pxa270/lowlevel_init.S b/arch/arm/boards/phytec-phycore-pxa270/lowlevel_init.S
index c7dacce30..39af00b54 100644
--- a/arch/arm/boards/phytec-phycore-pxa270/lowlevel_init.S
+++ b/arch/arm/boards/phytec-phycore-pxa270/lowlevel_init.S
@@ -24,7 +24,7 @@
  */
 
 #include <config.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/pxa-regs.h>
 #include <mach/regs-ost.h>
 #include <mach/regs-intc.h>
diff --git a/arch/arm/boards/phytec-phyflex-am335x/board.c b/arch/arm/boards/phytec-phyflex-am335x/board.c
index f265e52f3..e635532d2 100644
--- a/arch/arm/boards/phytec-phyflex-am335x/board.c
+++ b/arch/arm/boards/phytec-phyflex-am335x/board.c
@@ -22,7 +22,7 @@
 #include <nand.h>
 #include <init.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <envfs.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
diff --git a/arch/arm/boards/phytec-phyflex-am335x/lowlevel.c b/arch/arm/boards/phytec-phyflex-am335x/lowlevel.c
index 4d34968a0..a24040155 100644
--- a/arch/arm/boards/phytec-phyflex-am335x/lowlevel.c
+++ b/arch/arm/boards/phytec-phyflex-am335x/lowlevel.c
@@ -18,7 +18,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <init.h>
 #include <asm/barebox-arm-head.h>
diff --git a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c b/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
index ce168b2cc..dbd264aed 100644
--- a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
+++ b/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
@@ -14,7 +14,7 @@
  */
 #include <debug_ll.h>
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <image-metadata.h>
 #include <asm/barebox-arm-head.h>
diff --git a/arch/arm/boards/plathome-openblocks-a6/lowlevel.c b/arch/arm/boards/plathome-openblocks-a6/lowlevel.c
index b37a3d600..71bf7aa2e 100644
--- a/arch/arm/boards/plathome-openblocks-a6/lowlevel.c
+++ b/arch/arm/boards/plathome-openblocks-a6/lowlevel.c
@@ -12,7 +12,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/lowlevel.h>
diff --git a/arch/arm/boards/plathome-openblocks-ax3/lowlevel.c b/arch/arm/boards/plathome-openblocks-ax3/lowlevel.c
index 721d2de97..9030a5d0c 100644
--- a/arch/arm/boards/plathome-openblocks-ax3/lowlevel.c
+++ b/arch/arm/boards/plathome-openblocks-ax3/lowlevel.c
@@ -15,7 +15,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/lowlevel.h>
diff --git a/arch/arm/boards/qil-a926x/init.c b/arch/arm/boards/qil-a926x/init.c
index 99a960470..2f6bd2cb8 100644
--- a/arch/arm/boards/qil-a926x/init.c
+++ b/arch/arm/boards/qil-a926x/init.c
@@ -17,7 +17,7 @@
 #include <io.h>
 #include <mach/hardware.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 #include <linux/clk.h>
 #include <mach/board.h>
diff --git a/arch/arm/boards/radxa-rock/lowlevel.c b/arch/arm/boards/radxa-rock/lowlevel.c
index 65014e6bb..1c07bc337 100644
--- a/arch/arm/boards/radxa-rock/lowlevel.c
+++ b/arch/arm/boards/radxa-rock/lowlevel.c
@@ -12,7 +12,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 
diff --git a/arch/arm/boards/raspberry-pi/lowlevel.c b/arch/arm/boards/raspberry-pi/lowlevel.c
index 022b11d29..485171a11 100644
--- a/arch/arm/boards/raspberry-pi/lowlevel.c
+++ b/arch/arm/boards/raspberry-pi/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/platform.h>
diff --git a/arch/arm/boards/sama5d3_xplained/init.c b/arch/arm/boards/sama5d3_xplained/init.c
index 7dfebe8e8..373ab814d 100644
--- a/arch/arm/boards/sama5d3_xplained/init.c
+++ b/arch/arm/boards/sama5d3_xplained/init.c
@@ -24,7 +24,7 @@
 #include <io.h>
 #include <mach/hardware.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 #include <mach/board.h>
 #include <mach/at91sam9_smc.h>
diff --git a/arch/arm/boards/sama5d3xek/init.c b/arch/arm/boards/sama5d3xek/init.c
index 49d2b371f..57dc7b066 100644
--- a/arch/arm/boards/sama5d3xek/init.c
+++ b/arch/arm/boards/sama5d3xek/init.c
@@ -26,7 +26,7 @@
 #include <io.h>
 #include <mach/hardware.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 #include <mach/board.h>
 #include <mach/at91sam9_smc.h>
diff --git a/arch/arm/boards/sama5d4_xplained/sama5d4_xplained.c b/arch/arm/boards/sama5d4_xplained/sama5d4_xplained.c
index 01262201d..fe6876a9e 100644
--- a/arch/arm/boards/sama5d4_xplained/sama5d4_xplained.c
+++ b/arch/arm/boards/sama5d4_xplained/sama5d4_xplained.c
@@ -18,7 +18,7 @@
 #include <io.h>
 #include <mach/hardware.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 #include <mach/board.h>
 #include <mach/at91sam9_smc.h>
diff --git a/arch/arm/boards/sama5d4ek/sama5d4ek.c b/arch/arm/boards/sama5d4ek/sama5d4ek.c
index 91cffa3b4..bbc53c675 100644
--- a/arch/arm/boards/sama5d4ek/sama5d4ek.c
+++ b/arch/arm/boards/sama5d4ek/sama5d4ek.c
@@ -18,7 +18,7 @@
 #include <io.h>
 #include <mach/hardware.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 #include <mach/board.h>
 #include <mach/at91sam9_smc.h>
diff --git a/arch/arm/boards/solidrun-cubox/lowlevel.c b/arch/arm/boards/solidrun-cubox/lowlevel.c
index a28c2b18c..08e31e835 100644
--- a/arch/arm/boards/solidrun-cubox/lowlevel.c
+++ b/arch/arm/boards/solidrun-cubox/lowlevel.c
@@ -16,7 +16,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/lowlevel.h>
diff --git a/arch/arm/boards/solidrun-microsom/board.c b/arch/arm/boards/solidrun-microsom/board.c
index 4b0ea3204..783ec53c1 100644
--- a/arch/arm/boards/solidrun-microsom/board.c
+++ b/arch/arm/boards/solidrun-microsom/board.c
@@ -25,7 +25,7 @@
 #include <mach/imx6-regs.h>
 #include <mach/imx6.h>
 #include <mfd/imx6q-iomuxc-gpr.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/phy.h>
 
 static int ar8035_phy_fixup(struct phy_device *dev)
diff --git a/arch/arm/boards/solidrun-microsom/lowlevel.c b/arch/arm/boards/solidrun-microsom/lowlevel.c
index eb5283896..30f4a3f59 100644
--- a/arch/arm/boards/solidrun-microsom/lowlevel.c
+++ b/arch/arm/boards/solidrun-microsom/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/generic.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/terasic-sockit/board.c b/arch/arm/boards/terasic-sockit/board.c
index fdff76ff8..53cd36834 100644
--- a/arch/arm/boards/terasic-sockit/board.c
+++ b/arch/arm/boards/terasic-sockit/board.c
@@ -5,7 +5,7 @@
 #include <asm/armlinux.h>
 #include <linux/micrel_phy.h>
 #include <linux/phy.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <fcntl.h>
 #include <fs.h>
 #include <mach/socfpga-regs.h>
diff --git a/arch/arm/boards/terasic-sockit/lowlevel.c b/arch/arm/boards/terasic-sockit/lowlevel.c
index 0683435a7..78d5d41b0 100644
--- a/arch/arm/boards/terasic-sockit/lowlevel.c
+++ b/arch/arm/boards/terasic-sockit/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/tny-a926x/init.c b/arch/arm/boards/tny-a926x/init.c
index ac8645787..0299d8df2 100644
--- a/arch/arm/boards/tny-a926x/init.c
+++ b/arch/arm/boards/tny-a926x/init.c
@@ -26,7 +26,7 @@
 #include <io.h>
 #include <mach/hardware.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 #include <linux/clk.h>
 #include <mach/board.h>
diff --git a/arch/arm/boards/toradex-colibri-t20/entry.c b/arch/arm/boards/toradex-colibri-t20/entry.c
index 695862cfd..a25958fb4 100644
--- a/arch/arm/boards/toradex-colibri-t20/entry.c
+++ b/arch/arm/boards/toradex-colibri-t20/entry.c
@@ -15,7 +15,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/lowlevel.h>
diff --git a/arch/arm/boards/toshiba-ac100/board.c b/arch/arm/boards/toshiba-ac100/board.c
index 51232ef42..0cb955c15 100644
--- a/arch/arm/boards/toshiba-ac100/board.c
+++ b/arch/arm/boards/toshiba-ac100/board.c
@@ -19,7 +19,7 @@
 #include <driver.h>
 #include <init.h>
 #include <asm/armlinux.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <usb/ehci.h>
 #include <mach/iomap.h>
 
diff --git a/arch/arm/boards/toshiba-ac100/entry.c b/arch/arm/boards/toshiba-ac100/entry.c
index 45fa56aa7..fb695c32d 100644
--- a/arch/arm/boards/toshiba-ac100/entry.c
+++ b/arch/arm/boards/toshiba-ac100/entry.c
@@ -15,7 +15,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/lowlevel.h>
diff --git a/arch/arm/boards/tqma6x/board.c b/arch/arm/boards/tqma6x/board.c
index 2118fb272..97cce60c7 100644
--- a/arch/arm/boards/tqma6x/board.c
+++ b/arch/arm/boards/tqma6x/board.c
@@ -23,7 +23,7 @@
 #include <partition.h>
 #include <common.h>
 #include <envfs.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <init.h>
 #include <gpio.h>
 #include <fec.h>
diff --git a/arch/arm/boards/tqma6x/lowlevel.c b/arch/arm/boards/tqma6x/lowlevel.c
index d2eea16c2..23f3407c0 100644
--- a/arch/arm/boards/tqma6x/lowlevel.c
+++ b/arch/arm/boards/tqma6x/lowlevel.c
@@ -14,7 +14,7 @@
  */
 #include <debug_ll.h>
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/udoo/board.c b/arch/arm/boards/udoo/board.c
index d2f558e7f..f3668fef0 100644
--- a/arch/arm/boards/udoo/board.c
+++ b/arch/arm/boards/udoo/board.c
@@ -29,7 +29,7 @@
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <mach/generic.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <net.h>
 #include <linux/micrel_phy.h>
 #include <mach/imx6.h>
diff --git a/arch/arm/boards/udoo/lowlevel.c b/arch/arm/boards/udoo/lowlevel.c
index 3d9fc68ca..785ab1667 100644
--- a/arch/arm/boards/udoo/lowlevel.c
+++ b/arch/arm/boards/udoo/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/generic.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/usb-a926x/init.c b/arch/arm/boards/usb-a926x/init.c
index 4a28af07e..896535c5c 100644
--- a/arch/arm/boards/usb-a926x/init.c
+++ b/arch/arm/boards/usb-a926x/init.c
@@ -26,7 +26,7 @@
 #include <io.h>
 #include <mach/hardware.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 #include <linux/clk.h>
 #include <mach/board.h>
diff --git a/arch/arm/boards/usi-topkick/lowlevel.c b/arch/arm/boards/usi-topkick/lowlevel.c
index df661564d..ed94ee673 100644
--- a/arch/arm/boards/usi-topkick/lowlevel.c
+++ b/arch/arm/boards/usi-topkick/lowlevel.c
@@ -15,7 +15,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/lowlevel.h>
diff --git a/arch/arm/boards/variscite-mx6/board.c b/arch/arm/boards/variscite-mx6/board.c
index de74abc83..3585debb5 100644
--- a/arch/arm/boards/variscite-mx6/board.c
+++ b/arch/arm/boards/variscite-mx6/board.c
@@ -34,7 +34,7 @@
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <mach/generic.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/imx6.h>
 #include <mach/devices-imx6.h>
 #include <mach/iomux-mx6.h>
diff --git a/arch/arm/boards/variscite-mx6/lowlevel.c b/arch/arm/boards/variscite-mx6/lowlevel.c
index 74f3a779e..22e7eae32 100644
--- a/arch/arm/boards/variscite-mx6/lowlevel.c
+++ b/arch/arm/boards/variscite-mx6/lowlevel.c
@@ -16,7 +16,7 @@
  */
 #include <debug_ll.h>
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/boards/versatile/lowlevel.c b/arch/arm/boards/versatile/lowlevel.c
index ce06f45c9..33a785fee 100644
--- a/arch/arm/boards/versatile/lowlevel.c
+++ b/arch/arm/boards/versatile/lowlevel.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 
diff --git a/arch/arm/boards/versatile/versatilepb.c b/arch/arm/boards/versatile/versatilepb.c
index fdd0820fd..b42519878 100644
--- a/arch/arm/boards/versatile/versatilepb.c
+++ b/arch/arm/boards/versatile/versatilepb.c
@@ -27,7 +27,7 @@
 #include <mach/platform.h>
 #include <environment.h>
 #include <partition.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <net/smc91111.h>
 
 static int vpb_console_init(void)
diff --git a/arch/arm/boards/vexpress/init.c b/arch/arm/boards/vexpress/init.c
index 6cda49487..5b2035bd3 100644
--- a/arch/arm/boards/vexpress/init.c
+++ b/arch/arm/boards/vexpress/init.c
@@ -12,7 +12,7 @@
 #include <mach/devices.h>
 #include <environment.h>
 #include <partition.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <globalvar.h>
 #include <linux/amba/sp804.h>
diff --git a/arch/arm/boards/vexpress/lowlevel.c b/arch/arm/boards/vexpress/lowlevel.c
index 2ef94c59d..204d29d8f 100644
--- a/arch/arm/boards/vexpress/lowlevel.c
+++ b/arch/arm/boards/vexpress/lowlevel.c
@@ -5,7 +5,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <asm/system_info.h>
diff --git a/arch/arm/boards/virt2real/lowlevel.c b/arch/arm/boards/virt2real/lowlevel.c
index 731e2cae6..8ec3d04fe 100644
--- a/arch/arm/boards/virt2real/lowlevel.c
+++ b/arch/arm/boards/virt2real/lowlevel.c
@@ -21,7 +21,7 @@
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #define VIRT2REAL_SRAM_BASE 0x82000000
 #define VIRT2REAL_SRAM_SIZE SZ_16M
diff --git a/arch/arm/cpu/common.c b/arch/arm/cpu/common.c
index d5f892910..46ce94218 100644
--- a/arch/arm/cpu/common.c
+++ b/arch/arm/cpu/common.c
@@ -17,7 +17,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/system_info.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
diff --git a/arch/arm/cpu/mmu-early.c b/arch/arm/cpu/mmu-early.c
index b8b30df84..2e4d31692 100644
--- a/arch/arm/cpu/mmu-early.c
+++ b/arch/arm/cpu/mmu-early.c
@@ -1,7 +1,7 @@
 #include <common.h>
 #include <asm/mmu.h>
 #include <errno.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/memory.h>
 #include <asm/system.h>
 #include <asm/cache.h>
diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c
index e4afcc841..09fe8d592 100644
--- a/arch/arm/cpu/mmu.c
+++ b/arch/arm/cpu/mmu.c
@@ -23,7 +23,7 @@
 #include <init.h>
 #include <asm/mmu.h>
 #include <errno.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/memory.h>
 #include <asm/barebox-arm.h>
 #include <asm/system.h>
diff --git a/arch/arm/cpu/start-pbl.c b/arch/arm/cpu/start-pbl.c
index 741060ab6..f2490fd9e 100644
--- a/arch/arm/cpu/start-pbl.c
+++ b/arch/arm/cpu/start-pbl.c
@@ -20,7 +20,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <pbl.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index 264420d08..f6061f4c2 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -19,7 +19,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <of.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
diff --git a/arch/arm/cpu/uncompress.c b/arch/arm/cpu/uncompress.c
index d64706d21..ab194e187 100644
--- a/arch/arm/cpu/uncompress.c
+++ b/arch/arm/cpu/uncompress.c
@@ -20,7 +20,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <pbl.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h
index 641c00f81..9ad07cb77 100644
--- a/arch/arm/include/asm/barebox-arm.h
+++ b/arch/arm/include/asm/barebox-arm.h
@@ -25,7 +25,7 @@
 #ifndef _BAREBOX_ARM_H_
 #define _BAREBOX_ARM_H_
 
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm-generic/memory_layout.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index baf0946a4..8327c3f56 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -12,7 +12,7 @@
 #include <malloc.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <libbb.h>
 #include <magicvar.h>
 #include <binfmt.h>
diff --git a/arch/arm/lib/bootz.c b/arch/arm/lib/bootz.c
index 377f18a3a..5167c9d20 100644
--- a/arch/arm/lib/bootz.c
+++ b/arch/arm/lib/bootz.c
@@ -5,7 +5,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <malloc.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/byteorder.h>
 #include <asm/armlinux.h>
 #include <asm/system.h>
diff --git a/arch/arm/lib/pbl.lds.S b/arch/arm/lib/pbl.lds.S
index 9afee2964..73baff0ca 100644
--- a/arch/arm/lib/pbl.lds.S
+++ b/arch/arm/lib/pbl.lds.S
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  */
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm-generic/barebox.lds.h>
 #include <asm-generic/memory_layout.h>
 
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c
index ce0e4160b..7b68cdac2 100644
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@ -20,7 +20,7 @@
 #include <mach/io.h>
 #include <mach/at91rm9200_mc.h>
 #include <i2c/i2c-gpio.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #include "generic.h"
 
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index ed6f9c4b9..67c4ea860 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -11,7 +11,7 @@
  */
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <gpio.h>
 #include <asm/armlinux.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-at91/at91sam9260_lowlevel_init.c b/arch/arm/mach-at91/at91sam9260_lowlevel_init.c
index f745b8de4..7f84185ef 100644
--- a/arch/arm/mach-at91/at91sam9260_lowlevel_init.c
+++ b/arch/arm/mach-at91/at91sam9260_lowlevel_init.c
@@ -21,7 +21,7 @@
 #include <mach/at91_lowlevel_init.h>
 #include <mach/io.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 void __bare_init at91sam9260_lowlevel_init(void)
 {
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index ce539e97c..620ed652d 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -11,7 +11,7 @@
  */
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <gpio.h>
 #include <asm/armlinux.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-at91/at91sam9261_lowlevel_init.c b/arch/arm/mach-at91/at91sam9261_lowlevel_init.c
index b9b4dfbb0..0ad7f0a0c 100644
--- a/arch/arm/mach-at91/at91sam9261_lowlevel_init.c
+++ b/arch/arm/mach-at91/at91sam9261_lowlevel_init.c
@@ -21,7 +21,7 @@
 #include <mach/at91_lowlevel_init.h>
 #include <mach/io.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 void __bare_init at91sam9261_lowlevel_init(void)
 {
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index 1c9366a28..a3683e53b 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -11,7 +11,7 @@
  */
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <gpio.h>
 #include <asm/armlinux.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-at91/at91sam9263_lowlevel_init.c b/arch/arm/mach-at91/at91sam9263_lowlevel_init.c
index 00d78f237..0be84551f 100644
--- a/arch/arm/mach-at91/at91sam9263_lowlevel_init.c
+++ b/arch/arm/mach-at91/at91sam9263_lowlevel_init.c
@@ -21,7 +21,7 @@
 #include <mach/at91_lowlevel_init.h>
 #include <mach/io.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 void __bare_init at91sam9263_lowlevel_init(void)
 {
diff --git a/arch/arm/mach-at91/at91sam926x_lowlevel_init.c b/arch/arm/mach-at91/at91sam926x_lowlevel_init.c
index 6452bdd79..5dd8bc4e6 100644
--- a/arch/arm/mach-at91/at91sam926x_lowlevel_init.c
+++ b/arch/arm/mach-at91/at91sam926x_lowlevel_init.c
@@ -23,7 +23,7 @@
 #include <mach/gpio.h>
 #include <mach/io.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #include "gpio.h"
 
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index 5af876153..bad7f9c5b 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -11,7 +11,7 @@
  */
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <gpio.h>
 #include <asm/armlinux.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-at91/at91sam9g45_lowlevel_init.c b/arch/arm/mach-at91/at91sam9g45_lowlevel_init.c
index b58f101ee..2cdb7a6a5 100644
--- a/arch/arm/mach-at91/at91sam9g45_lowlevel_init.c
+++ b/arch/arm/mach-at91/at91sam9g45_lowlevel_init.c
@@ -14,7 +14,7 @@
 #include <mach/io.h>
 #include <mach/at91sam9_ddrsdr.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 void __naked __bare_init barebox_arm_reset_vector(void)
 {
diff --git a/arch/arm/mach-at91/at91sam9n12_devices.c b/arch/arm/mach-at91/at91sam9n12_devices.c
index 2d9ea4cae..bac023f55 100644
--- a/arch/arm/mach-at91/at91sam9n12_devices.c
+++ b/arch/arm/mach-at91/at91sam9n12_devices.c
@@ -11,7 +11,7 @@
  */
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <gpio.h>
 #include <asm/armlinux.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-at91/at91sam9n12_lowlevel_init.c b/arch/arm/mach-at91/at91sam9n12_lowlevel_init.c
index 72a092899..2b5cb158b 100644
--- a/arch/arm/mach-at91/at91sam9n12_lowlevel_init.c
+++ b/arch/arm/mach-at91/at91sam9n12_lowlevel_init.c
@@ -14,7 +14,7 @@
 #include <mach/io.h>
 #include <mach/at91sam9_ddrsdr.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 void __naked __bare_init barebox_arm_reset_vector(void)
 {
diff --git a/arch/arm/mach-at91/at91sam9x5_devices.c b/arch/arm/mach-at91/at91sam9x5_devices.c
index 2d05e9405..34537d8cf 100644
--- a/arch/arm/mach-at91/at91sam9x5_devices.c
+++ b/arch/arm/mach-at91/at91sam9x5_devices.c
@@ -10,7 +10,7 @@
  *
  */
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <gpio.h>
 #include <asm/armlinux.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-at91/at91sam9x5_lowlevel_init.c b/arch/arm/mach-at91/at91sam9x5_lowlevel_init.c
index 7781036e3..48e69f947 100644
--- a/arch/arm/mach-at91/at91sam9x5_lowlevel_init.c
+++ b/arch/arm/mach-at91/at91sam9x5_lowlevel_init.c
@@ -14,7 +14,7 @@
 #include <mach/io.h>
 #include <mach/at91sam9_ddrsdr.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 void __naked __bare_init barebox_arm_reset_vector(void)
 {
diff --git a/arch/arm/mach-at91/bootstrap.c b/arch/arm/mach-at91/bootstrap.c
index 4149304c9..2d18dd6b3 100644
--- a/arch/arm/mach-at91/bootstrap.c
+++ b/arch/arm/mach-at91/bootstrap.c
@@ -7,7 +7,7 @@
 #include <common.h>
 #include <bootstrap.h>
 #include <mach/bootstrap.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <malloc.h>
 #include <init.h>
 #include <menu.h>
diff --git a/arch/arm/mach-at91/include/mach/board.h b/arch/arm/mach-at91/include/mach/board.h
index e2307ed8e..491b220ca 100644
--- a/arch/arm/mach-at91/include/mach/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
@@ -19,7 +19,7 @@
 #define __ASM_ARCH_BOARD_H
 
 #include <mach/hardware.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <net.h>
 #include <i2c/i2c.h>
 #include <spi/spi.h>
diff --git a/arch/arm/mach-at91/sama5d3_devices.c b/arch/arm/mach-at91/sama5d3_devices.c
index 1938c053f..3fdfca8c6 100644
--- a/arch/arm/mach-at91/sama5d3_devices.c
+++ b/arch/arm/mach-at91/sama5d3_devices.c
@@ -11,7 +11,7 @@
  */
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <gpio.h>
 #include <asm/armlinux.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-at91/sama5d3_lowlevel_init.c b/arch/arm/mach-at91/sama5d3_lowlevel_init.c
index d3fcbc262..01d28514d 100644
--- a/arch/arm/mach-at91/sama5d3_lowlevel_init.c
+++ b/arch/arm/mach-at91/sama5d3_lowlevel_init.c
@@ -7,7 +7,7 @@
 #define __LOWLEVEL_INIT__
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <init.h>
 #include <asm/system.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/mach-at91/sama5d4_devices.c b/arch/arm/mach-at91/sama5d4_devices.c
index 380697168..e1b0a64d9 100644
--- a/arch/arm/mach-at91/sama5d4_devices.c
+++ b/arch/arm/mach-at91/sama5d4_devices.c
@@ -12,7 +12,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <gpio.h>
 #include <asm/armlinux.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-bcm2835/core.c b/arch/arm/mach-bcm2835/core.c
index 04bc89751..7f3d7e762 100644
--- a/arch/arm/mach-bcm2835/core.c
+++ b/arch/arm/mach-bcm2835/core.c
@@ -25,7 +25,7 @@
 
 #include <io.h>
 #include <asm/armlinux.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #include <mach/platform.h>
 #include <mach/wd.h>
diff --git a/arch/arm/mach-clps711x/clock.c b/arch/arm/mach-clps711x/clock.c
index 548b333b1..f3b4d85e5 100644
--- a/arch/arm/mach-clps711x/clock.c
+++ b/arch/arm/mach-clps711x/clock.c
@@ -9,7 +9,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/io.h>
 #include <linux/clk.h>
 #include <linux/clkdev.h>
diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c
index e27476d90..b6647dec2 100644
--- a/arch/arm/mach-clps711x/devices.c
+++ b/arch/arm/mach-clps711x/devices.c
@@ -9,7 +9,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #include <asm/io.h>
 #include <asm/memory.h>
diff --git a/arch/arm/mach-clps711x/lowlevel.c b/arch/arm/mach-clps711x/lowlevel.c
index ff23b05cc..35b8b35e8 100644
--- a/arch/arm/mach-clps711x/lowlevel.c
+++ b/arch/arm/mach-clps711x/lowlevel.c
@@ -9,7 +9,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #include <asm/io.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/mach-ep93xx/lowlevel_init.S b/arch/arm/mach-ep93xx/lowlevel_init.S
index 56057a8bb..707924606 100644
--- a/arch/arm/mach-ep93xx/lowlevel_init.S
+++ b/arch/arm/mach-ep93xx/lowlevel_init.S
@@ -20,7 +20,7 @@
  *
  */
 
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/ep93xx-regs.h>
 #include <asm/barebox-arm-head.h>
 
diff --git a/arch/arm/mach-highbank/devices.c b/arch/arm/mach-highbank/devices.c
index 6d7586430..8f9b8e0f4 100644
--- a/arch/arm/mach-highbank/devices.c
+++ b/arch/arm/mach-highbank/devices.c
@@ -5,7 +5,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #include <linux/amba/bus.h>
 
diff --git a/arch/arm/mach-imx/esdctl.c b/arch/arm/mach-imx/esdctl.c
index 433cfac1d..c6479a0e5 100644
--- a/arch/arm/mach-imx/esdctl.c
+++ b/arch/arm/mach-imx/esdctl.c
@@ -19,7 +19,7 @@
 #include <common.h>
 #include <io.h>
 #include <errno.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <init.h>
 #include <of.h>
 #include <linux/err.h>
diff --git a/arch/arm/mach-imx/imx-bbu-external-nand.c b/arch/arm/mach-imx/imx-bbu-external-nand.c
index 401b3248a..0f1a028f9 100644
--- a/arch/arm/mach-imx/imx-bbu-external-nand.c
+++ b/arch/arm/mach-imx/imx-bbu-external-nand.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/mtd-abi.h>
 #include <linux/stat.h>
 #include <ioctl.h>
diff --git a/arch/arm/mach-imx/imx-bbu-internal.c b/arch/arm/mach-imx/imx-bbu-internal.c
index 56369a0f9..ac90c53bb 100644
--- a/arch/arm/mach-imx/imx-bbu-internal.c
+++ b/arch/arm/mach-imx/imx-bbu-internal.c
@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/mtd-abi.h>
 #include <linux/stat.h>
 #include <ioctl.h>
diff --git a/arch/arm/mach-imx/imx25.c b/arch/arm/mach-imx/imx25.c
index 1f8778777..e87d93402 100644
--- a/arch/arm/mach-imx/imx25.c
+++ b/arch/arm/mach-imx/imx25.c
@@ -18,7 +18,7 @@
 #include <io.h>
 #include <mach/weim.h>
 #include <mach/generic.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 void imx25_setup_weimcs(size_t cs, unsigned upper, unsigned lower,
 		unsigned additional)
diff --git a/arch/arm/mach-imx/imx27.c b/arch/arm/mach-imx/imx27.c
index d3eaa87ef..b99a4eae3 100644
--- a/arch/arm/mach-imx/imx27.c
+++ b/arch/arm/mach-imx/imx27.c
@@ -15,7 +15,7 @@
 #include <mach/imx27-regs.h>
 #include <mach/weim.h>
 #include <mach/iomux-v1.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/revision.h>
 #include <mach/generic.h>
 #include <init.h>
diff --git a/arch/arm/mach-imx/imx31.c b/arch/arm/mach-imx/imx31.c
index 3013f0208..137c77a92 100644
--- a/arch/arm/mach-imx/imx31.c
+++ b/arch/arm/mach-imx/imx31.c
@@ -13,7 +13,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <mach/imx31-regs.h>
 #include <mach/weim.h>
diff --git a/arch/arm/mach-imx/imx35.c b/arch/arm/mach-imx/imx35.c
index 40f5770c8..69d45eba6 100644
--- a/arch/arm/mach-imx/imx35.c
+++ b/arch/arm/mach-imx/imx35.c
@@ -12,7 +12,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <init.h>
 #include <io.h>
 #include <mach/weim.h>
diff --git a/arch/arm/mach-imx/imx5.c b/arch/arm/mach-imx/imx5.c
index 9ec78b2af..96288f99e 100644
--- a/arch/arm/mach-imx/imx5.c
+++ b/arch/arm/mach-imx/imx5.c
@@ -1,6 +1,6 @@
 #include <common.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/imx5.h>
 #include <mach/clock-imx51_53.h>
 
diff --git a/arch/arm/mach-imx/imx51.c b/arch/arm/mach-imx/imx51.c
index cef302b35..70e897196 100644
--- a/arch/arm/mach-imx/imx51.c
+++ b/arch/arm/mach-imx/imx51.c
@@ -13,7 +13,7 @@
 
 #include <init.h>
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <environment.h>
 #include <io.h>
 #include <mach/imx5.h>
diff --git a/arch/arm/mach-imx/imx53.c b/arch/arm/mach-imx/imx53.c
index 62e65e01d..872d29364 100644
--- a/arch/arm/mach-imx/imx53.c
+++ b/arch/arm/mach-imx/imx53.c
@@ -15,7 +15,7 @@
 #include <common.h>
 #include <io.h>
 #include <notifier.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/imx5.h>
 #include <mach/imx53-regs.h>
 #include <mach/revision.h>
diff --git a/arch/arm/mach-imx/imx6-bbu-nand.c b/arch/arm/mach-imx/imx6-bbu-nand.c
index 2d0705956..1b46e514e 100644
--- a/arch/arm/mach-imx/imx6-bbu-nand.c
+++ b/arch/arm/mach-imx/imx6-bbu-nand.c
@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <ioctl.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <bbu.h>
 #include <fs.h>
 #include <mach/bbu.h>
diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c
index c5cae6e23..73630e709 100644
--- a/arch/arm/mach-imx/imx6.c
+++ b/arch/arm/mach-imx/imx6.c
@@ -14,7 +14,7 @@
 #include <init.h>
 #include <common.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mfd/imx6q-iomuxc-gpr.h>
 #include <mach/imx6.h>
 #include <mach/generic.h>
diff --git a/arch/arm/mach-imx/include/mach/devices-imx51.h b/arch/arm/mach-imx/include/mach/devices-imx51.h
index 68953293b..cccd8f461 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx51.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx51.h
@@ -1,5 +1,5 @@
 
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/devices.h>
 #include <mach/imx51-regs.h>
 
diff --git a/arch/arm/mach-imx/include/mach/imx31-regs.h b/arch/arm/mach-imx/include/mach/imx31-regs.h
index 599f8008b..e49132869 100644
--- a/arch/arm/mach-imx/include/mach/imx31-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx31-regs.h
@@ -19,7 +19,7 @@
 #ifndef __ASM_ARCH_MX31_REGS_H
 #define __ASM_ARCH_MX31_REGS_H
 
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #define MX31_IRAM_BASE_ADDR		0x1fffc000
 #define MX31_IRAM_SIZE			0x00004000
diff --git a/arch/arm/mach-imx/include/mach/imx35-regs.h b/arch/arm/mach-imx/include/mach/imx35-regs.h
index b30037cf8..52e209b4d 100644
--- a/arch/arm/mach-imx/include/mach/imx35-regs.h
+++ b/arch/arm/mach-imx/include/mach/imx35-regs.h
@@ -19,7 +19,7 @@
 #ifndef __ASM_ARCH_MX35_REGS_H
 #define __ASM_ARCH_MX35_REGS_H
 
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #define MX35_IRAM_BASE_ADDR		0x10000000	/* internal ram */
 #define MX35_IRAM_SIZE			SZ_128K
diff --git a/arch/arm/mach-mvebu/lowlevel.c b/arch/arm/mach-mvebu/lowlevel.c
index 7c4facfa1..8d0ac8453 100644
--- a/arch/arm/mach-mvebu/lowlevel.c
+++ b/arch/arm/mach-mvebu/lowlevel.c
@@ -17,7 +17,7 @@
 
 #include <common.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm.h>
 #include <asm/barebox-arm-head.h>
 #include <mach/common.h>
diff --git a/arch/arm/mach-mxs/bcb.c b/arch/arm/mach-mxs/bcb.c
index c945726f5..fce607f63 100644
--- a/arch/arm/mach-mxs/bcb.c
+++ b/arch/arm/mach-mxs/bcb.c
@@ -15,7 +15,7 @@
 #include <environment.h>
 #include <malloc.h>
 #include <nand.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <errno.h>
 #include <io.h>
 
diff --git a/arch/arm/mach-mxs/include/mach/devices.h b/arch/arm/mach-mxs/include/mach/devices.h
index 012bfc434..5680d61c9 100644
--- a/arch/arm/mach-mxs/include/mach/devices.h
+++ b/arch/arm/mach-mxs/include/mach/devices.h
@@ -2,7 +2,7 @@
 #define __MACH_MXS_DEVICES_H
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <xfuncs.h>
 #include <driver.h>
 #include <mach/imx-regs.h>
diff --git a/arch/arm/mach-omap/am33xx_scrm.c b/arch/arm/mach-omap/am33xx_scrm.c
index 67529f822..bb0babece 100644
--- a/arch/arm/mach-omap/am33xx_scrm.c
+++ b/arch/arm/mach-omap/am33xx_scrm.c
@@ -15,7 +15,7 @@
 #include <common.h>
 #include <io.h>
 #include <errno.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <init.h>
 #include <of.h>
 #include <asm/barebox-arm.h>
diff --git a/arch/arm/mach-omap/include/mach/am33xx-devices.h b/arch/arm/mach-omap/include/mach/am33xx-devices.h
index d2411a4fe..4790071c9 100644
--- a/arch/arm/mach-omap/include/mach/am33xx-devices.h
+++ b/arch/arm/mach-omap/include/mach/am33xx-devices.h
@@ -2,7 +2,7 @@
 #define __MACH_OMAP3_DEVICES_H
 
 #include <driver.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/am33xx-silicon.h>
 #include <mach/devices.h>
 #include <mach/omap_hsmmc.h>
diff --git a/arch/arm/mach-omap/include/mach/am33xx-silicon.h b/arch/arm/mach-omap/include/mach/am33xx-silicon.h
index a44973e97..4e63b437e 100644
--- a/arch/arm/mach-omap/include/mach/am33xx-silicon.h
+++ b/arch/arm/mach-omap/include/mach/am33xx-silicon.h
@@ -17,7 +17,7 @@
 #ifndef __ASM_ARCH_AM33XX_H
 #define __ASM_ARCH_AM33XX_H
 
-#include <sizes.h>
+#include <linux/sizes.h>
 
 /** AM335x Internal Bus Base addresses */
 #define AM33XX_L4_WKUP_BASE		0x44C00000
diff --git a/arch/arm/mach-omap/include/mach/omap3-devices.h b/arch/arm/mach-omap/include/mach/omap3-devices.h
index 0809e95b1..8c62c9900 100644
--- a/arch/arm/mach-omap/include/mach/omap3-devices.h
+++ b/arch/arm/mach-omap/include/mach/omap3-devices.h
@@ -2,7 +2,7 @@
 #define __MACH_OMAP3_DEVICES_H
 
 #include <driver.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/omap3-silicon.h>
 #include <mach/devices.h>
 #include <mach/mcspi.h>
diff --git a/arch/arm/mach-omap/include/mach/omap3-generic.h b/arch/arm/mach-omap/include/mach/omap3-generic.h
index 92bf7cabb..7db0838a5 100644
--- a/arch/arm/mach-omap/include/mach/omap3-generic.h
+++ b/arch/arm/mach-omap/include/mach/omap3-generic.h
@@ -1,7 +1,7 @@
 #ifndef __MACH_OMAP3_GENERIC_H
 #define __MACH_OMAP3_GENERIC_H
 
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/string.h>
 #include <mach/generic.h>
 #include <mach/omap3-silicon.h>
diff --git a/arch/arm/mach-omap/include/mach/omap4-devices.h b/arch/arm/mach-omap/include/mach/omap4-devices.h
index 76c978972..7ac940b2d 100644
--- a/arch/arm/mach-omap/include/mach/omap4-devices.h
+++ b/arch/arm/mach-omap/include/mach/omap4-devices.h
@@ -2,7 +2,7 @@
 #define __MACH_OMAP4_DEVICES_H
 
 #include <driver.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/devices.h>
 #include <mach/omap4-silicon.h>
 #include <mach/mcspi.h>
diff --git a/arch/arm/mach-omap/xload.c b/arch/arm/mach-omap/xload.c
index 8d9d84c85..7c8c35011 100644
--- a/arch/arm/mach-omap/xload.c
+++ b/arch/arm/mach-omap/xload.c
@@ -8,7 +8,7 @@
 #include <libfile.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <malloc.h>
 #include <filetype.h>
 #include <xymodem.h>
diff --git a/arch/arm/mach-samsung/lowlevel-s3c24x0.S b/arch/arm/mach-samsung/lowlevel-s3c24x0.S
index 52079ffc7..626ad0418 100644
--- a/arch/arm/mach-samsung/lowlevel-s3c24x0.S
+++ b/arch/arm/mach-samsung/lowlevel-s3c24x0.S
@@ -15,7 +15,7 @@
  */
 
 #include <config.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/s3c-iomap.h>
 
 	.section ".text_bare_init.s3c24x0_disable_wd","ax"
diff --git a/arch/arm/mach-samsung/mem-s3c24x0.c b/arch/arm/mach-samsung/mem-s3c24x0.c
index db61c63b6..bf65150ca 100644
--- a/arch/arm/mach-samsung/mem-s3c24x0.c
+++ b/arch/arm/mach-samsung/mem-s3c24x0.c
@@ -23,7 +23,7 @@
 #include <init.h>
 #include <clock.h>
 #include <io.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/s3c-iomap.h>
 #include <mach/s3c-generic.h>
 #include <mach/s3c-busctl.h>
diff --git a/arch/arm/mach-socfpga/xload.c b/arch/arm/mach-socfpga/xload.c
index 6586ada34..338009216 100644
--- a/arch/arm/mach-socfpga/xload.c
+++ b/arch/arm/mach-socfpga/xload.c
@@ -6,7 +6,7 @@
 #include <malloc.h>
 #include <init.h>
 #include <envfs.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <fs.h>
 #include <io.h>
 
diff --git a/arch/arm/mach-tegra/include/mach/iomap.h b/arch/arm/mach-tegra/include/mach/iomap.h
index cdaab6ab8..bbe6ae6be 100644
--- a/arch/arm/mach-tegra/include/mach/iomap.h
+++ b/arch/arm/mach-tegra/include/mach/iomap.h
@@ -21,7 +21,7 @@
 #ifndef __MACH_TEGRA_IOMAP_H
 #define __MACH_TEGRA_IOMAP_H
 
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #define TEGRA_IRAM_BASE			0x40000000
 #define TEGRA_IRAM_SIZE			SZ_256K
diff --git a/arch/arm/mach-tegra/include/mach/lowlevel.h b/arch/arm/mach-tegra/include/mach/lowlevel.h
index 3e7e41b99..f1fea86cf 100644
--- a/arch/arm/mach-tegra/include/mach/lowlevel.h
+++ b/arch/arm/mach-tegra/include/mach/lowlevel.h
@@ -25,7 +25,7 @@
 #define __TEGRA_LOWLEVEL_H
 
 #include <linux/compiler.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <mach/iomap.h>
 
diff --git a/arch/arm/mach-tegra/tegra_maincomplex_init.c b/arch/arm/mach-tegra/tegra_maincomplex_init.c
index 4a362ddba..6c6bdf6c1 100644
--- a/arch/arm/mach-tegra/tegra_maincomplex_init.c
+++ b/arch/arm/mach-tegra/tegra_maincomplex_init.c
@@ -15,7 +15,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/barebox-arm-head.h>
 #include <asm/barebox-arm.h>
 #include <asm/errata.h>
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 84a85a4ec..253e408db 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -26,7 +26,7 @@
 #include <init.h>
 #include <clock.h>
 #include <debug_ll.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #include <linux/clkdev.h>
 #include <linux/clk.h>
diff --git a/arch/efi/efi/efi-device.c b/arch/efi/efi/efi-device.c
index 1c9553d90..788bb7153 100644
--- a/arch/efi/efi/efi-device.c
+++ b/arch/efi/efi/efi-device.c
@@ -23,7 +23,7 @@
 #include <malloc.h>
 #include <memory.h>
 #include <string.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <wchar.h>
 #include <init.h>
 #include <efi.h>
diff --git a/arch/efi/efi/efi-image.c b/arch/efi/efi/efi-image.c
index d9edd91e4..f7bda8dfc 100644
--- a/arch/efi/efi/efi-image.c
+++ b/arch/efi/efi/efi-image.c
@@ -18,7 +18,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <memory.h>
 #include <command.h>
 #include <magicvar.h>
diff --git a/arch/efi/efi/efi.c b/arch/efi/efi/efi.c
index 7de8ec82e..ca076b209 100644
--- a/arch/efi/efi/efi.c
+++ b/arch/efi/efi/efi.c
@@ -18,7 +18,7 @@
  */
 
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <memory.h>
 #include <clock.h>
 #include <command.h>
diff --git a/arch/mips/boards/netgear-wg102/ram.c b/arch/mips/boards/netgear-wg102/ram.c
index e26dc7cbd..4cde57398 100644
--- a/arch/mips/boards/netgear-wg102/ram.c
+++ b/arch/mips/boards/netgear-wg102/ram.c
@@ -1,6 +1,6 @@
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/memory.h>
 
 static int mem_init(void)
diff --git a/arch/mips/boards/qemu-malta/init.c b/arch/mips/boards/qemu-malta/init.c
index 9d90f2865..24bfdc03e 100644
--- a/arch/mips/boards/qemu-malta/init.c
+++ b/arch/mips/boards/qemu-malta/init.c
@@ -18,7 +18,7 @@
 
 #include <common.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 static int malta_core_init(void)
 {
diff --git a/arch/mips/boot/main_entry-pbl.c b/arch/mips/boot/main_entry-pbl.c
index 3a244a0c5..e408d2944 100644
--- a/arch/mips/boot/main_entry-pbl.c
+++ b/arch/mips/boot/main_entry-pbl.c
@@ -19,7 +19,7 @@
 #include <common.h>
 #include <pbl.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <string.h>
 #include <asm/sections.h>
 #include <asm-generic/memory_layout.h>
diff --git a/arch/ppc/boards/pcm030/pcm030.c b/arch/ppc/boards/pcm030/pcm030.c
index 0762bd4f2..a7fa21d17 100644
--- a/arch/ppc/boards/pcm030/pcm030.c
+++ b/arch/ppc/boards/pcm030/pcm030.c
@@ -30,7 +30,7 @@
 #include <types.h>
 #include <partition.h>
 #include <memory.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/stat.h>
 #include <fs.h>
 
diff --git a/common/memtest.c b/common/memtest.c
index 541d00822..25a97d845 100644
--- a/common/memtest.c
+++ b/common/memtest.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <memory.h>
 #include <types.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <errno.h>
 #include <memtest.h>
 
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 645e9b5b7..346ab9813 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -32,7 +32,7 @@
 #include <disks.h>
 #include <asm/mmu.h>
 #include <ata_drive.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <clock.h>
 
 #include "ahci.h"
diff --git a/drivers/bus/omap-gpmc.c b/drivers/bus/omap-gpmc.c
index 6cc326999..6752c42a3 100644
--- a/drivers/bus/omap-gpmc.c
+++ b/drivers/bus/omap-gpmc.c
@@ -11,7 +11,7 @@
 #include <driver.h>
 #include <malloc.h>
 #include <init.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <io.h>
 #include <of.h>
 #include <of_address.h>
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index 52b0da592..dc0f8c6aa 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -9,7 +9,7 @@
  *
  */
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/mtd/nand.h>
 
 #ifdef CONFIG_NAND_INFO
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c
index 7734cf8a4..8042e9095 100644
--- a/drivers/net/mvneta.c
+++ b/drivers/net/mvneta.c
@@ -28,7 +28,7 @@
 #include <io.h>
 #include <net.h>
 #include <of_net.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/mmu.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/net/orion-gbe.c b/drivers/net/orion-gbe.c
index ab761ad2e..3fbc1df89 100644
--- a/drivers/net/orion-gbe.c
+++ b/drivers/net/orion-gbe.c
@@ -31,7 +31,7 @@
 #include <io.h>
 #include <net.h>
 #include <of_net.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <asm/mmu.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/of/base.c b/drivers/of/base.c
index e9f0883f4..af10fd1da 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -24,7 +24,7 @@
 #include <malloc.h>
 #include <init.h>
 #include <memory.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/ctype.h>
 #include <linux/amba/bus.h>
 #include <linux/err.h>
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index d84b2037c..dfa95c38c 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -23,7 +23,7 @@
 #include <malloc.h>
 #include <init.h>
 #include <memory.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
 
diff --git a/drivers/pci/pci-mvebu.c b/drivers/pci/pci-mvebu.c
index a314a689c..5e2b87a9e 100644
--- a/drivers/pci/pci-mvebu.c
+++ b/drivers/pci/pci-mvebu.c
@@ -20,7 +20,7 @@
 #include <of_address.h>
 #include <of_gpio.h>
 #include <of_pci.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #include "pci-mvebu.h"
 
diff --git a/drivers/pci/pci-tegra.c b/drivers/pci/pci-tegra.c
index 1ff3c0d15..1e7907e5b 100644
--- a/drivers/pci/pci-tegra.c
+++ b/drivers/pci/pci-tegra.c
@@ -32,7 +32,7 @@
 #include <linux/pci.h>
 #include <linux/phy/phy.h>
 #include <linux/reset.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <mach/tegra-powergate.h>
 #include <regulator.h>
 
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 7f8ebcfe4..5b848eeb2 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1,5 +1,5 @@
 #include <common.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <linux/pci.h>
 
 #ifdef DEBUG
diff --git a/drivers/pinctrl/mvebu/armada-370.c b/drivers/pinctrl/mvebu/armada-370.c
index 4778358fa..bcfe40e6c 100644
--- a/drivers/pinctrl/mvebu/armada-370.c
+++ b/drivers/pinctrl/mvebu/armada-370.c
@@ -17,7 +17,7 @@
 #include <malloc.h>
 #include <of.h>
 #include <of_address.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #include "common.h"
 
diff --git a/drivers/pinctrl/mvebu/armada-xp.c b/drivers/pinctrl/mvebu/armada-xp.c
index 8c71867a7..1745776a4 100644
--- a/drivers/pinctrl/mvebu/armada-xp.c
+++ b/drivers/pinctrl/mvebu/armada-xp.c
@@ -26,7 +26,7 @@
 #include <malloc.h>
 #include <of.h>
 #include <of_address.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #include "common.h"
 
diff --git a/drivers/pinctrl/mvebu/dove.c b/drivers/pinctrl/mvebu/dove.c
index bd0a632f1..a2133a093 100644
--- a/drivers/pinctrl/mvebu/dove.c
+++ b/drivers/pinctrl/mvebu/dove.c
@@ -15,7 +15,7 @@
 #include <malloc.h>
 #include <of.h>
 #include <of_address.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #include "common.h"
 
diff --git a/fs/nfs.c b/fs/nfs.c
index 046cd4d76..f1abd0bc5 100644
--- a/fs/nfs.c
+++ b/fs/nfs.c
@@ -33,7 +33,7 @@
 #include <linux/stat.h>
 #include <linux/err.h>
 #include <kfifo.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <byteorder.h>
 
 #include "parseopt.h"
diff --git a/fs/tftp.c b/fs/tftp.c
index b1a213ec1..36436197a 100644
--- a/fs/tftp.c
+++ b/fs/tftp.c
@@ -31,7 +31,7 @@
 #include <linux/stat.h>
 #include <linux/err.h>
 #include <kfifo.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #define TFTP_PORT	69	/* Well known TFTP port number */
 
diff --git a/include/linux/amba/sp804.h b/include/linux/amba/sp804.h
index aba550c37..8ec58f6c1 100644
--- a/include/linux/amba/sp804.h
+++ b/include/linux/amba/sp804.h
@@ -8,7 +8,7 @@
 #define __AMBA_SP804_H__
 
 #include <linux/amba/bus.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 
 #define AMBA_ARM_SP804_ID	0x00141804
 #define AMBA_ARM_SP804_ID_MASK	0x00ffffff
diff --git a/include/sizes.h b/include/linux/sizes.h
similarity index 100%
rename from include/sizes.h
rename to include/linux/sizes.h
diff --git a/lib/bootstrap/devfs.c b/lib/bootstrap/devfs.c
index 25d07c761..704680a4c 100644
--- a/lib/bootstrap/devfs.c
+++ b/lib/bootstrap/devfs.c
@@ -12,7 +12,7 @@
 #include <linux/mtd/mtd.h>
 #include <fcntl.h>
 #include <filetype.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <errno.h>
 #include <malloc.h>
 #include <bootstrap.h>
diff --git a/lib/bootstrap/disk.c b/lib/bootstrap/disk.c
index 1e9fbd834..ebf9ee5a9 100644
--- a/lib/bootstrap/disk.c
+++ b/lib/bootstrap/disk.c
@@ -8,7 +8,7 @@
 #include <common.h>
 #include <fs.h>
 #include <fcntl.h>
-#include <sizes.h>
+#include <linux/sizes.h>
 #include <errno.h>
 #include <malloc.h>
 #include <libfile.h>