diff --git a/bsp/imx6ul/drivers/board.h b/bsp/imx6ul/drivers/board.h
index 3e98e302c26ab31220f4033b142aa968bfe86220..76593e2f086ed71ed14a32a680cc64e2bae20abd 100644
--- a/bsp/imx6ul/drivers/board.h
+++ b/bsp/imx6ul/drivers/board.h
@@ -13,6 +13,7 @@
 
 #include <registers.h>
 #include <irq_numbers.h>
+#include "imx6ul.h"
 
 #define CONFIG_MX6
 #define CONFIG_MX6UL
diff --git a/bsp/imx6ul/platform/cpu/platform.h b/bsp/imx6ul/drivers/imx6ul.h
similarity index 96%
rename from bsp/imx6ul/platform/cpu/platform.h
rename to bsp/imx6ul/drivers/imx6ul.h
index f6a3995bc5279f7994d2e8dc2d0eb13ce3918a8b..7f0db1354fbf9e3c2616e887b9f4aa28ef581cd5 100644
--- a/bsp/imx6ul/platform/cpu/platform.h
+++ b/bsp/imx6ul/drivers/imx6ul.h
@@ -7,8 +7,8 @@
  * Date           Author       Notes
  * 2018-03-22     quanzhao     first version
  */
-#ifndef __PLATFORM_H__
-#define __PLATFORM_H__
+#ifndef __IMX6UL_H__
+#define __IMX6UL_H__
 
 #include <rthw.h>
 #include <rtthread.h>
@@ -93,4 +93,4 @@ rt_inline void disable_interrupt(uint32_t irq_id, uint32_t cpu_id)
     rt_hw_interrupt_mask(irq_id);
 }
 
-#endif  /* __PLATFORM_H__ */
+#endif  /* __IMX6UL_H__ */
diff --git a/bsp/qemu-vexpress-a9/drivers/board.h b/bsp/qemu-vexpress-a9/drivers/board.h
index 2d3d87fdbb5a70d6a1a643ca0bc34ea0c38e2026..ccbe0f8c9e4c09c235d7a4bf117d9ef3f100aaea 100644
--- a/bsp/qemu-vexpress-a9/drivers/board.h
+++ b/bsp/qemu-vexpress-a9/drivers/board.h
@@ -16,6 +16,7 @@
 #define __BOARD_H__
 
 #include <realview.h>
+#include "vexpress_a9.h"
 
 #if defined(__CC_ARM)
 extern int Image$$RW_IRAM1$$ZI$$Limit;
diff --git a/bsp/qemu-vexpress-a9/platform/cpu/platform.h b/bsp/qemu-vexpress-a9/drivers/vexpress_a9.h
similarity index 89%
rename from bsp/qemu-vexpress-a9/platform/cpu/platform.h
rename to bsp/qemu-vexpress-a9/drivers/vexpress_a9.h
index 2d5cc5f61b6cd24b186213ad64e958158407a8fc..a6467973c5a13c248a088cbb0fad72e640a2b48e 100644
--- a/bsp/qemu-vexpress-a9/platform/cpu/platform.h
+++ b/bsp/qemu-vexpress-a9/drivers/vexpress_a9.h
@@ -8,8 +8,8 @@
  * 2018-03-22     quanzhao     first version
  */
 
-#ifndef __PLATFORM_H__
-#define __PLATFORM_H__
+#ifndef __VEXPRESS_A9_H__
+#define __VEXPRESS_A9_H__
 
 /* for 'rt_inline' */
 #include <rtdef.h>
@@ -34,4 +34,4 @@ rt_inline rt_uint32_t platform_get_gic_cpu_base(void)
 
 #define GIC_ACK_INTID_MASK  0x000003ff
 
-#endif  /* __PLATFORM_H__ */
+#endif  /* __VEXPRESS_A9_H__ */
diff --git a/bsp/qemu-vexpress-a9/platform/SConscript b/bsp/qemu-vexpress-a9/platform/SConscript
deleted file mode 100644
index 1b580929dac4f7d540c3484014fc4070c5b390cb..0000000000000000000000000000000000000000
--- a/bsp/qemu-vexpress-a9/platform/SConscript
+++ /dev/null
@@ -1,13 +0,0 @@
-from building import *
-
-cwd = GetCurrentDir()
-src = Split('''
-''')
-
-CPPPATH = [ cwd + '/cpu',
-cwd + '/include',
-]
-
-group = DefineGroup('Platform', src, depend = [''], CPPPATH = CPPPATH)
-
-Return('group')
diff --git a/libcpu/arm/cortex-a/gic.h b/libcpu/arm/cortex-a/gic.h
index 6d86dd31e00b746249fbbe4c2d2eddd0b786c0e8..a16d0467fb31d87a6a01baf35478d2acf4990737 100644
--- a/libcpu/arm/cortex-a/gic.h
+++ b/libcpu/arm/cortex-a/gic.h
@@ -12,7 +12,7 @@
 #define __GIC_H__
 
 #include <rthw.h>
-#include <platform.h>
+#include <board.h>
 
 int arm_gic_dist_init(rt_uint32_t index, rt_uint32_t dist_base, int irq_start);
 int arm_gic_cpu_init(rt_uint32_t index, rt_uint32_t cpu_base);
diff --git a/libcpu/arm/cortex-a/interrupt.h b/libcpu/arm/cortex-a/interrupt.h
index bff29d402de23fda65b1fb9e1b550062f426fa94..31f79cc66e24911783c201b8dcbbede04e45540b 100644
--- a/libcpu/arm/cortex-a/interrupt.h
+++ b/libcpu/arm/cortex-a/interrupt.h
@@ -12,7 +12,7 @@
 #define __INTERRUPT_H__
 
 #include <rthw.h>
-#include <platform.h>
+#include <board.h>
 
 #define INT_IRQ     0x00
 #define INT_FIQ     0x01
diff --git a/libcpu/arm/cortex-a/trap.c b/libcpu/arm/cortex-a/trap.c
index 54628933ff2a51a5cf89771da67f90424c279fb8..a25f6ac86239bfd008951a75c30101162714bb92 100644
--- a/libcpu/arm/cortex-a/trap.c
+++ b/libcpu/arm/cortex-a/trap.c
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rthw.h>
-#include <platform.h>
+#include <board.h>
 
 #include "armv7.h"
 #include "interrupt.h"