diff --git a/bsp/CME_M7/applications/application.c b/bsp/CME_M7/applications/application.c
index 0819060b24a149743c61d0c7b0761c987d2961df..13526c579321b7ee0109678f4c3c6f6cede2e61e 100644
--- a/bsp/CME_M7/applications/application.c
+++ b/bsp/CME_M7/applications/application.c
@@ -15,8 +15,6 @@
 #include <board.h>
 #include <rtthread.h>
 
-#include <components.h>
-
 void rt_init_thread_entry(void* parameter)
 {
     rt_components_init();
diff --git a/bsp/CME_M7/drivers/board.c b/bsp/CME_M7/drivers/board.c
index 499c3f1f82b09fe4034921612fce85bbe4035d62..42ff994b4c1e2e161c79bc7608fe88614c753b5f 100644
--- a/bsp/CME_M7/drivers/board.c
+++ b/bsp/CME_M7/drivers/board.c
@@ -14,7 +14,6 @@
 
 #include <rthw.h>
 #include <rtthread.h>
-#include <components.h>
 
 #include "board.h"
 
diff --git a/bsp/beaglebone/applications/application.c b/bsp/beaglebone/applications/application.c
index 540e31bc60c113d53484f8fdadd9e5c431898346..04a09d081eeea8b924f70106d739e13fb9010733 100644
--- a/bsp/beaglebone/applications/application.c
+++ b/bsp/beaglebone/applications/application.c
@@ -14,7 +14,6 @@
 
 #include <stdlib.h>
 #include <rtthread.h>
-#include <components.h>
 
 #ifdef RT_USING_GDB
 #include <gdb_stub.h>
diff --git a/bsp/beaglebone/applications/board.c b/bsp/beaglebone/applications/board.c
index 1750dd9e172ca58eafff9d4cbe27118276b5c12a..89c8c263ab5c719c44fd54dff5feb860cc7c02ba 100644
--- a/bsp/beaglebone/applications/board.c
+++ b/bsp/beaglebone/applications/board.c
@@ -14,7 +14,6 @@
 
 #include <rthw.h>
 #include <rtthread.h>
-#include <components.h>
 
 #include "board.h"
 #include <interrupt.h>
diff --git a/bsp/fh8620/applications/main.c b/bsp/fh8620/applications/main.c
index dd6172051ba69a16550d640584c00eb461853d8a..fe690504d1d0d674d0d7c07efb753f27996ff4fd 100644
--- a/bsp/fh8620/applications/main.c
+++ b/bsp/fh8620/applications/main.c
@@ -24,7 +24,6 @@
  * Date           Author       Notes
  */
 #include <rtthread.h>
-#include <components.h>
 
 void init_thread(void *parameter)
 {
diff --git a/bsp/imx6sx/cortex-a9/applications/application.c b/bsp/imx6sx/cortex-a9/applications/application.c
index 629cd9ddbbc0e8188c61ac0b3626e680dd1aa937..7b409b2b25cfd02127b56ab835e19c755c02e763 100644
--- a/bsp/imx6sx/cortex-a9/applications/application.c
+++ b/bsp/imx6sx/cortex-a9/applications/application.c
@@ -13,7 +13,6 @@
  */
 
 #include <rtthread.h>
-#include <components.h>
 
 #include <sdk.h>
 #include <core/ccm_pll.h>
diff --git a/bsp/imx6sx/cortex-a9/drivers/board.c b/bsp/imx6sx/cortex-a9/drivers/board.c
index c75df729a9c5802627445088e16da8ce79dd9ad0..1ac040d7e4c157e6c12bbc5067fcaab7e74cacc8 100644
--- a/bsp/imx6sx/cortex-a9/drivers/board.c
+++ b/bsp/imx6sx/cortex-a9/drivers/board.c
@@ -14,7 +14,6 @@
 
 #include <rthw.h>
 #include <rtthread.h>
-#include <components.h>
 
 #include "board.h"
 
diff --git a/bsp/lpc408x/applications/application.c b/bsp/lpc408x/applications/application.c
index b77caa220c501e821fda1541d413e034b699d489..d8045587a610acd8634294878fd4408df65ab030 100644
--- a/bsp/lpc408x/applications/application.c
+++ b/bsp/lpc408x/applications/application.c
@@ -19,10 +19,6 @@
 #include <finsh.h>
 #endif
 
-#ifdef RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
-
 /* thread phase init */
 void rt_init_thread_entry(void *parameter)
 {
diff --git a/bsp/lpc408x/drivers/drv_lpccan.c b/bsp/lpc408x/drivers/drv_lpccan.c
index 790d53be10259f4f9b969eb7d0940acedbc0d132..037a4cf2ae3170ff07c6f6bfde3b2aa9752d59ad 100644
--- a/bsp/lpc408x/drivers/drv_lpccan.c
+++ b/bsp/lpc408x/drivers/drv_lpccan.c
@@ -15,9 +15,6 @@
 #include <rtdevice.h>
 #include <board.h>
 #include <drv_lpccan.h>
-#ifdef RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
 
 #ifdef RT_USING_CAN
 
diff --git a/bsp/lpc5410x/applications/board.c b/bsp/lpc5410x/applications/board.c
index e45ecbd9e97ec4c63265d25169f77f0150fd0c78..c47e02c0c1f6b0af270b88148ff1dc8e8516a5f1 100644
--- a/bsp/lpc5410x/applications/board.c
+++ b/bsp/lpc5410x/applications/board.c
@@ -20,10 +20,6 @@
 #include "board.h"
 #include "drv_uart.h"
 
-#ifdef RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
-
 /**
  * This is the timer interrupt service routine.
  *
diff --git a/bsp/lpc54608-LPCXpresso/applications/application.c b/bsp/lpc54608-LPCXpresso/applications/application.c
index f9854220f5eb42564cde7c9cc9fca44197861e7b..d6949b3f47262e7805c0af42f0ef04195c45b7d2 100644
--- a/bsp/lpc54608-LPCXpresso/applications/application.c
+++ b/bsp/lpc54608-LPCXpresso/applications/application.c
@@ -27,10 +27,6 @@
 #include <finsh.h>
 #endif
 
-#ifdef RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
-
 /* thread phase init */
 void rt_init_thread_entry(void *parameter)
 {
diff --git a/bsp/lpc54608-LPCXpresso/drivers/board.c b/bsp/lpc54608-LPCXpresso/drivers/board.c
index 2ad67702c89a0c7a78dd6863635de43f5c75da85..273d9798659f326d87327a5f1e6926c62b0865db 100644
--- a/bsp/lpc54608-LPCXpresso/drivers/board.c
+++ b/bsp/lpc54608-LPCXpresso/drivers/board.c
@@ -23,10 +23,6 @@
 #include "drv_uart.h"
 #include "drv_sdram.h"
 
-#ifdef RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
-
 /**
  * This is the timer interrupt service routine.
  *
diff --git a/bsp/ls1bdev/applications/application.c b/bsp/ls1bdev/applications/application.c
index db345a1bb6c853695aff41d1848ff06017738b9f..3daf489a3eca61454e68642597dea60694727098 100644
--- a/bsp/ls1bdev/applications/application.c
+++ b/bsp/ls1bdev/applications/application.c
@@ -16,10 +16,6 @@
 #include <rtthread.h>
 #include <ls1b.h>
 
-#ifdef RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
-
 #ifdef RT_USING_RTGUI
 #include <rtgui/rtgui.h>
 extern void rt_hw_dc_init(void);
diff --git a/bsp/ls1cdev/applications/application.c b/bsp/ls1cdev/applications/application.c
index 61672edfca26ada88f7d3650668a7a18c5530e55..97f3f5d7a546c964e938cae68d59a9b82762e8d3 100644
--- a/bsp/ls1cdev/applications/application.c
+++ b/bsp/ls1cdev/applications/application.c
@@ -15,7 +15,6 @@
  */
 
 #include <rtthread.h>
-#include <components.h>
 #include "net/synopGMAC.h"
 #include <lwip/api.h>
 
diff --git a/bsp/ls1cdev/drivers/net/synopGMAC.c b/bsp/ls1cdev/drivers/net/synopGMAC.c
index 930967d7989ab1a4af3babaf6568fe1f24dd55e1..2b15f87eff33c5e10c3b28d8a7a261c38a2b16d4 100644
--- a/bsp/ls1cdev/drivers/net/synopGMAC.c
+++ b/bsp/ls1cdev/drivers/net/synopGMAC.c
@@ -24,7 +24,6 @@
 
 
 #include <rtthread.h>
-#include <components.h>
 #include <rtdef.h>
 //#include <lwip/pbuf.h>
 
diff --git a/bsp/mb9bf506r/applications/application.c b/bsp/mb9bf506r/applications/application.c
index 15877dd151fa65bb0c32f4a3bcb3ef63e14d3aae..004822bf75034d15d55b3cecf8bdd2efc788dc9f 100644
--- a/bsp/mb9bf506r/applications/application.c
+++ b/bsp/mb9bf506r/applications/application.c
@@ -22,10 +22,6 @@
 #include "board.h"
 #include "led.h"
 
-#ifdef RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
-
 #ifdef RT_USING_DFS
 /* dfs init */
 #include <dfs_init.h>
diff --git a/bsp/mb9bf568r/applications/application.c b/bsp/mb9bf568r/applications/application.c
index f95b06489d82e5e761107c0d1340ef07d20556ff..462207672e81b7bd51b6e2e143fb8f56f5c5d88a 100644
--- a/bsp/mb9bf568r/applications/application.c
+++ b/bsp/mb9bf568r/applications/application.c
@@ -20,10 +20,6 @@
 #include <rtthread.h>
 #include "board.h"
 
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif  /* RT_USING_COMPONENTS_INIT */
-
 void rt_init_thread_entry(void *parameter)
 {
 #ifdef RT_USING_COMPONENTS_INIT
diff --git a/bsp/mb9bf568r/drivers/board.c b/bsp/mb9bf568r/drivers/board.c
index be74fc909cf9987e3fa14ace79f2a400f1575966..2dbc219f28bad9b32b05e7a5fea5edfb230b3a4f 100644
--- a/bsp/mb9bf568r/drivers/board.c
+++ b/bsp/mb9bf568r/drivers/board.c
@@ -19,10 +19,6 @@
 
 #include "serial.h"
 
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif  /* RT_USING_COMPONENTS_INIT */
-
 /**
  * @addtogroup FM4
  */
diff --git a/bsp/mb9bf618s/applications/application.c b/bsp/mb9bf618s/applications/application.c
index ac377e6b53b953591daeefbc2679488e798b460c..56187b68c2d5e2742f96159331d9a5e159cc2846 100644
--- a/bsp/mb9bf618s/applications/application.c
+++ b/bsp/mb9bf618s/applications/application.c
@@ -20,10 +20,6 @@
 #include <rtthread.h>
 #include "board.h"
 
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif  /* RT_USING_COMPONENTS_INIT */
-
 void rt_init_thread_entry(void *parameter)
 {
 #ifdef RT_USING_COMPONENTS_INIT
diff --git a/bsp/mb9bf618s/drivers/board.c b/bsp/mb9bf618s/drivers/board.c
index 53ec7e7a7075e9f02bca05c3382591b4773d9b7c..12345bbea533a3a2d875b8d005605269ef1373ed 100644
--- a/bsp/mb9bf618s/drivers/board.c
+++ b/bsp/mb9bf618s/drivers/board.c
@@ -19,10 +19,6 @@
 
 #include "serial.h"
 
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif  /* RT_USING_COMPONENTS_INIT */
-
 /**
  * @addtogroup FM3
  */
diff --git a/bsp/nuvoton_m05x/applications/application.c b/bsp/nuvoton_m05x/applications/application.c
index 652c12a1a0a17e18b97ccfb6c60b039573861552..8495234fb1121058713700a1565efc54888ccb7c 100644
--- a/bsp/nuvoton_m05x/applications/application.c
+++ b/bsp/nuvoton_m05x/applications/application.c
@@ -21,9 +21,6 @@
 
 #include <board.h>
 #include <rtthread.h>
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif  /* RT_USING_COMPONENTS_INIT */
 
 #include "led.h"
 
diff --git a/bsp/nuvoton_m05x/drivers/board.c b/bsp/nuvoton_m05x/drivers/board.c
index 15beaa6d853583a70c1bd88d47f01dfc478df7d6..a4a85ffc41d73540846e2b343092d7793d408598 100644
--- a/bsp/nuvoton_m05x/drivers/board.c
+++ b/bsp/nuvoton_m05x/drivers/board.c
@@ -16,10 +16,7 @@
 #include <rtthread.h>
 #include "board.h"
 #include "usart.h"
-/* RT_USING_COMPONENTS_INIT */
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
+
 /**
  * @addtogroup NUVOTON_M05X
  */
diff --git a/bsp/nuvoton_m05x/drivers/led.c b/bsp/nuvoton_m05x/drivers/led.c
index 6f2c9d05b13124077f1234e075e5a68922a53115..42172ab03c010c12d7c777a2b353e56778c2263a 100644
--- a/bsp/nuvoton_m05x/drivers/led.c
+++ b/bsp/nuvoton_m05x/drivers/led.c
@@ -13,10 +13,6 @@
  */
 
 #include "led.h"
-/* RT_USING_COMPONENTS_INIT */
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
 
 /*
     LED: P3.6
diff --git a/bsp/nuvoton_m451/applications/application.c b/bsp/nuvoton_m451/applications/application.c
index d018b3bff12299f2e1d08ef32e8fa92b71a2bbe7..d941a9bf617fc25ceb30d0afa16f8ee3a1f74d03 100644
--- a/bsp/nuvoton_m451/applications/application.c
+++ b/bsp/nuvoton_m451/applications/application.c
@@ -21,9 +21,6 @@
 
 #include <board.h>
 #include <rtthread.h>
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif  /* RT_USING_COMPONENTS_INIT */
 
 #include "led.h"
 
diff --git a/bsp/nuvoton_m451/drivers/board.c b/bsp/nuvoton_m451/drivers/board.c
index dd3b0ba504a5820a9b50f7b02b449341391b67b4..c3361b98234f5ea8df8bcd3f5bad0bac3f8fa35c 100644
--- a/bsp/nuvoton_m451/drivers/board.c
+++ b/bsp/nuvoton_m451/drivers/board.c
@@ -16,10 +16,7 @@
 #include <rtthread.h>
 #include "board.h"
 #include "usart.h"
-/* RT_USING_COMPONENTS_INIT */
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
+
 /**
  * @addtogroup NUVOTON_M451
  */
diff --git a/bsp/nuvoton_m451/drivers/led.c b/bsp/nuvoton_m451/drivers/led.c
index 9a0621d2c4aa39f09111e89b415085cdb937d9b6..0f5175721b25a27c23566c68cdad5598a37820f1 100644
--- a/bsp/nuvoton_m451/drivers/led.c
+++ b/bsp/nuvoton_m451/drivers/led.c
@@ -13,10 +13,6 @@
  */
 
 #include "led.h"
-/* RT_USING_COMPONENTS_INIT */
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
 
 /*
     LED: PC9 for M451 SDK
diff --git a/bsp/nv32f100x/app/src/ledapp.c b/bsp/nv32f100x/app/src/ledapp.c
index a52b0eb8a946110c8087787f37b45b6470356586..2464f0e34be0f95c91619c9844b54f485d5e9347 100644
--- a/bsp/nv32f100x/app/src/ledapp.c
+++ b/bsp/nv32f100x/app/src/ledapp.c
@@ -18,10 +18,6 @@
 #include "board.h"
 #include <rtthread.h>
 
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif  /* RT_USING_COMPONENTS_INIT */
-
 #include "gpio.h"
 
 
diff --git a/bsp/nv32f100x/board/src/board.c b/bsp/nv32f100x/board/src/board.c
index 23ec89f11482b61a424aafd9e53cb37ef3353dd5..8c753621a989bf0eb4c5355342943a6e4bf86718 100644
--- a/bsp/nv32f100x/board/src/board.c
+++ b/bsp/nv32f100x/board/src/board.c
@@ -19,12 +19,6 @@
 #include "drv_uart.h"
 #include "nv32.h"
 
-/* RT_USING_COMPONENTS_INIT */
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
-
-
 #define portNVIC_SYSTICK_CTRL           ( ( volatile uint32_t *) 0xe000e010 )
 #define portNVIC_SYSTICK_LOAD           ( ( volatile uint32_t *) 0xe000e014 )
 #define portNVIC_INT_CTRL               ( ( volatile uint32_t *) 0xe000ed04 )
diff --git a/bsp/realview-a8/applications/application.c b/bsp/realview-a8/applications/application.c
index 1b7cb790a308e220b4c6f5847bd761252785f868..072cd6d98fbe41afe07d8176f9ea8b62c799238b 100644
--- a/bsp/realview-a8/applications/application.c
+++ b/bsp/realview-a8/applications/application.c
@@ -13,7 +13,6 @@
  */
 
 #include <rtthread.h>
-#include <components.h>
 
 void init_thread(void* parameter)
 {
diff --git a/bsp/realview-a8/drivers/board.c b/bsp/realview-a8/drivers/board.c
index fd64075456cbbf8a38cf38cab7695854c39c27e4..7a5f80e454609b8b2e1ef3312a66b4b9566e1dd2 100644
--- a/bsp/realview-a8/drivers/board.c
+++ b/bsp/realview-a8/drivers/board.c
@@ -14,7 +14,6 @@
 
 #include <rthw.h>
 #include <rtthread.h>
-#include <components.h>
 
 #include "board.h"
 
diff --git a/bsp/rx/applications/application.c b/bsp/rx/applications/application.c
index 92ecaad7232ac9c9d28943eb510a6f435e64651a..4a6e250429a5e1e61a90b46d83eb5cdace09f1f2 100644
--- a/bsp/rx/applications/application.c
+++ b/bsp/rx/applications/application.c
@@ -21,10 +21,6 @@
 #include <board.h>
 #include <rtthread.h>
 
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif  /* RT_USING_COMPONENTS_INIT */
-
 #ifdef RT_USING_DFS
 /* dfs filesystem:ELM filesystem init */
 #include <dfs_elm.h>
diff --git a/bsp/stm32f0x/applications/application.c b/bsp/stm32f0x/applications/application.c
index 1b56678d95d5759c145f8933bb7a8557cf15dbb9..c0fb3b4b2f327aff41fdae2a662cfcf8cf6dc131 100644
--- a/bsp/stm32f0x/applications/application.c
+++ b/bsp/stm32f0x/applications/application.c
@@ -22,9 +22,6 @@
 
 #include <board.h>
 #include <rtthread.h>
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif  /* RT_USING_COMPONENTS_INIT */
 
 #include "led.h"
 
diff --git a/bsp/stm32f0x/drivers/board.c b/bsp/stm32f0x/drivers/board.c
index 5f25775b5dc52c308062fcb1b1e87e6e2aa52e5c..5e9fc2add5982198917d1dd196698f54a188130d 100644
--- a/bsp/stm32f0x/drivers/board.c
+++ b/bsp/stm32f0x/drivers/board.c
@@ -18,10 +18,7 @@
 
 #include "board.h"
 #include "usart.h"
-/* RT_USING_COMPONENTS_INIT */
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
+
 /**
  * @addtogroup STM32
  */
diff --git a/bsp/stm32f0x/drivers/led.c b/bsp/stm32f0x/drivers/led.c
index 2a62917521e4d5b7b86c252e628fe50fabec4ae2..15776cb457d7040676f6e3b08359c33cb653b55c 100644
--- a/bsp/stm32f0x/drivers/led.c
+++ b/bsp/stm32f0x/drivers/led.c
@@ -13,10 +13,6 @@
  */
 
 #include "led.h"
-/* RT_USING_COMPONENTS_INIT */
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
 
 /*
 LED_GREEN: PC8
diff --git a/bsp/stm32f10x/applications/application.c b/bsp/stm32f10x/applications/application.c
index 84aa502325f3677c180b202140ad79deeb03d3f2..774940de465af8011b7341b32285065e8cbfb6ef 100644
--- a/bsp/stm32f10x/applications/application.c
+++ b/bsp/stm32f10x/applications/application.c
@@ -21,10 +21,6 @@
 #include <board.h>
 #include <rtthread.h>
 
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif  /* RT_USING_COMPONENTS_INIT */
-
 #ifdef RT_USING_DFS
 /* dfs filesystem:ELM filesystem init */
 #include <dfs_elm.h>
diff --git a/bsp/stm32f10x/drivers/board.c b/bsp/stm32f10x/drivers/board.c
index d8374068c879605abf0e1986d4af832dc7eabd41..f2525b718ed340651eb9e7891e1deba4eca0437c 100644
--- a/bsp/stm32f10x/drivers/board.c
+++ b/bsp/stm32f10x/drivers/board.c
@@ -21,10 +21,6 @@
 #include "board.h"
 #include "usart.h"
 
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif  /* RT_USING_COMPONENTS_INIT */
-
 /**
  * @addtogroup STM32
  */
diff --git a/bsp/stm32f10x/drivers/bxcan.c b/bsp/stm32f10x/drivers/bxcan.c
index 876848df4cc928647f68de7a6dbe9fbfe27ae0d3..a3b717b786ff7942b909358540217755e8df4479 100644
--- a/bsp/stm32f10x/drivers/bxcan.c
+++ b/bsp/stm32f10x/drivers/bxcan.c
@@ -20,10 +20,6 @@
 #undef RT_USING_CAN
 #endif
 
-#ifdef RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
-
 #ifdef RT_USING_CAN
 
 #ifndef STM32F10X_CL
diff --git a/bsp/stm32l072/app/application.c b/bsp/stm32l072/app/application.c
index 5a0cdf4a9e17ebfb1dd986649f83affa765a2332..f0e9932a65d4bea642ffe871666e81b67443edf4 100644
--- a/bsp/stm32l072/app/application.c
+++ b/bsp/stm32l072/app/application.c
@@ -23,9 +23,6 @@
 #include <rtdevice.h>
 #include "board.h"
 #include <rtthread.h>
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif  /* RT_USING_COMPONENTS_INIT */
 
 static void rt_init_thread_entry(void* parameter)
 {
diff --git a/bsp/stm32l072/app/ledapp.c b/bsp/stm32l072/app/ledapp.c
index 89049217b80eb2adf7e074fa585b55cc92b34565..2bf416adc5cdbabe663dde6ad0858d2eeb92ad1b 100644
--- a/bsp/stm32l072/app/ledapp.c
+++ b/bsp/stm32l072/app/ledapp.c
@@ -3,9 +3,7 @@
 #include <rtdevice.h>
 #include "board.h"
 #include <rtthread.h>
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif  /* RT_USING_COMPONENTS_INIT */
+
 /* led thread entry */
 #define PINRX 22
 #define PINTX 21
diff --git a/bsp/stm32l072/board/board.c b/bsp/stm32l072/board/board.c
index e12b284cb13e3507bdf6bd7372e7049b1b4549fe..04e360dd0505a34c5ef88419bc684da03baadf2b 100644
--- a/bsp/stm32l072/board/board.c
+++ b/bsp/stm32l072/board/board.c
@@ -18,10 +18,7 @@
 
 #include "board.h"
 #include "usart.h"
-/* RT_USING_COMPONENTS_INIT */
-#ifdef  RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
+
 /**
  * @addtogroup STM32
  */
diff --git a/bsp/stm32l072/board/drv_spi.c b/bsp/stm32l072/board/drv_spi.c
index 1c5c3902d587039e36311361984389e99d0dc008..ac1311937d12e962b09bc7ab42fe2d4356c82bf2 100644
--- a/bsp/stm32l072/board/drv_spi.c
+++ b/bsp/stm32l072/board/drv_spi.c
@@ -18,10 +18,6 @@
 #include <rtdevice.h>
 #include <board.h>
 
-#ifdef RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
-
 #define SPIRXEVENT 0x01
 #define SPITXEVENT 0x02
 
diff --git a/bsp/stm32l072/board/gpio.c b/bsp/stm32l072/board/gpio.c
index 9e44ceebcde3288eb4d8759119dacabee95aa4cb..30295eff18463d39a2a3178158da65196eb0a3e7 100644
--- a/bsp/stm32l072/board/gpio.c
+++ b/bsp/stm32l072/board/gpio.c
@@ -14,9 +14,7 @@
 #include <rthw.h>
 #include <rtdevice.h>
 #include <board.h>
-#ifdef RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
+
 #ifdef RT_USING_PIN
 
 #include "stm32l0xx.h"
diff --git a/bsp/tm4c129x/applications/application.c b/bsp/tm4c129x/applications/application.c
index 0ed8ab21d49af06ffd62d42ae19758dc90dca969..26c6460750cfbeeb25fa00dc3e3557af3166f8b6 100644
--- a/bsp/tm4c129x/applications/application.c
+++ b/bsp/tm4c129x/applications/application.c
@@ -13,7 +13,6 @@
  */
 
 #include <rtthread.h>
-#include <components.h>
 
 /* thread phase init */
 void rt_init_thread_entry(void *parameter)
diff --git a/bsp/tm4c129x/applications/board.c b/bsp/tm4c129x/applications/board.c
index b1837fac53a6d0da1aea0f1594b87f2ac676ad6a..6c64a8c141b4b15b6d47761057316601dc54b576 100644
--- a/bsp/tm4c129x/applications/board.c
+++ b/bsp/tm4c129x/applications/board.c
@@ -15,7 +15,6 @@
 
 #include <rthw.h>
 #include <rtthread.h>
-#include <components.h>
 #include "board.h"
 
 
diff --git a/bsp/tm4c129x/drivers/drv_eth.c b/bsp/tm4c129x/drivers/drv_eth.c
index 1076aea4059bcb3343bb6f3ba681a7e0265971d2..baa46f1f01447e8e4791540c304a69610ada103e 100644
--- a/bsp/tm4c129x/drivers/drv_eth.c
+++ b/bsp/tm4c129x/drivers/drv_eth.c
@@ -146,8 +146,6 @@ extern void lwIPHostGetTime(u32_t *time_s, u32_t *time_ns);
 #include "lwipopts.h"
 #include "drv_eth.h"
 
-#include <components.h>
-
 /**
  * A structure used to keep track of driver state and error counts.
  */
diff --git a/bsp/tm4c129x/drivers/drv_uart.c b/bsp/tm4c129x/drivers/drv_uart.c
index 73652789914bd092fbdd19d8ee8bc055159de5e4..7b8153d4c60821245e4906c93d4f288622b47f4d 100644
--- a/bsp/tm4c129x/drivers/drv_uart.c
+++ b/bsp/tm4c129x/drivers/drv_uart.c
@@ -18,7 +18,6 @@
 #include <rtdevice.h>
 
 #include "board.h"
-#include <components.h>
 
 #include "inc/hw_memmap.h"
 #include "driverlib/sysctl.h"
diff --git a/bsp/zynq7000/applications/application.c b/bsp/zynq7000/applications/application.c
index ad89c80751f085236387110a33fcf5847c9c96a6..0e4bf433d40ffe66c42577804e2f7b22c4130996 100644
--- a/bsp/zynq7000/applications/application.c
+++ b/bsp/zynq7000/applications/application.c
@@ -19,9 +19,7 @@
  */
 
 #include <rtthread.h>
-#ifdef RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
+
 #include <cp15.h>
 
 /* thread phase init */
diff --git a/bsp/zynq7000/drivers/board.c b/bsp/zynq7000/drivers/board.c
index 1df6199b6097fe960c03d59488313d835f66b704..5696fbbf2c453c26bc6fe8000df8a57e2035a4fe 100644
--- a/bsp/zynq7000/drivers/board.c
+++ b/bsp/zynq7000/drivers/board.c
@@ -20,7 +20,6 @@
 
 #include <rthw.h>
 #include <rtthread.h>
-#include <components.h>
 
 #include "board.h"