diff --git a/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c b/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c
index c94cb35..e4ccbdb 100644
--- a/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c
+++ b/arch/arm/boards/crystalfontz-cfa10036/hwdetect.c
@@ -26,6 +26,8 @@
 
 #include <asm/armlinux.h>
 
+#include "hwdetect.h"
+
 enum board_type {
 	BOARD_ID_CFA10036 = 0,
 	BOARD_ID_CFA10037 = 1,
diff --git a/arch/arm/boards/friendlyarm-tiny6410/tiny6410.c b/arch/arm/boards/friendlyarm-tiny6410/tiny6410.c
index e066a43..39179c8 100644
--- a/arch/arm/boards/friendlyarm-tiny6410/tiny6410.c
+++ b/arch/arm/boards/friendlyarm-tiny6410/tiny6410.c
@@ -21,6 +21,8 @@
 #include <mach/s3c-generic.h>
 #include <mach/iomux.h>
 
+#include "tiny6410.h"
+
 static const unsigned tiny6410_pin_usage[] = {
 	/* UART0 */
 	GPA2_GPIO | GPIO_IN | ENABLE_PU, /* CTS not connected */
diff --git a/arch/arm/lib32/semihosting.c b/arch/arm/lib32/semihosting.c
index 10ee7d3..9fc3b6b 100644
--- a/arch/arm/lib32/semihosting.c
+++ b/arch/arm/lib32/semihosting.c
@@ -21,6 +21,7 @@
 #include <common.h>
 #include <command.h>
 #include <fcntl.h>
+#include <asm/semihosting.h>
 
 #ifndef O_BINARY
 #define O_BINARY	0
diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c
index 6957431..8eacc70 100644
--- a/arch/arm/mach-clps711x/devices.c
+++ b/arch/arm/mach-clps711x/devices.c
@@ -15,6 +15,7 @@
 #include <asm/memory.h>
 
 #include <mach/clps711x.h>
+#include <mach/devices.h>
 
 static int clps711x_mem_init(void)
 {
diff --git a/arch/arm/mach-ep93xx/gpio.c b/arch/arm/mach-ep93xx/gpio.c
index 0c87152..20477f8 100644
--- a/arch/arm/mach-ep93xx/gpio.c
+++ b/arch/arm/mach-ep93xx/gpio.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <init.h>
 #include <io.h>
+#include <gpio.h>
 #include <mach/ep93xx-regs.h>
 
 #define EP93XX_GPIO_NUM_PORTS	8
diff --git a/arch/arm/mach-ep93xx/led.c b/arch/arm/mach-ep93xx/led.c
index a415bce..47e24cd 100644
--- a/arch/arm/mach-ep93xx/led.c
+++ b/arch/arm/mach-ep93xx/led.c
@@ -20,6 +20,8 @@
 #include <io.h>
 #include <mach/ep93xx-regs.h>
 
+#include "led.h"
+
 #define GREEN_LED_POS		0x01
 #define RED_LED_POS		0x02
 
diff --git a/arch/arm/mach-mvebu/common.c b/arch/arm/mach-mvebu/common.c
index 83aeb41..6b4fa8b 100644
--- a/arch/arm/mach-mvebu/common.c
+++ b/arch/arm/mach-mvebu/common.c
@@ -25,6 +25,7 @@
 #include <mach/socid.h>
 #include <asm/barebox-arm.h>
 #include <asm/memory.h>
+#include <mach/lowlevel.h>
 
 /*
  * The different SoC headers containing register definitions (mach/dove-regs.h,
diff --git a/arch/arm/mach-mxs/power.c b/arch/arm/mach-mxs/power.c
index 74c5479..6febf5d 100644
--- a/arch/arm/mach-mxs/power.c
+++ b/arch/arm/mach-mxs/power.c
@@ -14,6 +14,7 @@
 #include <stmp-device.h>
 #include <errno.h>
 #include <mach/imx-regs.h>
+#include <mach/power.h>
 
 #define POWER_CTRL			(IMX_POWER_BASE + 0x0)
 #define POWER_CTRL_CLKGATE		0x40000000
diff --git a/arch/arm/mach-mxs/usb-imx23.c b/arch/arm/mach-mxs/usb-imx23.c
index e626396..d9a54b6 100644
--- a/arch/arm/mach-mxs/usb-imx23.c
+++ b/arch/arm/mach-mxs/usb-imx23.c
@@ -17,6 +17,7 @@
 #include <io.h>
 #include <mach/imx23-regs.h>
 #include <mach/power.h>
+#include <mach/usb.h>
 
 #define USBPHY_PWD			(IMX_USBPHY_BASE + 0x0)
 
diff --git a/arch/arm/mach-mxs/usb-imx28.c b/arch/arm/mach-mxs/usb-imx28.c
index a87d4f6..a4e1bdb 100644
--- a/arch/arm/mach-mxs/usb-imx28.c
+++ b/arch/arm/mach-mxs/usb-imx28.c
@@ -18,6 +18,7 @@
 #include <io.h>
 #include <errno.h>
 #include <mach/imx28-regs.h>
+#include <mach/usb.h>
 
 #define POWER_CTRL			(IMX_POWER_BASE + 0x0)
 #define POWER_CTRL_CLKGATE		0x40000000
diff --git a/arch/arm/mach-netx/generic.c b/arch/arm/mach-netx/generic.c
index e818f97..450226d 100644
--- a/arch/arm/mach-netx/generic.c
+++ b/arch/arm/mach-netx/generic.c
@@ -20,6 +20,7 @@
 #include <io.h>
 #include <restart.h>
 #include <mach/netx-regs.h>
+#include <mach/netx-xc.h>
 #include "eth_firmware.h"
 
 struct fw_header {
diff --git a/arch/arm/mach-nomadik/8815.c b/arch/arm/mach-nomadik/8815.c
index dc1bcd2..9f9c034 100644
--- a/arch/arm/mach-nomadik/8815.c
+++ b/arch/arm/mach-nomadik/8815.c
@@ -18,6 +18,7 @@
 #include <init.h>
 #include <linux/clkdev.h>
 #include <mach/hardware.h>
+#include <mach/board.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
 #include <linux/amba/bus.h>
diff --git a/arch/arm/mach-omap/omap4_twl6030_mmc.c b/arch/arm/mach-omap/omap4_twl6030_mmc.c
index 155add6..67a9a5d 100644
--- a/arch/arm/mach-omap/omap4_twl6030_mmc.c
+++ b/arch/arm/mach-omap/omap4_twl6030_mmc.c
@@ -17,6 +17,7 @@
 #include <io.h>
 
 #include <mfd/twl6030.h>
+#include <mach/omap4_twl6030_mmc.h>
 
 /* MMC voltage */
 #define OMAP4_CONTROL_PBIASLITE			0x4A100600
diff --git a/arch/arm/mach-pxa/gpio.c b/arch/arm/mach-pxa/gpio.c
index 7dd6ac0..ebda6bb 100644
--- a/arch/arm/mach-pxa/gpio.c
+++ b/arch/arm/mach-pxa/gpio.c
@@ -12,6 +12,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <gpio.h>
 
 #include <mach/gpio.h>
 #include <asm/io.h>
diff --git a/crypto/keystore.c b/crypto/keystore.c
index f2b25ca..1ce6332 100644
--- a/crypto/keystore.c
+++ b/crypto/keystore.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
+#include <crypto/keystore.h>
 
 static LIST_HEAD(keystore_list);
 
diff --git a/drivers/mfd/lp3972.c b/drivers/mfd/lp3972.c
index 3ae9d1a..ca73671 100644
--- a/drivers/mfd/lp3972.c
+++ b/drivers/mfd/lp3972.c
@@ -20,6 +20,7 @@
 #include <driver.h>
 #include <xfuncs.h>
 #include <errno.h>
+#include <mfd/lp3972.h>
 
 #include <i2c/i2c.h>