diff --git a/arch/x86/bsp/Makefile b/arch/x86/bsp/Makefile
index f6c13cced9f..f38437c24e2 100644
--- a/arch/x86/bsp/Makefile
+++ b/arch/x86/bsp/Makefile
@@ -1,11 +1,5 @@
-ifeq (${CONFIG_BSP_GENERIC_PC},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
-EXTRA_AFLAGS +=-I$(srctree)/arch/x86/generic_pc
-endif
-
-ifeq (${CONFIG_BSP_QUARK},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86/quark
-endif
+EXTRA_CFLAGS +=-I$(srctree)/arch/x86/$(strip $(CONFIG_BSP_DIR))
+EXTRA_AFLAGS +=-I$(srctree)/arch/x86/$(strip $(CONFIG_BSP_DIR))
 
 obj-y = crt0.o sysFatalErrorHandler.o driver_static_irq_stubs.o
 
diff --git a/drivers/bluetooth/Makefile b/drivers/bluetooth/Makefile
index ccc071b9a53..7102431e701 100644
--- a/drivers/bluetooth/Makefile
+++ b/drivers/bluetooth/Makefile
@@ -1,19 +1,6 @@
 EXTRA_CFLAGS +=-I$(srctree)/include/drivers
+EXTRA_CFLAGS +=-I$(srctree)/arch/$(ARCH)
+EXTRA_CFLAGS +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR))
 
-ifeq (${CONFIG_BSP_GENERIC_PC},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
-endif
-
-ifeq (${CONFIG_BSP_QUARK},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
-endif
-
-ifeq (${CONFIG_BSP_FSL_FRDM_K64F},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/arm/fsl_frdm_k64f
-endif
-
-ifeq (${CONFIG_BSP_TI_LM3S6965},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/arm/ti_lm3s6965
-endif
 
 obj-y=uart.o
diff --git a/drivers/console/Makefile b/drivers/console/Makefile
index 3bfb80cd8bb..8312c2bb04b 100644
--- a/drivers/console/Makefile
+++ b/drivers/console/Makefile
@@ -1,21 +1,5 @@
 EXTRA_CFLAGS +=-I$(srctree)/include/drivers
-
-ifeq (${CONFIG_BSP_GENERIC_PC},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
-endif
-
-ifeq (${CONFIG_BSP_QUARK},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86/quark
-endif
-
-ifeq (${CONFIG_BSP_FSL_FRDM_K64F},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/arm/fsl_frdm_k64f
-endif
-
-ifeq (${CONFIG_BSP_TI_LM3S6965},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/arm/ti_lm3s6965
-endif
+EXTRA_CFLAGS +=-I$(srctree)/arch/$(ARCH)
+EXTRA_CFLAGS +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR))
 
 obj-y = uart_console.o
diff --git a/drivers/interrupt_controller/Makefile b/drivers/interrupt_controller/Makefile
index 8cc42a03325..6dc6c2c16f0 100644
--- a/drivers/interrupt_controller/Makefile
+++ b/drivers/interrupt_controller/Makefile
@@ -1,5 +1,5 @@
 EXTRA_CFLAGS +=-I$(srctree)/include/drivers
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86
+EXTRA_CFLAGS +=-I$(srctree)/arch/$(ARCH)
+EXTRA_CFLAGS +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR))
 
 obj-${CONFIG_PIC}${CONFIG_SHUTOFF_PIC} = i8259.o
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 1f79077618e..071a5f0b750 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -1,12 +1,6 @@
-ifeq (${CONFIG_BSP_GENERIC_PC},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
-endif
-
-ifeq (${CONFIG_BSP_QUARK},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86/quark
-endif
 EXTRA_CFLAGS += -I$(srctree)/include/drivers
 
+EXTRA_CFLAGS +=-I$(srctree)/arch/$(ARCH)
+EXTRA_CFLAGS +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR))
+
 obj-y = pci.o  pci_config.o  pci_interface.o
diff --git a/drivers/random/Makefile b/drivers/random/Makefile
index a48244bea1f..45886956f85 100644
--- a/drivers/random/Makefile
+++ b/drivers/random/Makefile
@@ -1 +1,4 @@
+EXTRA_CFLAGS +=-I$(srctree)/arch/$(ARCH)
+EXTRA_CFLAGS +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR))
+
 obj-y = rand32-timer.o
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index cca513ef7f7..e41b36ea017 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -1,22 +1,7 @@
 EXTRA_CFLAGS +=-I$(srctree)/include/drivers
+EXTRA_CFLAGS +=-I$(srctree)/arch/$(ARCH)
+EXTRA_CFLAGS +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR))
 
-ifeq (${CONFIG_BSP_GENERIC_PC},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
-endif
-
-ifeq (${CONFIG_BSP_QUARK},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86/quark
-endif
-
-ifeq (${CONFIG_BSP_FSL_FRDM_K64F},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/arm/fsl_frdm_k64f
-endif
-
-ifeq (${CONFIG_BSP_TI_LM3S6965},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/arm/ti_lm3s6965
-endif
 
 obj-$(CONFIG_DRV_NS16550) = ns16550.o
 obj-$(CONFIG_DRV_K20_UART)     = k20UartDrv.o
diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile
index 99f0fd82da0..954223ee025 100644
--- a/drivers/timer/Makefile
+++ b/drivers/timer/Makefile
@@ -1,9 +1,4 @@
-ifeq (${CONFIG_BSP_GENERIC_PC},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
-endif
-
-ifeq (${CONFIG_BSP_QUARK},y)
-EXTRA_CFLAGS +=-I$(srctree)/arch/x86/quark
-endif
+EXTRA_CFLAGS +=-I$(srctree)/arch/$(ARCH)
+EXTRA_CFLAGS +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_BSP_DIR))
 
 obj-$(CONFIG_PIT) = i8253.o