diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index 99597076d2c..43d151708e4 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -16,6 +16,7 @@
 #include <asm/arch-rockchip/gpio.h>
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
+#include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
diff --git a/board/lg/star/star.c b/board/lg/star/star.c
index dc593754101..0b4a433a5df 100644
--- a/board/lg/star/star.c
+++ b/board/lg/star/star.c
@@ -9,6 +9,7 @@
 #include <fdt_support.h>
 #include <log.h>
 #include <spl_gpio.h>
+#include <asm/gpio.h>
 
 static int star_fix_panel(void *fdt)
 {
diff --git a/include/ndisc.h b/include/ndisc.h
index d0fe3acca4a..7d9e58aa1c2 100644
--- a/include/ndisc.h
+++ b/include/ndisc.h
@@ -10,8 +10,6 @@
 #ifndef __NDISC_H__
 #define __NDISC_H__
 
-#include <ndisc.h>
-
 /* struct nd_msg - ICMPv6 Neighbour Discovery message format */
 struct nd_msg {
 	struct icmp6hdr	icmph;
diff --git a/include/part.h b/include/part.h
index b3a3362b2af..b772fb34c8a 100644
--- a/include/part.h
+++ b/include/part.h
@@ -8,7 +8,6 @@
 
 #include <blk.h>
 #include <u-boot/uuid.h>
-#include <linker_lists.h>
 #include <linux/errno.h>
 #include <linux/list.h>
 
diff --git a/include/sata.h b/include/sata.h
index 8414e77e42b..868e89464f0 100644
--- a/include/sata.h
+++ b/include/sata.h
@@ -1,6 +1,7 @@
 #ifndef __SATA_H__
 #define __SATA_H__
-#include <part.h>
+
+#include <stdbool.h>
 
 int sata_probe(int devnum);
 int sata_remove(int devnum);
diff --git a/include/spl_gpio.h b/include/spl_gpio.h
index b33261a6485..a8aed4d77b9 100644
--- a/include/spl_gpio.h
+++ b/include/spl_gpio.h
@@ -9,7 +9,7 @@
 #ifndef __SPL_GPIO_H
 #define __SPL_GPIO_H
 
-#include <asm/gpio.h>
+#include <linux/types.h>
 
 /*
  * The functions listed here should be implemented in the SoC GPIO driver.
diff --git a/include/vsc9953.h b/include/vsc9953.h
index fd52c93044b..1a1455af4f9 100644
--- a/include/vsc9953.h
+++ b/include/vsc9953.h
@@ -8,8 +8,6 @@
 #ifndef _VSC9953_H_
 #define _VSC9953_H_
 
-#include <config.h>
-#include <miiphy.h>
 #include <asm/types.h>
 #include <linux/bitops.h>