diff --git a/arch/arm/bsp/CortexM/Makefile b/arch/arm/bsp/CortexM/Makefile
index 679f69cd6f5..aab73dfc0ba 100644
--- a/arch/arm/bsp/CortexM/Makefile
+++ b/arch/arm/bsp/CortexM/Makefile
@@ -1,5 +1,5 @@
 EXTRA_CFLAGS +=-I$(srctree)/kernel/common/bsp
-EXTRA_CFLAGS +=-I$(srctree)/drivers
+EXTRA_CFLAGS +=-I$(srctree)/include/drivers
 
 ifeq (${CONFIG_BSP_FSL_FRDM_K64F},y)
 EXTRA_CFLAGS +=-I$(srctree)/arch/arm/fsl_frdm_k64f
diff --git a/arch/arm/bsp/Makefile b/arch/arm/bsp/Makefile
index 83ba20e4371..812c556df89 100644
--- a/arch/arm/bsp/Makefile
+++ b/arch/arm/bsp/Makefile
@@ -1,6 +1,6 @@
 EXTRA_CFLAGS +=-I$(srctree)/include/bsp
 EXTRA_CFLAGS +=-I$(srctree)/kernel/common/bsp
-EXTRA_CFLAGS +=-I$(srctree)/drivers
+EXTRA_CFLAGS +=-I$(srctree)/include/drivers
 
 ifeq (${CONFIG_BSP_FSL_FRDM_K64F},y)
 EXTRA_CFLAGS +=-I$(srctree)/arch/arm/fsl_frdm_k64f
diff --git a/arch/arm/fsl_frdm_k64f/Makefile b/arch/arm/fsl_frdm_k64f/Makefile
index c32e354ab8f..dc0e2b360c8 100644
--- a/arch/arm/fsl_frdm_k64f/Makefile
+++ b/arch/arm/fsl_frdm_k64f/Makefile
@@ -1,6 +1,6 @@
 EXTRA_CFLAGS +=-I$(srctree)/include/bsp
 EXTRA_CFLAGS +=-I$(srctree)/kernel/common/bsp
-EXTRA_CFLAGS +=-I$(srctree)/drivers
+EXTRA_CFLAGS +=-I$(srctree)/include/drivers
 EXTRA_CFLAGS +=-I$(srctree)/arch/arm/fsl_frdm_k64f
 
 EXTRA_AFLAGS := ${EXTRA_CFLAGS}
diff --git a/arch/arm/ti_lm3s6965/Makefile b/arch/arm/ti_lm3s6965/Makefile
index 060a4ea4caa..5cbb21a5b95 100644
--- a/arch/arm/ti_lm3s6965/Makefile
+++ b/arch/arm/ti_lm3s6965/Makefile
@@ -1,6 +1,6 @@
 EXTRA_CFLAGS +=-I$(srctree)/include/bsp
 EXTRA_CFLAGS +=-I$(srctree)/kernel/common/bsp
-EXTRA_CFLAGS +=-I$(srctree)/drivers
+EXTRA_CFLAGS +=-I$(srctree)/include/drivers
 EXTRA_CFLAGS +=-I$(srctree)/arch/arm/ti_lm3s6965
 
 EXTRA_AFLAGS := ${EXTRA_CFLAGS}
diff --git a/arch/arm/timer/Makefile b/arch/arm/timer/Makefile
index 71f14bbd594..8e245b3384b 100644
--- a/arch/arm/timer/Makefile
+++ b/arch/arm/timer/Makefile
@@ -1,6 +1,6 @@
 EXTRA_CFLAGS +=-I$(srctree)/include/bsp
 EXTRA_CFLAGS +=-I$(srctree)/kernel/common/bsp
-EXTRA_CFLAGS +=-I$(srctree)/drivers
+EXTRA_CFLAGS +=-I$(srctree)/include/drivers
 EXTRA_CFLAGS +=-I$(srctree)/arch/arm/fsl_frdm_k64f
 
 obj-y = systick.o
diff --git a/arch/x86/generic_pc/Makefile b/arch/x86/generic_pc/Makefile
index b53cd3cc8e9..7aa29a649c5 100644
--- a/arch/x86/generic_pc/Makefile
+++ b/arch/x86/generic_pc/Makefile
@@ -1,5 +1,5 @@
 EXTRA_CFLAGS +=-I$(srctree)/arch/x86
-EXTRA_CFLAGS +=-I$(srctree)/drivers
+EXTRA_CFLAGS +=-I$(srctree)/include/drivers
 EXTRA_AFLAGS := ${EXTRA_CFLAGS}
 
 obj-y = system.o
diff --git a/arch/x86/interrupt_controller/Makefile b/arch/x86/interrupt_controller/Makefile
index cfdb275a1ba..4a6f3c6ee0b 100644
--- a/arch/x86/interrupt_controller/Makefile
+++ b/arch/x86/interrupt_controller/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS +=-I$(srctree)/drivers
+EXTRA_CFLAGS +=-I$(srctree)/include/drivers
 EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
 EXTRA_CFLAGS +=-I$(srctree)/arch/x86
 
diff --git a/arch/x86/quark/Makefile b/arch/x86/quark/Makefile
index ff413133e82..a856ec5bb60 100644
--- a/arch/x86/quark/Makefile
+++ b/arch/x86/quark/Makefile
@@ -1,6 +1,6 @@
 EXTRA_CFLAGS += -I$(srctree)/include/bsp
 EXTRA_CFLAGS += -I$(srctree)/kernel/common/bsp
-EXTRA_CFLAGS += -I$(srctree)/drivers
+EXTRA_CFLAGS += -I$(srctree)/include/drivers
 
 EXTRA_AFLAGS := ${EXTRA_CFLAGS}
 
diff --git a/arch/x86/timer/Makefile b/arch/x86/timer/Makefile
index cdbce5fdbe8..167717d1663 100644
--- a/arch/x86/timer/Makefile
+++ b/arch/x86/timer/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS +=-I$(srctree)/drivers
+EXTRA_CFLAGS +=-I$(srctree)/include/drivers
 EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
 EXTRA_CFLAGS +=-I$(srctree)/arch/x86
 
diff --git a/drivers/console/Makefile b/drivers/console/Makefile
index c7460227129..3bfb80cd8bb 100644
--- a/drivers/console/Makefile
+++ b/drivers/console/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS +=-I$(srctree)/drivers
+EXTRA_CFLAGS +=-I$(srctree)/include/drivers
 
 ifeq (${CONFIG_BSP_GENERIC_PC},y)
 EXTRA_CFLAGS +=-I$(srctree)/arch/x86
diff --git a/drivers/interrupt_controller/Makefile b/drivers/interrupt_controller/Makefile
index 629b8ca5d1a..8cc42a03325 100644
--- a/drivers/interrupt_controller/Makefile
+++ b/drivers/interrupt_controller/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS +=-I$(srctree)/drivers
+EXTRA_CFLAGS +=-I$(srctree)/include/drivers
 EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
 EXTRA_CFLAGS +=-I$(srctree)/arch/x86
 
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 0b1281d8c88..cca513ef7f7 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS +=-I$(srctree)/drivers
+EXTRA_CFLAGS +=-I$(srctree)/include/drivers
 
 ifeq (${CONFIG_BSP_GENERIC_PC},y)
 EXTRA_CFLAGS +=-I$(srctree)/arch/x86