diff --git a/bsp/Infineon/libraries/HAL_Drivers/drv_sdcard.c b/bsp/Infineon/libraries/HAL_Drivers/drv_sdcard.c
index 9873b3a893..a7eb1ee603 100644
--- a/bsp/Infineon/libraries/HAL_Drivers/drv_sdcard.c
+++ b/bsp/Infineon/libraries/HAL_Drivers/drv_sdcard.c
@@ -79,8 +79,8 @@ static const struct _cy_sdio_pin_and_name_config _sdcard_config =
 };
 
 #include <dfs_fs.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/gpt.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_gpt.h>
 struct rthw_sdio
 {
     struct rt_device parent;
diff --git a/bsp/Infineon/libraries/HAL_Drivers/drv_spi.h b/bsp/Infineon/libraries/HAL_Drivers/drv_spi.h
index ffcf87b3a5..de0a4fd6ee 100644
--- a/bsp/Infineon/libraries/HAL_Drivers/drv_spi.h
+++ b/bsp/Infineon/libraries/HAL_Drivers/drv_spi.h
@@ -12,7 +12,7 @@
 #define __DRV_SPI__
 
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 
 #include "drv_gpio.h"
 
diff --git a/bsp/airm2m/air105/board/ports/spi_flash_init.c b/bsp/airm2m/air105/board/ports/spi_flash_init.c
index 9885bef4d7..a7223d0008 100644
--- a/bsp/airm2m/air105/board/ports/spi_flash_init.c
+++ b/bsp/airm2m/air105/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
diff --git a/bsp/airm2m/air105/libraries/rt_drivers/drv_wdt.c b/bsp/airm2m/air105/libraries/rt_drivers/drv_wdt.c
index 310b839722..582ebf6fd4 100644
--- a/bsp/airm2m/air105/libraries/rt_drivers/drv_wdt.c
+++ b/bsp/airm2m/air105/libraries/rt_drivers/drv_wdt.c
@@ -9,7 +9,7 @@
  */
 
 #include "board.h"
-#include <drivers/watchdog.h>
+#include "drivers/dev_watchdog.h"
 
 #ifdef RT_USING_WDT
 
diff --git a/bsp/airm2m/air32f103/board/ports/spi_flash_init.c b/bsp/airm2m/air32f103/board/ports/spi_flash_init.c
index 2e2ca27eb1..0fbe4f2caf 100644
--- a/bsp/airm2m/air32f103/board/ports/spi_flash_init.c
+++ b/bsp/airm2m/air32f103/board/ports/spi_flash_init.c
@@ -10,8 +10,8 @@
 
 #include <rtthread.h>
 #include <board.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
diff --git a/bsp/airm2m/air32f103/libraries/rt_drivers/drv_spi.c b/bsp/airm2m/air32f103/libraries/rt_drivers/drv_spi.c
index 4b39fa3d14..5470254a99 100644
--- a/bsp/airm2m/air32f103/libraries/rt_drivers/drv_spi.c
+++ b/bsp/airm2m/air32f103/libraries/rt_drivers/drv_spi.c
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include "board.h"
 #include "drv_spi.h"
 
diff --git a/bsp/allwinner_tina/drivers/spi/drv_spi_flash.c b/bsp/allwinner_tina/drivers/spi/drv_spi_flash.c
index 42038e8abd..71c681faac 100644
--- a/bsp/allwinner_tina/drivers/spi/drv_spi_flash.c
+++ b/bsp/allwinner_tina/drivers/spi/drv_spi_flash.c
@@ -28,8 +28,8 @@
 #endif
 
 #if defined(TINA_USING_SPI_FLASH) && defined(RT_USING_SFUD)
-#include "spi_flash.h"
-#include <spi_flash_sfud.h>
+#include "dev_spi_flash.h"
+#include <dev_spi_flash_sfud.h>
 rt_spi_flash_device_t spi_device;
 int rt_hw_spi_flash_with_sfud_init(void)
 {
diff --git a/bsp/apm32/apm32e103ze-evalboard/board/ports/spi_flash_init.c b/bsp/apm32/apm32e103ze-evalboard/board/ports/spi_flash_init.c
index f5fba50b39..784f840339 100644
--- a/bsp/apm32/apm32e103ze-evalboard/board/ports/spi_flash_init.c
+++ b/bsp/apm32/apm32e103ze-evalboard/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
diff --git a/bsp/apm32/apm32f051r8-evalboard/board/ports/spi_flash_init.c b/bsp/apm32/apm32f051r8-evalboard/board/ports/spi_flash_init.c
index 7d7161ed50..026b790e24 100644
--- a/bsp/apm32/apm32f051r8-evalboard/board/ports/spi_flash_init.c
+++ b/bsp/apm32/apm32f051r8-evalboard/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
diff --git a/bsp/apm32/apm32f107vc-evalboard/board/ports/spi_flash_init.c b/bsp/apm32/apm32f107vc-evalboard/board/ports/spi_flash_init.c
index 783d82a743..7e6af8a0ed 100644
--- a/bsp/apm32/apm32f107vc-evalboard/board/ports/spi_flash_init.c
+++ b/bsp/apm32/apm32f107vc-evalboard/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
diff --git a/bsp/apm32/apm32f407zg-evalboard/board/ports/spi_flash_init.c b/bsp/apm32/apm32f407zg-evalboard/board/ports/spi_flash_init.c
index 739ed088cb..6b9c743672 100644
--- a/bsp/apm32/apm32f407zg-evalboard/board/ports/spi_flash_init.c
+++ b/bsp/apm32/apm32f407zg-evalboard/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
diff --git a/bsp/apm32/apm32s103vb-miniboard/board/ports/spi_flash_init.c b/bsp/apm32/apm32s103vb-miniboard/board/ports/spi_flash_init.c
index 9b1ec081f3..051c45edce 100644
--- a/bsp/apm32/apm32s103vb-miniboard/board/ports/spi_flash_init.c
+++ b/bsp/apm32/apm32s103vb-miniboard/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
diff --git a/bsp/apm32/libraries/Drivers/drv_sdio.h b/bsp/apm32/libraries/Drivers/drv_sdio.h
index e8d40d1218..ee1d0438c9 100644
--- a/bsp/apm32/libraries/Drivers/drv_sdio.h
+++ b/bsp/apm32/libraries/Drivers/drv_sdio.h
@@ -15,8 +15,8 @@
 #include "rtdevice.h"
 #include <rthw.h>
 #include <string.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 #include "drv_common.h"
 #include "board.h"
 
diff --git a/bsp/apm32/libraries/Drivers/drv_spi.h b/bsp/apm32/libraries/Drivers/drv_spi.h
index 199958778f..f9bd2759d6 100644
--- a/bsp/apm32/libraries/Drivers/drv_spi.h
+++ b/bsp/apm32/libraries/Drivers/drv_spi.h
@@ -13,7 +13,7 @@
 
 #include "board.h"
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 
 struct apm32_spi_config
 {
diff --git a/bsp/at32/libraries/rt_drivers/drv_sdio.h b/bsp/at32/libraries/rt_drivers/drv_sdio.h
index fcbfd7381a..9a2b7d1c30 100644
--- a/bsp/at32/libraries/rt_drivers/drv_sdio.h
+++ b/bsp/at32/libraries/rt_drivers/drv_sdio.h
@@ -14,8 +14,8 @@
 #include "rtdevice.h"
 #include <rthw.h>
 #include <string.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 #include "drv_common.h"
 
 #define SDCARD_INSTANCE_TYPE                   sdio_type
diff --git a/bsp/at32/libraries/rt_drivers/drv_spi.h b/bsp/at32/libraries/rt_drivers/drv_spi.h
index dd6cf48146..8ff557c84e 100644
--- a/bsp/at32/libraries/rt_drivers/drv_spi.h
+++ b/bsp/at32/libraries/rt_drivers/drv_spi.h
@@ -12,7 +12,7 @@
 #define __DRV_SPI__
 
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include "drv_common.h"
 #include "drv_dma.h"
 
diff --git a/bsp/at32/libraries/rt_drivers/drv_wdt.c b/bsp/at32/libraries/rt_drivers/drv_wdt.c
index 249490f2f7..fad7ec1375 100644
--- a/bsp/at32/libraries/rt_drivers/drv_wdt.c
+++ b/bsp/at32/libraries/rt_drivers/drv_wdt.c
@@ -8,7 +8,7 @@
  * 2022-05-16     shelton           first version
  */
 
-#include <drivers/watchdog.h>
+#include "drivers/dev_watchdog.h"
 #include "drv_common.h"
 
 #ifdef RT_USING_WDT
diff --git a/bsp/at91/at91sam9260/applications/application.c b/bsp/at91/at91sam9260/applications/application.c
index f1a377e1e9..c1c5add633 100644
--- a/bsp/at91/at91sam9260/applications/application.c
+++ b/bsp/at91/at91sam9260/applications/application.c
@@ -22,7 +22,7 @@
 #endif
 
 #ifdef RT_USING_SDIO
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include "at91_mci.h"
 #endif
 
diff --git a/bsp/at91/at91sam9260/drivers/at91_mci.c b/bsp/at91/at91sam9260/drivers/at91_mci.c
index 92f7abdfec..0855b61386 100644
--- a/bsp/at91/at91sam9260/drivers/at91_mci.c
+++ b/bsp/at91/at91sam9260/drivers/at91_mci.c
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rthw.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include <at91sam926x.h>
 #include "at91_mci.h"
 
diff --git a/bsp/at91/at91sam9g45/applications/application.c b/bsp/at91/at91sam9g45/applications/application.c
index bae4b595a0..9775bc81d2 100644
--- a/bsp/at91/at91sam9g45/applications/application.c
+++ b/bsp/at91/at91sam9g45/applications/application.c
@@ -22,7 +22,7 @@
 #endif
 
 #ifdef RT_USING_SDIO
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include "at91_mci.h"
 #endif
 
diff --git a/bsp/at91/at91sam9g45/drivers/at91_mci.c b/bsp/at91/at91sam9g45/drivers/at91_mci.c
index 55c698832f..d465d49a8c 100644
--- a/bsp/at91/at91sam9g45/drivers/at91_mci.c
+++ b/bsp/at91/at91sam9g45/drivers/at91_mci.c
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rthw.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include <at91sam9g45.h>
 #include "at91_mci.h"
 
diff --git a/bsp/bf533/board.c b/bsp/bf533/board.c
index 5542079435..34aa6f27ba 100644
--- a/bsp/bf533/board.c
+++ b/bsp/bf533/board.c
@@ -12,7 +12,7 @@
 #include "rtconfig.h"
 #include "rtdef.h"
 #include "rthw.h"
-#include "serial.h"
+#include "drivers/dev_serial.h"
 
 #include <signal.h>
 #include <sys/platform.h>
diff --git a/bsp/bf533/startup.c b/bsp/bf533/startup.c
index 8e965df00f..eceb9881f7 100644
--- a/bsp/bf533/startup.c
+++ b/bsp/bf533/startup.c
@@ -12,7 +12,7 @@
 #include <rtthread.h>
 #include "application.h"
 #include "board.h"
-#include "serial.h"
+#include "drivers/dev_serial.h"
 #include "finsh.h"
 
 extern "asm" int rtt_heap_start;
diff --git a/bsp/bluetrum/libraries/hal_drivers/drv_sdio.h b/bsp/bluetrum/libraries/hal_drivers/drv_sdio.h
index 09c1d04f52..7681829306 100644
--- a/bsp/bluetrum/libraries/hal_drivers/drv_sdio.h
+++ b/bsp/bluetrum/libraries/hal_drivers/drv_sdio.h
@@ -13,8 +13,8 @@
 
 #include "drv_common.h"
 #include "board.h"
-#include "drivers/mmcsd_core.h"
-#include "drivers/sdio.h"
+#include "drivers/dev_mmcsd_core.h"
+#include "drivers/dev_sdio.h"
 
 #define SDIO_BUFF_SIZE       1024
 #define SDIO_ALIGN_LEN       32
diff --git a/bsp/bouffalo_lab/bl808/m0/board/wlan_port/drv_wifi.c b/bsp/bouffalo_lab/bl808/m0/board/wlan_port/drv_wifi.c
index d033ce8776..01795a05b1 100644
--- a/bsp/bouffalo_lab/bl808/m0/board/wlan_port/drv_wifi.c
+++ b/bsp/bouffalo_lab/bl808/m0/board/wlan_port/drv_wifi.c
@@ -9,7 +9,7 @@
  */
 
 #include <rtthread.h>
-#include <wlan_dev.h>
+#include "dev_wlan.h"
 
 #define DBG_TAG     "drv.wifi"
 #define DBG_LVL     DBG_LOG
@@ -303,7 +303,7 @@ static rt_err_t drv_wlan_softap(struct rt_wlan_device *wlan, struct rt_ap_info *
     }
 
     if (ret < 0)
-        return RT_ERROR;
+        return -RT_ERROR;
 
     return RT_EOK;
 }
diff --git a/bsp/bouffalo_lab/libraries/rt_drivers/drv_sdh.c b/bsp/bouffalo_lab/libraries/rt_drivers/drv_sdh.c
index e1d2900515..6dc5f3ed8f 100644
--- a/bsp/bouffalo_lab/libraries/rt_drivers/drv_sdh.c
+++ b/bsp/bouffalo_lab/libraries/rt_drivers/drv_sdh.c
@@ -20,8 +20,8 @@
 #endif
 #include <rtdbg.h>
 
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 #include "drv_sdh.h"
 
 #if defined(BL808)
diff --git a/bsp/cvitek/drivers/drv_sdhci.c b/bsp/cvitek/drivers/drv_sdhci.c
index dd7ae14086..1b6c78d6a2 100644
--- a/bsp/cvitek/drivers/drv_sdhci.c
+++ b/bsp/cvitek/drivers/drv_sdhci.c
@@ -21,8 +21,8 @@
 #define DBG_LEVEL   DBG_INFO
 #include <rtdbg.h>
 
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 
 #include "drv_sdhci.h"
 
diff --git a/bsp/dm365/applications/application.c b/bsp/dm365/applications/application.c
index 3d5207b516..e810f09ee6 100644
--- a/bsp/dm365/applications/application.c
+++ b/bsp/dm365/applications/application.c
@@ -22,7 +22,7 @@
 #endif
 
 #ifdef RT_USING_SDIO
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #endif
 
 int main(void)
diff --git a/bsp/dm365/drivers/mmcsd.c b/bsp/dm365/drivers/mmcsd.c
index 8e12236256..2ef6dbb859 100644
--- a/bsp/dm365/drivers/mmcsd.c
+++ b/bsp/dm365/drivers/mmcsd.c
@@ -11,7 +11,7 @@
 #include <rtthread.h>
 #include <rthw.h>
 #include <string.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include <dm36x.h>
 #include "mmcsd.h"
 #include "edma.h"
diff --git a/bsp/essemi/es32f0654/drivers/drv_spiflash.c b/bsp/essemi/es32f0654/drivers/drv_spiflash.c
index 334f908887..70c8d62f85 100644
--- a/bsp/essemi/es32f0654/drivers/drv_spiflash.c
+++ b/bsp/essemi/es32f0654/drivers/drv_spiflash.c
@@ -14,9 +14,9 @@
 
 #if defined(BSP_USING_SPI_FLASH)
 
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 #include "drv_spiflash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 int rt_hw_spi_flash_init(void)
diff --git a/bsp/essemi/es32f369x/drivers/drv_spiflash.c b/bsp/essemi/es32f369x/drivers/drv_spiflash.c
index 334f908887..70c8d62f85 100644
--- a/bsp/essemi/es32f369x/drivers/drv_spiflash.c
+++ b/bsp/essemi/es32f369x/drivers/drv_spiflash.c
@@ -14,9 +14,9 @@
 
 #if defined(BSP_USING_SPI_FLASH)
 
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 #include "drv_spiflash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 int rt_hw_spi_flash_init(void)
diff --git a/bsp/essemi/es32vf2264/drivers/drv_spiflash.c b/bsp/essemi/es32vf2264/drivers/drv_spiflash.c
index 334f908887..70c8d62f85 100644
--- a/bsp/essemi/es32vf2264/drivers/drv_spiflash.c
+++ b/bsp/essemi/es32vf2264/drivers/drv_spiflash.c
@@ -14,9 +14,9 @@
 
 #if defined(BSP_USING_SPI_FLASH)
 
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 #include "drv_spiflash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 int rt_hw_spi_flash_init(void)
diff --git a/bsp/frdm-k64f/board/drv_uart.h b/bsp/frdm-k64f/board/drv_uart.h
index d28e69f052..361e8c736d 100644
--- a/bsp/frdm-k64f/board/drv_uart.h
+++ b/bsp/frdm-k64f/board/drv_uart.h
@@ -17,7 +17,7 @@
 
 #include <MK64F12.h>
 
-#include <drivers/serial.h>
+#include <drivers/dev_serial.h>
 
 void rt_hw_uart_init(void);
 
diff --git a/bsp/ft2004/drivers/drv_qspi_flash.c b/bsp/ft2004/drivers/drv_qspi_flash.c
index 102cd5fc5b..668daf2f22 100644
--- a/bsp/ft2004/drivers/drv_qspi_flash.c
+++ b/bsp/ft2004/drivers/drv_qspi_flash.c
@@ -16,8 +16,8 @@
 
 #ifdef BSP_USE_QSPI
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #define _QSPI_DEVICE_NAME "qspiflash"
 
 static int
diff --git a/bsp/ft2004/drivers/drv_sdctrl.c b/bsp/ft2004/drivers/drv_sdctrl.c
index 790a38aba0..1faf8e63c2 100644
--- a/bsp/ft2004/drivers/drv_sdctrl.c
+++ b/bsp/ft2004/drivers/drv_sdctrl.c
@@ -14,7 +14,7 @@
 #include "ft_debug.h"
 #include "ft_types.h"
 #include "ft_generic_timer.h"
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include "interrupt.h"
 #include "rtconfig.h"
 #include "ft_cache.h"
diff --git a/bsp/ft2004/drivers/drv_spi_flash.c b/bsp/ft2004/drivers/drv_spi_flash.c
index 26d8b44712..c27a728388 100644
--- a/bsp/ft2004/drivers/drv_spi_flash.c
+++ b/bsp/ft2004/drivers/drv_spi_flash.c
@@ -21,8 +21,8 @@
 
 #ifdef BSP_USE_SPI
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 static int rt_hw_spi_flash_init(void)
 {
diff --git a/bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c b/bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c
index 1fdaf3a715..f844bd2ddc 100644
--- a/bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c
+++ b/bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c
@@ -10,10 +10,10 @@
  */
 #include <board.h>
 #include "drv_spi.h"
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 
 #ifdef RT_USING_SFUD
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash_sfud.h"
 #endif
 
 #include <rthw.h>
diff --git a/bsp/hc32/ev_hc32f448_lqfp80/board/ports/drv_spi_flash.c b/bsp/hc32/ev_hc32f448_lqfp80/board/ports/drv_spi_flash.c
index 5e69545c7b..15d4e15ab8 100644
--- a/bsp/hc32/ev_hc32f448_lqfp80/board/ports/drv_spi_flash.c
+++ b/bsp/hc32/ev_hc32f448_lqfp80/board/ports/drv_spi_flash.c
@@ -19,9 +19,9 @@
 
 #ifdef BSP_USING_SPI_FLASH
 
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 #ifdef RT_USING_SFUD
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #define SPI_BUS_NAME                    "spi1"
diff --git a/bsp/hc32/ev_hc32f448_lqfp80/board/ports/fal/fal_flash_sfud_port.c b/bsp/hc32/ev_hc32f448_lqfp80/board/ports/fal/fal_flash_sfud_port.c
index c1b7851309..be3f1b5c07 100644
--- a/bsp/hc32/ev_hc32f448_lqfp80/board/ports/fal/fal_flash_sfud_port.c
+++ b/bsp/hc32/ev_hc32f448_lqfp80/board/ports/fal/fal_flash_sfud_port.c
@@ -13,7 +13,7 @@
 
 #include <sfud.h>
 #ifdef RT_USING_SFUD
-    #include <spi_flash_sfud.h>
+    #include <dev_spi_flash_sfud.h>
 #endif
 
 #ifndef FAL_USING_NOR_FLASH_DEV_NAME
diff --git a/bsp/hc32/ev_hc32f460_lqfp100_v2/board/ports/drv_spi_flash.c b/bsp/hc32/ev_hc32f460_lqfp100_v2/board/ports/drv_spi_flash.c
index cf6d37026b..f4b73c4db8 100644
--- a/bsp/hc32/ev_hc32f460_lqfp100_v2/board/ports/drv_spi_flash.c
+++ b/bsp/hc32/ev_hc32f460_lqfp100_v2/board/ports/drv_spi_flash.c
@@ -18,9 +18,9 @@
 
 #ifdef BSP_USING_SPI_FLASH
 
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 #ifdef RT_USING_SFUD
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #define SPI_BUS_NAME                    "spi3"
diff --git a/bsp/hc32/ev_hc32f460_lqfp100_v2/board/ports/fal/fal_flash_sfud_port.c b/bsp/hc32/ev_hc32f460_lqfp100_v2/board/ports/fal/fal_flash_sfud_port.c
index b52d72de00..6348797e68 100644
--- a/bsp/hc32/ev_hc32f460_lqfp100_v2/board/ports/fal/fal_flash_sfud_port.c
+++ b/bsp/hc32/ev_hc32f460_lqfp100_v2/board/ports/fal/fal_flash_sfud_port.c
@@ -12,7 +12,7 @@
 
 #include <sfud.h>
 #ifdef RT_USING_SFUD
-    #include <spi_flash_sfud.h>
+    #include <dev_spi_flash_sfud.h>
 #endif
 
 #ifndef FAL_USING_NOR_FLASH_DEV_NAME
diff --git a/bsp/hc32/ev_hc32f4a0_lqfp176/board/ports/drv_spi_flash.c b/bsp/hc32/ev_hc32f4a0_lqfp176/board/ports/drv_spi_flash.c
index 107e98f441..7f394c8f20 100644
--- a/bsp/hc32/ev_hc32f4a0_lqfp176/board/ports/drv_spi_flash.c
+++ b/bsp/hc32/ev_hc32f4a0_lqfp176/board/ports/drv_spi_flash.c
@@ -18,9 +18,9 @@
 
 #ifdef BSP_USING_SPI_FLASH
 
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 #ifdef RT_USING_SFUD
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #define SPI_BUS_NAME                    "spi1"
diff --git a/bsp/hc32/ev_hc32f4a0_lqfp176/board/ports/fal/fal_flash_sfud_port.c b/bsp/hc32/ev_hc32f4a0_lqfp176/board/ports/fal/fal_flash_sfud_port.c
index b52d72de00..6348797e68 100644
--- a/bsp/hc32/ev_hc32f4a0_lqfp176/board/ports/fal/fal_flash_sfud_port.c
+++ b/bsp/hc32/ev_hc32f4a0_lqfp176/board/ports/fal/fal_flash_sfud_port.c
@@ -12,7 +12,7 @@
 
 #include <sfud.h>
 #ifdef RT_USING_SFUD
-    #include <spi_flash_sfud.h>
+    #include <dev_spi_flash_sfud.h>
 #endif
 
 #ifndef FAL_USING_NOR_FLASH_DEV_NAME
diff --git a/bsp/hc32/lckfb-hc32f4a0-lqfp100/board/ports/drv_spi_flash.c b/bsp/hc32/lckfb-hc32f4a0-lqfp100/board/ports/drv_spi_flash.c
index f1db0fff56..afc14643cb 100644
--- a/bsp/hc32/lckfb-hc32f4a0-lqfp100/board/ports/drv_spi_flash.c
+++ b/bsp/hc32/lckfb-hc32f4a0-lqfp100/board/ports/drv_spi_flash.c
@@ -18,9 +18,9 @@
 
 #ifdef BSP_USING_SPI_FLASH
 
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 #ifdef RT_USING_SFUD
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #define SPI_BUS_NAME                    "spi1"
diff --git a/bsp/hc32/lckfb-hc32f4a0-lqfp100/board/ports/fal/fal_flash_sfud_port.c b/bsp/hc32/lckfb-hc32f4a0-lqfp100/board/ports/fal/fal_flash_sfud_port.c
index b52d72de00..6348797e68 100644
--- a/bsp/hc32/lckfb-hc32f4a0-lqfp100/board/ports/fal/fal_flash_sfud_port.c
+++ b/bsp/hc32/lckfb-hc32f4a0-lqfp100/board/ports/fal/fal_flash_sfud_port.c
@@ -12,7 +12,7 @@
 
 #include <sfud.h>
 #ifdef RT_USING_SFUD
-    #include <spi_flash_sfud.h>
+    #include <dev_spi_flash_sfud.h>
 #endif
 
 #ifndef FAL_USING_NOR_FLASH_DEV_NAME
diff --git a/bsp/hc32/platform/fal/fal_flash_sfud_nor.c b/bsp/hc32/platform/fal/fal_flash_sfud_nor.c
index fc003e559d..e469f7180f 100644
--- a/bsp/hc32/platform/fal/fal_flash_sfud_nor.c
+++ b/bsp/hc32/platform/fal/fal_flash_sfud_nor.c
@@ -11,7 +11,7 @@
 #include <fal.h>
 #include <sfud.h>
 #ifdef RT_USING_SFUD
-    #include <spi_flash_sfud.h>
+    #include <dev_spi_flash_sfud.h>
 #endif
 
 #ifndef FAL_USING_NOR_FLASH_DEV_NAME
diff --git a/bsp/hc32/platform/sfud/drv_spi_flash.c b/bsp/hc32/platform/sfud/drv_spi_flash.c
index 531e543833..931de2a91d 100644
--- a/bsp/hc32/platform/sfud/drv_spi_flash.c
+++ b/bsp/hc32/platform/sfud/drv_spi_flash.c
@@ -18,9 +18,9 @@
 
 #ifdef BSP_USING_SPI_FLASH
 
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 #ifdef RT_USING_SFUD
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #if defined(HC32F4A0) || defined(HC32F448)
diff --git a/bsp/hk32/libraries/rt_drivers/drv_spi.h b/bsp/hk32/libraries/rt_drivers/drv_spi.h
index 2ac963b0a7..67c243c651 100644
--- a/bsp/hk32/libraries/rt_drivers/drv_spi.h
+++ b/bsp/hk32/libraries/rt_drivers/drv_spi.h
@@ -12,7 +12,7 @@
 #define __DRV_SPI__
 
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include <hk32f0xx.h>
 
 struct hk32_spi_config
diff --git a/bsp/k210/applications/mnt.c b/bsp/k210/applications/mnt.c
index e5d00d450a..4d5ca6acc1 100644
--- a/bsp/k210/applications/mnt.c
+++ b/bsp/k210/applications/mnt.c
@@ -9,7 +9,7 @@
 
 #include <rtthread.h>
 #if defined(RT_USING_SPI_MSD) && defined(RT_USING_DFS_ELMFAT)
-#include <spi_msd.h>
+#include <dev_spi_msd.h>
 #include <dfs_fs.h>
 int mnt_init(void)
 {
diff --git a/bsp/k210/drivers/drv_lcd.c b/bsp/k210/drivers/drv_lcd.c
index c5da45a6ac..948a1d8856 100644
--- a/bsp/k210/drivers/drv_lcd.c
+++ b/bsp/k210/drivers/drv_lcd.c
@@ -17,6 +17,7 @@
 #include "drv_lcd.h"
 #include <board.h>
 #include <gpiohs.h>
+#include <drivers/dev_spi.h>
 #include <spi.h>
 #include <drv_io_config.h>
 #include <rthw.h>
diff --git a/bsp/k210/drivers/drv_spi.c b/bsp/k210/drivers/drv_spi.c
index accf8ed3c5..62330eac25 100644
--- a/bsp/k210/drivers/drv_spi.c
+++ b/bsp/k210/drivers/drv_spi.c
@@ -10,11 +10,12 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
+#include <spi.h>
 
 #ifdef RT_USING_SPI
 #include "drv_spi.h"
 #include <drv_io_config.h>
-#include <spi.h>
+#include <drivers/dev_spi.h>
 #include "dmalock.h"
 #include <sysctl.h>
 #include <gpiohs.h>
diff --git a/bsp/loongson/ls1cdev/drivers/drv_spi.c b/bsp/loongson/ls1cdev/drivers/drv_spi.c
index 25b30e07ca..c9b6a294e9 100644
--- a/bsp/loongson/ls1cdev/drivers/drv_spi.c
+++ b/bsp/loongson/ls1cdev/drivers/drv_spi.c
@@ -10,11 +10,11 @@
  */
 
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include <rthw.h>
 #include "drv_spi.h"
 #include "ls1c_public.h"
-#include "spi_msd.h"
+#include "dev_spi_msd.h"
 #include "dfs_fs.h"
 #include "../libraries/ls1c_pin.h"
 
diff --git a/bsp/loongson/ls1cdev/drivers/drv_wdt.c b/bsp/loongson/ls1cdev/drivers/drv_wdt.c
index a40a95c79b..d4f0c51801 100644
--- a/bsp/loongson/ls1cdev/drivers/drv_wdt.c
+++ b/bsp/loongson/ls1cdev/drivers/drv_wdt.c
@@ -13,7 +13,7 @@
 
 #ifdef  RT_USING_WDT
 
-#include <drivers/watchdog.h>
+#include "drivers/dev_watchdog.h"
 #include "drv_wdt.h"
 
 #include "ls1c_wdog.h"
diff --git a/bsp/loongson/ls1cdev/drivers/touch.c b/bsp/loongson/ls1cdev/drivers/touch.c
index b5be15c962..1a3baf32cf 100644
--- a/bsp/loongson/ls1cdev/drivers/touch.c
+++ b/bsp/loongson/ls1cdev/drivers/touch.c
@@ -11,7 +11,7 @@
 #include <rtthread.h>
 #include <rtdevice.h>
 #include <stdbool.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include "ls1c.h"
 #include "ls1c_gpio.h"
 #include "ls1c_spi.h"
diff --git a/bsp/loongson/ls2kdev/drivers/drv_spi.c b/bsp/loongson/ls2kdev/drivers/drv_spi.c
index b29f7b9bc3..13fe66ee9a 100644
--- a/bsp/loongson/ls2kdev/drivers/drv_spi.c
+++ b/bsp/loongson/ls2kdev/drivers/drv_spi.c
@@ -18,7 +18,7 @@
 #include <ctype.h>
 #include <stdint.h>
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include "drv_spi.h"
 
 #ifdef RT_USING_SPI
diff --git a/bsp/microblaze/board.c b/bsp/microblaze/board.c
index 1de9171151..f46f431492 100755
--- a/bsp/microblaze/board.c
+++ b/bsp/microblaze/board.c
@@ -30,7 +30,7 @@
 #include "xintc_l.h"
 
 #ifdef RT_USING_UART1
-#include "serial.h"
+#include "drivers/dev_serial.h"
 #endif
 
 #define  TIMER_CNTR_0		0
@@ -143,8 +143,8 @@ static void rt_hw_console_init()
 	rt_uint32_t status;
 
 	/*
-	 * Initialize the UartLite driver so that it is ready to use.
-	 */
+	* Initialize the UartLite driver so that it is ready to use.
+	*/
 	status = XUartLite_Initialize(&uart_lite, RS232_DEVICE_ID);
 	if (status != XST_SUCCESS)
 	{
diff --git a/bsp/mini2440/drivers/s3cmci.c b/bsp/mini2440/drivers/s3cmci.c
index b5b6f58414..e85d4bc6ce 100644
--- a/bsp/mini2440/drivers/s3cmci.c
+++ b/bsp/mini2440/drivers/s3cmci.c
@@ -10,7 +10,7 @@
 #include <rthw.h>
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include <s3c24x0.h>
 
 #define S3C_PCLK	50000000
diff --git a/bsp/mini4020/applications/startup.c b/bsp/mini4020/applications/startup.c
index d866ed91db..d9da765230 100644
--- a/bsp/mini4020/applications/startup.c
+++ b/bsp/mini4020/applications/startup.c
@@ -12,7 +12,7 @@
 
 #include <sep4020.h>
 #include <board.h>
-#include <serial.h>
+#include <drivers/dev_serial.h>
 #ifdef RT_USING_FINSH
 #include <finsh.h>
 #endif
diff --git a/bsp/mini4020/drivers/board.c b/bsp/mini4020/drivers/board.c
index 0aaf40237c..97b64ac9b9 100644
--- a/bsp/mini4020/drivers/board.c
+++ b/bsp/mini4020/drivers/board.c
@@ -17,7 +17,7 @@
 #include <rtthread.h>
 
 #include <sep4020.h>
-#include <serial.h>
+#include <drivers/dev_serial.h>
 
 void rt_hw_serial_putc(const char c);
 
diff --git a/bsp/n32g452xx/Libraries/rt_drivers/drv_wdt.c b/bsp/n32g452xx/Libraries/rt_drivers/drv_wdt.c
index 7312357e47..f8c02b33aa 100644
--- a/bsp/n32g452xx/Libraries/rt_drivers/drv_wdt.c
+++ b/bsp/n32g452xx/Libraries/rt_drivers/drv_wdt.c
@@ -10,7 +10,7 @@
  */
 
 #include <board.h>
-#include <drivers/watchdog.h>
+#include "drivers/dev_watchdog.h"
 
 #ifdef RT_USING_WDT
 #ifdef BSP_USING_WDT
diff --git a/bsp/nuvoton/libraries/m2354/rtt_port/drv_sdio.c b/bsp/nuvoton/libraries/m2354/rtt_port/drv_sdio.c
index 3e982bea4f..359b96dc89 100644
--- a/bsp/nuvoton/libraries/m2354/rtt_port/drv_sdio.c
+++ b/bsp/nuvoton/libraries/m2354/rtt_port/drv_sdio.c
@@ -15,8 +15,8 @@
 #if defined(BSP_USING_SDH)
 
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 
 #include "NuMicro.h"
 
diff --git a/bsp/nuvoton/libraries/m460/rtt_port/drv_sdio.c b/bsp/nuvoton/libraries/m460/rtt_port/drv_sdio.c
index 3e982bea4f..359b96dc89 100644
--- a/bsp/nuvoton/libraries/m460/rtt_port/drv_sdio.c
+++ b/bsp/nuvoton/libraries/m460/rtt_port/drv_sdio.c
@@ -15,8 +15,8 @@
 #if defined(BSP_USING_SDH)
 
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 
 #include "NuMicro.h"
 
diff --git a/bsp/nuvoton/libraries/m480/rtt_port/drv_sdio.c b/bsp/nuvoton/libraries/m480/rtt_port/drv_sdio.c
index 3e982bea4f..359b96dc89 100644
--- a/bsp/nuvoton/libraries/m480/rtt_port/drv_sdio.c
+++ b/bsp/nuvoton/libraries/m480/rtt_port/drv_sdio.c
@@ -15,8 +15,8 @@
 #if defined(BSP_USING_SDH)
 
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 
 #include "NuMicro.h"
 
diff --git a/bsp/nuvoton/libraries/ma35/rtt_port/drv_sdio.c b/bsp/nuvoton/libraries/ma35/rtt_port/drv_sdio.c
index 3a58433839..1ea3be5740 100644
--- a/bsp/nuvoton/libraries/ma35/rtt_port/drv_sdio.c
+++ b/bsp/nuvoton/libraries/ma35/rtt_port/drv_sdio.c
@@ -15,8 +15,8 @@
 #if defined(BSP_USING_SDH)
 
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 
 #include "NuMicro.h"
 #include "drv_common.h"
diff --git a/bsp/nuvoton/nk-980iot/board/board_dev.c b/bsp/nuvoton/nk-980iot/board/board_dev.c
index 66d511d8f5..0d63223153 100644
--- a/bsp/nuvoton/nk-980iot/board/board_dev.c
+++ b/bsp/nuvoton/nk-980iot/board/board_dev.c
@@ -15,8 +15,8 @@
 
 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #include "drv_qspi.h"
diff --git a/bsp/nuvoton/nk-n9h30/board/board_dev.c b/bsp/nuvoton/nk-n9h30/board/board_dev.c
index d48432affa..2757e7b54d 100644
--- a/bsp/nuvoton/nk-n9h30/board/board_dev.c
+++ b/bsp/nuvoton/nk-n9h30/board/board_dev.c
@@ -16,8 +16,8 @@
 
 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #include "drv_qspi.h"
diff --git a/bsp/nuvoton/nk-rtu980/board/board_dev.c b/bsp/nuvoton/nk-rtu980/board/board_dev.c
index 0086fe4595..4483591c5b 100644
--- a/bsp/nuvoton/nk-rtu980/board/board_dev.c
+++ b/bsp/nuvoton/nk-rtu980/board/board_dev.c
@@ -15,8 +15,8 @@
 
 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #include "drv_qspi.h"
diff --git a/bsp/nuvoton/numaker-hmi-ma35d1/board/board_dev.c b/bsp/nuvoton/numaker-hmi-ma35d1/board/board_dev.c
index a475663591..721f3d5d47 100644
--- a/bsp/nuvoton/numaker-hmi-ma35d1/board/board_dev.c
+++ b/bsp/nuvoton/numaker-hmi-ma35d1/board/board_dev.c
@@ -21,8 +21,8 @@
 
 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #include "drv_qspi.h"
diff --git a/bsp/nuvoton/numaker-iot-m467/board/board_dev.c b/bsp/nuvoton/numaker-iot-m467/board/board_dev.c
index 4056784edd..87b43cd550 100644
--- a/bsp/nuvoton/numaker-iot-m467/board/board_dev.c
+++ b/bsp/nuvoton/numaker-iot-m467/board/board_dev.c
@@ -15,8 +15,8 @@
 
 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #include "drv_qspi.h"
diff --git a/bsp/nuvoton/numaker-iot-m487/board/board_dev.c b/bsp/nuvoton/numaker-iot-m487/board/board_dev.c
index 1f9488d07b..2e2d328cbb 100644
--- a/bsp/nuvoton/numaker-iot-m487/board/board_dev.c
+++ b/bsp/nuvoton/numaker-iot-m487/board/board_dev.c
@@ -15,8 +15,8 @@
 
 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #include "drv_qspi.h"
diff --git a/bsp/nuvoton/numaker-iot-ma35d1/board/board_dev.c b/bsp/nuvoton/numaker-iot-ma35d1/board/board_dev.c
index 89a03d8355..63d452500d 100644
--- a/bsp/nuvoton/numaker-iot-ma35d1/board/board_dev.c
+++ b/bsp/nuvoton/numaker-iot-ma35d1/board/board_dev.c
@@ -21,8 +21,8 @@
 
 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #include "drv_qspi.h"
diff --git a/bsp/nuvoton/numaker-m032ki/board/board_dev.c b/bsp/nuvoton/numaker-m032ki/board/board_dev.c
index cd1bf5167c..184acda197 100644
--- a/bsp/nuvoton/numaker-m032ki/board/board_dev.c
+++ b/bsp/nuvoton/numaker-m032ki/board/board_dev.c
@@ -15,8 +15,8 @@
 
 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #include "drv_qspi.h"
diff --git a/bsp/nuvoton/numaker-m467hj/board/board_dev.c b/bsp/nuvoton/numaker-m467hj/board/board_dev.c
index f7ae130f72..3d65d2ee85 100644
--- a/bsp/nuvoton/numaker-m467hj/board/board_dev.c
+++ b/bsp/nuvoton/numaker-m467hj/board/board_dev.c
@@ -15,8 +15,8 @@
 
 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #include "drv_qspi.h"
diff --git a/bsp/nuvoton/numaker-pfm-m487/board/board_dev.c b/bsp/nuvoton/numaker-pfm-m487/board/board_dev.c
index 5db43eca5c..671af6e6f9 100644
--- a/bsp/nuvoton/numaker-pfm-m487/board/board_dev.c
+++ b/bsp/nuvoton/numaker-pfm-m487/board/board_dev.c
@@ -15,8 +15,8 @@
 
 #if defined(BOARD_USING_STORAGE_SPIFLASH)
 #if defined(RT_USING_SFUD)
-    #include "spi_flash.h"
-    #include "spi_flash_sfud.h"
+    #include "dev_spi_flash.h"
+    #include "dev_spi_flash_sfud.h"
 #endif
 
 #include "drv_qspi.h"
diff --git a/bsp/nxp/imx/imx6ull-smart/drivers/drv_sdio.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_sdio.c
index 8ece4418c5..4531e2550f 100644
--- a/bsp/nxp/imx/imx6ull-smart/drivers/drv_sdio.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_sdio.c
@@ -12,7 +12,7 @@
 
 #include <rtthread.h>
 #include <rthw.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 #include <ioremap.h>
 
 #include <board.h>
diff --git a/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/ports/spi_flash_init.c b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/ports/spi_flash_init.c
index 8137c00f5e..02d38236ce 100644
--- a/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/ports/spi_flash_init.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/ports/spi_flash_init.c
@@ -12,8 +12,8 @@
 
 #if defined(BSP_USING_SPI_FLASH)
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 #include "drv_gpio.h"
 
diff --git a/bsp/nxp/imx/imxrt/libraries/drivers/drv_sdio.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_sdio.c
index 2a900f3892..229b3c3aef 100644
--- a/bsp/nxp/imx/imxrt/libraries/drivers/drv_sdio.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_sdio.c
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rthw.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 
 #include <board.h>
 #include <fsl_usdhc.h>
diff --git a/bsp/nxp/lpc/lpc54114-lite/drivers/drv_sdcard.c b/bsp/nxp/lpc/lpc54114-lite/drivers/drv_sdcard.c
index 7ca47a1932..61eec0f5b1 100644
--- a/bsp/nxp/lpc/lpc54114-lite/drivers/drv_sdcard.c
+++ b/bsp/nxp/lpc/lpc54114-lite/drivers/drv_sdcard.c
@@ -6,7 +6,7 @@
 
 #include "drv_sdcard.h"
 #include "drv_spi.h"
-#include "spi_msd.h"
+#include "dev_spi_msd.h"
 
 #define RT_SDCARD_CS_PIN (3)
 
diff --git a/bsp/nxp/lpc/lpc54114-lite/drivers/drv_spi_flash.c b/bsp/nxp/lpc/lpc54114-lite/drivers/drv_spi_flash.c
index 18da6dfe62..35adfcfcee 100644
--- a/bsp/nxp/lpc/lpc54114-lite/drivers/drv_spi_flash.c
+++ b/bsp/nxp/lpc/lpc54114-lite/drivers/drv_spi_flash.c
@@ -9,8 +9,8 @@
 
 #include "rtthread.h"
 #include "rtdevice.h"
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 #define RT_SPI_FLASH_CS_PIN (2)
 
diff --git a/bsp/nxp/lpc/lpc55sxx/Libraries/drivers/drv_soft_spi.h b/bsp/nxp/lpc/lpc55sxx/Libraries/drivers/drv_soft_spi.h
index 590da0fa0f..1a05c9bd78 100644
--- a/bsp/nxp/lpc/lpc55sxx/Libraries/drivers/drv_soft_spi.h
+++ b/bsp/nxp/lpc/lpc55sxx/Libraries/drivers/drv_soft_spi.h
@@ -12,7 +12,7 @@
 #define DRV_SOFT_SPI_H_
 
 #include <rtdevice.h>
-#include <spi-bit-ops.h>
+#include <dev_spi_bit_ops.h>
 
 /* lpc soft spi config */
 struct lpc_soft_spi_config
diff --git a/bsp/nxp/lpc/lpc55sxx/lpc55s69_nxp_evk/board/ports/soft_spi_flash_init.c b/bsp/nxp/lpc/lpc55sxx/lpc55s69_nxp_evk/board/ports/soft_spi_flash_init.c
index e74f9dc3aa..367eb555c8 100644
--- a/bsp/nxp/lpc/lpc55sxx/lpc55s69_nxp_evk/board/ports/soft_spi_flash_init.c
+++ b/bsp/nxp/lpc/lpc55sxx/lpc55s69_nxp_evk/board/ports/soft_spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_soft_spi.h"
 #include "drv_pin.h"
 
diff --git a/bsp/nxp/mcx/mcxn/frdm-mcxn236/board/ports/drv_filesystem_spi_flash.c b/bsp/nxp/mcx/mcxn/frdm-mcxn236/board/ports/drv_filesystem_spi_flash.c
index 56dbc786e6..9a8eb38266 100644
--- a/bsp/nxp/mcx/mcxn/frdm-mcxn236/board/ports/drv_filesystem_spi_flash.c
+++ b/bsp/nxp/mcx/mcxn/frdm-mcxn236/board/ports/drv_filesystem_spi_flash.c
@@ -13,7 +13,7 @@
 
 #if defined(BSP_USING_SPI7) && defined(RT_USING_SFUD) && defined(RT_USING_DFS) && defined(RT_USING_DFS_ELMFAT)
 #include <dfs_elm.h>
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash_sfud.h"
 #include "dfs_fs.h"
 #include "dfs.h"
 #include "dfs_file.h"
diff --git a/bsp/nxp/mcx/mcxn/frdm-mcxn947/board/ports/drv_filesystem_spi_flash.c b/bsp/nxp/mcx/mcxn/frdm-mcxn947/board/ports/drv_filesystem_spi_flash.c
index cac5b830f3..36b01d3d91 100644
--- a/bsp/nxp/mcx/mcxn/frdm-mcxn947/board/ports/drv_filesystem_spi_flash.c
+++ b/bsp/nxp/mcx/mcxn/frdm-mcxn947/board/ports/drv_filesystem_spi_flash.c
@@ -13,7 +13,7 @@
 
 #if defined(BSP_USING_SPI7) && defined(RT_USING_SFUD) && defined(RT_USING_DFS) && defined(RT_USING_DFS_ELMFAT)
 #include <dfs_elm.h>
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash_sfud.h"
 #include "dfs_fs.h"
 #include "dfs.h"
 #include "dfs_file.h"
diff --git a/bsp/phytium/libraries/drivers/drv_sdif.c b/bsp/phytium/libraries/drivers/drv_sdif.c
index 75c622f3ba..cec38adce2 100644
--- a/bsp/phytium/libraries/drivers/drv_sdif.c
+++ b/bsp/phytium/libraries/drivers/drv_sdif.c
@@ -21,7 +21,7 @@
 #include <rtthread.h>
 #include <rtdevice.h>
 #include <rtdbg.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 
 #ifdef RT_USING_SMART
 #include "ioremap.h"
diff --git a/bsp/qemu-vexpress-a9/drivers/drv_sdio.c b/bsp/qemu-vexpress-a9/drivers/drv_sdio.c
index b9af11592f..d80173bac2 100644
--- a/bsp/qemu-vexpress-a9/drivers/drv_sdio.c
+++ b/bsp/qemu-vexpress-a9/drivers/drv_sdio.c
@@ -10,7 +10,7 @@
 #include <rthw.h>
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/bsp/raspberry-pi/raspi3-32/driver/drv_sdio.h b/bsp/raspberry-pi/raspi3-32/driver/drv_sdio.h
index 917c002daf..726cf51cf5 100644
--- a/bsp/raspberry-pi/raspi3-32/driver/drv_sdio.h
+++ b/bsp/raspberry-pi/raspi3-32/driver/drv_sdio.h
@@ -14,7 +14,7 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 
 #include "board.h"
 
diff --git a/bsp/raspberry-pi/raspi3-32/driver/drv_spi.h b/bsp/raspberry-pi/raspi3-32/driver/drv_spi.h
index 58ede93ef4..219afab8e7 100644
--- a/bsp/raspberry-pi/raspi3-32/driver/drv_spi.h
+++ b/bsp/raspberry-pi/raspi3-32/driver/drv_spi.h
@@ -14,7 +14,7 @@
 #include <rtthread.h>
 #include <rtdevice.h>
 
-//#include <drivers/spi.h>
+//#include "drivers/dev_spi.h"
 #include "board.h"
 
 #define SPI0_BASE_ADDR     (PER_BASE + BCM283X_SPI0_BASE)
diff --git a/bsp/raspberry-pi/raspi3-64/driver/drv_sdio.h b/bsp/raspberry-pi/raspi3-64/driver/drv_sdio.h
index 917c002daf..726cf51cf5 100644
--- a/bsp/raspberry-pi/raspi3-64/driver/drv_sdio.h
+++ b/bsp/raspberry-pi/raspi3-64/driver/drv_sdio.h
@@ -14,7 +14,7 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 
 #include "board.h"
 
diff --git a/bsp/raspberry-pi/raspi3-64/driver/drv_spi.h b/bsp/raspberry-pi/raspi3-64/driver/drv_spi.h
index 58ede93ef4..219afab8e7 100644
--- a/bsp/raspberry-pi/raspi3-64/driver/drv_spi.h
+++ b/bsp/raspberry-pi/raspi3-64/driver/drv_spi.h
@@ -14,7 +14,7 @@
 #include <rtthread.h>
 #include <rtdevice.h>
 
-//#include <drivers/spi.h>
+//#include "drivers/dev_spi.h"
 #include "board.h"
 
 #define SPI0_BASE_ADDR     (PER_BASE + BCM283X_SPI0_BASE)
diff --git a/bsp/raspberry-pi/raspi4-32/driver/drv_sdio.h b/bsp/raspberry-pi/raspi4-32/driver/drv_sdio.h
index 0481a82e6d..3a3ee949be 100644
--- a/bsp/raspberry-pi/raspi4-32/driver/drv_sdio.h
+++ b/bsp/raspberry-pi/raspi4-32/driver/drv_sdio.h
@@ -13,7 +13,7 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 
 #include "board.h"
 #include "raspi4.h"
diff --git a/bsp/raspberry-pi/raspi4-64/drivers/drv_dsi_touch.c b/bsp/raspberry-pi/raspi4-64/drivers/drv_dsi_touch.c
index 33ec901f63..2628ea5404 100644
--- a/bsp/raspberry-pi/raspi4-64/drivers/drv_dsi_touch.c
+++ b/bsp/raspberry-pi/raspi4-64/drivers/drv_dsi_touch.c
@@ -9,7 +9,7 @@
  */
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/touch.h>
+#include "drivers/dev_touch.h"
 #include <ioremap.h>
 #include <mmu.h>
 
diff --git a/bsp/raspberry-pi/raspi4-64/drivers/drv_sdio.h b/bsp/raspberry-pi/raspi4-64/drivers/drv_sdio.h
index 30d9d8d343..6dc566fcac 100644
--- a/bsp/raspberry-pi/raspi4-64/drivers/drv_sdio.h
+++ b/bsp/raspberry-pi/raspi4-64/drivers/drv_sdio.h
@@ -13,7 +13,7 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 
 #include "board.h"
 #include "raspi4.h"
diff --git a/bsp/raspberry-pico/drivers/drv_soft_spi.h b/bsp/raspberry-pico/drivers/drv_soft_spi.h
index 1d19bb1382..c6711dce37 100644
--- a/bsp/raspberry-pico/drivers/drv_soft_spi.h
+++ b/bsp/raspberry-pico/drivers/drv_soft_spi.h
@@ -12,7 +12,7 @@
 
 #ifdef BSP_USING_SOFT_SPI
 #include <rtdevice.h>
-#include <spi-bit-ops.h>
+#include <dev_spi_bit_ops.h>
 
 /* pico soft spi config */
 struct pico_soft_spi_config
diff --git a/bsp/renesas/libraries/HAL_Drivers/drv_soft_spi.h b/bsp/renesas/libraries/HAL_Drivers/drv_soft_spi.h
index 5f45f1fca0..c096e6954c 100644
--- a/bsp/renesas/libraries/HAL_Drivers/drv_soft_spi.h
+++ b/bsp/renesas/libraries/HAL_Drivers/drv_soft_spi.h
@@ -13,7 +13,7 @@
 
 #include <rthw.h>
 #include <rtdevice.h>
-#include <spi-bit-ops.h>
+#include <dev_spi_bit_ops.h>
 
 /* ra soft spi config */
 struct ra_soft_spi_config
diff --git a/bsp/renesas/ra4m2-eco/board/ports/mnt.c b/bsp/renesas/ra4m2-eco/board/ports/mnt.c
index b22e84d34b..0a6e6bc38b 100644
--- a/bsp/renesas/ra4m2-eco/board/ports/mnt.c
+++ b/bsp/renesas/ra4m2-eco/board/ports/mnt.c
@@ -5,7 +5,7 @@
 
 #include <dfs_fs.h>
 
-#include <spi_msd.h>
+#include <dev_spi_msd.h>
 #include "drv_sci.h"
 
 #define DBG_TAG "app.filesystem"
diff --git a/bsp/renesas/ra6m3-hmi-board/board/ports/mnt.c b/bsp/renesas/ra6m3-hmi-board/board/ports/mnt.c
index 1670562291..9b1fb93749 100644
--- a/bsp/renesas/ra6m3-hmi-board/board/ports/mnt.c
+++ b/bsp/renesas/ra6m3-hmi-board/board/ports/mnt.c
@@ -102,7 +102,7 @@ static void sd_mount(void)
 }
 
 #else
-#include <spi_msd.h>
+#include <dev_spi_msd.h>
 #include "drv_sci.h"
 int sd_mount(void)
 {
diff --git a/bsp/renesas/ra8d1-vision-board/board/ports/mnt.c b/bsp/renesas/ra8d1-vision-board/board/ports/mnt.c
index 230208c440..c228415702 100644
--- a/bsp/renesas/ra8d1-vision-board/board/ports/mnt.c
+++ b/bsp/renesas/ra8d1-vision-board/board/ports/mnt.c
@@ -137,7 +137,7 @@ static void sd_mount(void)
 }
 
 #else
-#include <spi_msd.h>
+#include <dev_spi_msd.h>
 #include "drv_sci.h"
 int sd_mount(void)
 {
diff --git a/bsp/renesas/ra8m1-ek/board/ports/mnt.c b/bsp/renesas/ra8m1-ek/board/ports/mnt.c
index 1670562291..9b1fb93749 100644
--- a/bsp/renesas/ra8m1-ek/board/ports/mnt.c
+++ b/bsp/renesas/ra8m1-ek/board/ports/mnt.c
@@ -102,7 +102,7 @@ static void sd_mount(void)
 }
 
 #else
-#include <spi_msd.h>
+#include <dev_spi_msd.h>
 #include "drv_sci.h"
 int sd_mount(void)
 {
diff --git a/bsp/samd21/sam_d2x_asflib/common/utils/stdio/stdio_serial/stdio_serial.h b/bsp/samd21/sam_d2x_asflib/common/utils/stdio/stdio_serial/stdio_serial.h
index 4315d3fcdc..b014bd89fb 100644
--- a/bsp/samd21/sam_d2x_asflib/common/utils/stdio/stdio_serial/stdio_serial.h
+++ b/bsp/samd21/sam_d2x_asflib/common/utils/stdio/stdio_serial/stdio_serial.h
@@ -67,7 +67,7 @@
 #ifndef SAMD20
 # include "sysclk.h"
 #endif
-#include "serial.h"
+#include "drivers/dev_serial.h"
 
 #if (XMEGA || MEGA_RF) && defined(__GNUC__)
 	extern int _write (char c, int *f);
diff --git a/bsp/samd21/sam_d2x_asflib/common2/services/gfx_mono/gfx_mono_screen_dump.h b/bsp/samd21/sam_d2x_asflib/common2/services/gfx_mono/gfx_mono_screen_dump.h
index 87ed584078..677fb2a8fa 100644
--- a/bsp/samd21/sam_d2x_asflib/common2/services/gfx_mono/gfx_mono_screen_dump.h
+++ b/bsp/samd21/sam_d2x_asflib/common2/services/gfx_mono/gfx_mono_screen_dump.h
@@ -46,7 +46,7 @@
 #ifndef GFX_MONO_SCREEN_DUMP_H_INCLUDED
 #define GFX_MONO_SCREEN_DUMP_H_INCLUDED
 
-#include <serial.h>
+#include <drivers/dev_serial.h>
 #include <gfx_mono.h>
 
 #ifdef __cplusplus
diff --git a/bsp/samd21/sam_d2x_asflib/sam0/utils/stdio/stdio_serial/stdio_serial.h b/bsp/samd21/sam_d2x_asflib/sam0/utils/stdio/stdio_serial/stdio_serial.h
index bf8c4f5eee..24ae1dae33 100644
--- a/bsp/samd21/sam_d2x_asflib/sam0/utils/stdio/stdio_serial/stdio_serial.h
+++ b/bsp/samd21/sam_d2x_asflib/sam0/utils/stdio/stdio_serial/stdio_serial.h
@@ -66,7 +66,7 @@ extern "C" {
  * @{
  */
 
-#include <serial.h>
+#include <drivers/dev_serial.h>
 #include <stdio.h>
 #include <compiler.h>
 
diff --git a/bsp/sep6200/application/startup.c b/bsp/sep6200/application/startup.c
index d724bc99dd..fad0f6cf02 100644
--- a/bsp/sep6200/application/startup.c
+++ b/bsp/sep6200/application/startup.c
@@ -12,7 +12,7 @@
 #include <rtthread.h>
 
 #include <board.h>
-#include <serial.h>
+#include <drivers/dev_serial.h>
 #ifdef RT_USING_FINSH
 #include <finsh.h>
 #endif
diff --git a/bsp/sep6200/drivers/board.c b/bsp/sep6200/drivers/board.c
index 3a1ade2752..7f0c3d92b5 100644
--- a/bsp/sep6200/drivers/board.c
+++ b/bsp/sep6200/drivers/board.c
@@ -16,7 +16,7 @@
 #include <rthw.h>
 #include <rtthread.h>
 
-#include <serial.h>
+#include <drivers/dev_serial.h>
 
 #include <sep6200.h>
 
diff --git a/bsp/simulator/drivers/sst25vfxx_mtd.h b/bsp/simulator/drivers/sst25vfxx_mtd.h
index 202c6884a3..1fc767d03c 100644
--- a/bsp/simulator/drivers/sst25vfxx_mtd.h
+++ b/bsp/simulator/drivers/sst25vfxx_mtd.h
@@ -13,7 +13,7 @@
 #define SST25VFXX_MTD_H
 
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 
 rt_err_t sst25vfxx_mtd_init(const char *spi_device_name, rt_uint32_t block_start, rt_uint32_t block_end);
 
diff --git a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdio.h b/bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdio.h
index 9a122e4ef4..ebd0ff8ca2 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdio.h
+++ b/bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdio.h
@@ -17,8 +17,8 @@
 #include <drv_common.h>
 #include "drv_dma.h"
 #include <string.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 
 #if defined(SOC_SERIES_STM32F1) || defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4)
 #define SDCARD_INSTANCE_TYPE              SDIO_TypeDef
diff --git a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdmmc.h b/bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdmmc.h
index 6b388d4fb5..3e5631ca64 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdmmc.h
+++ b/bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdmmc.h
@@ -18,8 +18,8 @@
 #include <rthw.h>
 #include <drv_common.h>
 #include <string.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 
 #define SDIO_BUFF_SIZE       4096
 #define SDIO_ALIGN_LEN       32
diff --git a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_soft_spi.h b/bsp/stm32/libraries/HAL_Drivers/drivers/drv_soft_spi.h
index d6415875e8..2b1a5c6907 100644
--- a/bsp/stm32/libraries/HAL_Drivers/drivers/drv_soft_spi.h
+++ b/bsp/stm32/libraries/HAL_Drivers/drivers/drv_soft_spi.h
@@ -13,7 +13,7 @@
 
 #include <rthw.h>
 #include <rtdevice.h>
-#include <spi-bit-ops.h>
+#include <dev_spi_bit_ops.h>
 
 /* stm32 soft spi config */
 struct stm32_soft_spi_config
diff --git a/bsp/stm32/stm32f103-100ask-pro/board/ports/spi_flash_init.c b/bsp/stm32/stm32f103-100ask-pro/board/ports/spi_flash_init.c
index 2ac12abb73..168e3b9d44 100644
--- a/bsp/stm32/stm32f103-100ask-pro/board/ports/spi_flash_init.c
+++ b/bsp/stm32/stm32f103-100ask-pro/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include <drv_spi.h>
 #include <drv_gpio.h>
 
diff --git a/bsp/stm32/stm32f103-atk-nano/board/ports/spi_flash_init.c b/bsp/stm32/stm32f103-atk-nano/board/ports/spi_flash_init.c
index 4c9ea041fd..26b0e10c4e 100644
--- a/bsp/stm32/stm32f103-atk-nano/board/ports/spi_flash_init.c
+++ b/bsp/stm32/stm32f103-atk-nano/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
diff --git a/bsp/stm32/stm32f103-dofly-M3S/board/ports/drv_sdcard.c b/bsp/stm32/stm32f103-dofly-M3S/board/ports/drv_sdcard.c
index 122b3babbd..464ed712ac 100644
--- a/bsp/stm32/stm32f103-dofly-M3S/board/ports/drv_sdcard.c
+++ b/bsp/stm32/stm32f103-dofly-M3S/board/ports/drv_sdcard.c
@@ -66,7 +66,7 @@ INIT_APP_EXPORT(stm32_sdcard_mount);
 
 #ifdef BSP_USING_SPI_SDCARD
 #include "drv_spi.h"
-#include "spi_msd.h"
+#include "dev_spi_msd.h"
 static int rt_hw_spi2_tfcard(void)
 {
     __HAL_RCC_GPIOC_CLK_ENABLE();
diff --git a/bsp/stm32/stm32f103-dofly-M3S/board/ports/spi_flash_init.c b/bsp/stm32/stm32f103-dofly-M3S/board/ports/spi_flash_init.c
index ac67789c19..f23e1d2d26 100644
--- a/bsp/stm32/stm32f103-dofly-M3S/board/ports/spi_flash_init.c
+++ b/bsp/stm32/stm32f103-dofly-M3S/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/ports/spi_flash_init.c b/bsp/stm32/stm32f103-fire-arbitrary/board/ports/spi_flash_init.c
index e3e04bf619..d192c49e3b 100644
--- a/bsp/stm32/stm32f103-fire-arbitrary/board/ports/spi_flash_init.c
+++ b/bsp/stm32/stm32f103-fire-arbitrary/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include <drv_spi.h>
 #include <drv_gpio.h>
 
diff --git a/bsp/stm32/stm32f407-armfly-v5/board/ports/spi_flash_init.c b/bsp/stm32/stm32f407-armfly-v5/board/ports/spi_flash_init.c
index 56a0cdc45f..1f038b839b 100644
--- a/bsp/stm32/stm32f407-armfly-v5/board/ports/spi_flash_init.c
+++ b/bsp/stm32/stm32f407-armfly-v5/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/fal/fal_spi_flash_sfud_port.c b/bsp/stm32/stm32f407-atk-explorer/board/ports/fal/fal_spi_flash_sfud_port.c
index 96da95b4c4..9d3a44e44d 100644
--- a/bsp/stm32/stm32f407-atk-explorer/board/ports/fal/fal_spi_flash_sfud_port.c
+++ b/bsp/stm32/stm32f407-atk-explorer/board/ports/fal/fal_spi_flash_sfud_port.c
@@ -12,7 +12,7 @@
 #include <sfud.h>
 
 #ifdef RT_USING_SFUD
-#include <spi_flash_sfud.h>
+#include <dev_spi_flash_sfud.h>
 #endif
 
 static int init(void);
diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/soft_spi_flash_init.c b/bsp/stm32/stm32f407-atk-explorer/board/ports/soft_spi_flash_init.c
index 93a8e08299..c0ee45dab9 100644
--- a/bsp/stm32/stm32f407-atk-explorer/board/ports/soft_spi_flash_init.c
+++ b/bsp/stm32/stm32f407-atk-explorer/board/ports/soft_spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 #include "drv_soft_spi.h"
 
diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/spi_flash_init.c b/bsp/stm32/stm32f407-atk-explorer/board/ports/spi_flash_init.c
index d467ba3181..bbe544c1aa 100644
--- a/bsp/stm32/stm32f407-atk-explorer/board/ports/spi_flash_init.c
+++ b/bsp/stm32/stm32f407-atk-explorer/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include <drv_spi.h>
 #include <drv_gpio.h>
 
diff --git a/bsp/stm32/stm32f407-lckfb-skystar/board/ports/fal/fal_spi_flash_sfud_port.c b/bsp/stm32/stm32f407-lckfb-skystar/board/ports/fal/fal_spi_flash_sfud_port.c
index 96da95b4c4..9d3a44e44d 100644
--- a/bsp/stm32/stm32f407-lckfb-skystar/board/ports/fal/fal_spi_flash_sfud_port.c
+++ b/bsp/stm32/stm32f407-lckfb-skystar/board/ports/fal/fal_spi_flash_sfud_port.c
@@ -12,7 +12,7 @@
 #include <sfud.h>
 
 #ifdef RT_USING_SFUD
-#include <spi_flash_sfud.h>
+#include <dev_spi_flash_sfud.h>
 #endif
 
 static int init(void);
diff --git a/bsp/stm32/stm32f407-lckfb-skystar/board/ports/soft_spi_flash_init.c b/bsp/stm32/stm32f407-lckfb-skystar/board/ports/soft_spi_flash_init.c
index f1372de85a..d12f6564c6 100644
--- a/bsp/stm32/stm32f407-lckfb-skystar/board/ports/soft_spi_flash_init.c
+++ b/bsp/stm32/stm32f407-lckfb-skystar/board/ports/soft_spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include <drv_spi.h>
 #include <drv_soft_spi.h>
 
diff --git a/bsp/stm32/stm32f407-lckfb-skystar/board/ports/spi_flash_init.c b/bsp/stm32/stm32f407-lckfb-skystar/board/ports/spi_flash_init.c
index b4ae6a3df1..af299ea701 100644
--- a/bsp/stm32/stm32f407-lckfb-skystar/board/ports/spi_flash_init.c
+++ b/bsp/stm32/stm32f407-lckfb-skystar/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include <drv_spi.h>
 #include <drv_gpio.h>
 
diff --git a/bsp/stm32/stm32f407-rt-spark/board/ports/fal/fal_spi_flash_sfud_port.c b/bsp/stm32/stm32f407-rt-spark/board/ports/fal/fal_spi_flash_sfud_port.c
index 760fbfe5be..977430f633 100644
--- a/bsp/stm32/stm32f407-rt-spark/board/ports/fal/fal_spi_flash_sfud_port.c
+++ b/bsp/stm32/stm32f407-rt-spark/board/ports/fal/fal_spi_flash_sfud_port.c
@@ -12,7 +12,7 @@
 #include <sfud.h>
 
 #ifdef RT_USING_SFUD
-#include <spi_flash_sfud.h>
+#include <dev_spi_flash_sfud.h>
 #endif
 
 static int init(void);
diff --git a/bsp/stm32/stm32f407-rt-spark/board/ports/soft_spi_flash_init.c b/bsp/stm32/stm32f407-rt-spark/board/ports/soft_spi_flash_init.c
index f1372de85a..d12f6564c6 100644
--- a/bsp/stm32/stm32f407-rt-spark/board/ports/soft_spi_flash_init.c
+++ b/bsp/stm32/stm32f407-rt-spark/board/ports/soft_spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include <drv_spi.h>
 #include <drv_soft_spi.h>
 
diff --git a/bsp/stm32/stm32f407-rt-spark/board/ports/spi_flash_init.c b/bsp/stm32/stm32f407-rt-spark/board/ports/spi_flash_init.c
index 4b1f0f5f50..56f40fae41 100644
--- a/bsp/stm32/stm32f407-rt-spark/board/ports/spi_flash_init.c
+++ b/bsp/stm32/stm32f407-rt-spark/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include <drv_spi.h>
 #include <drv_gpio.h>
 
diff --git a/bsp/stm32/stm32f411-atk-nano/board/ports/spi_flash_init.c b/bsp/stm32/stm32f411-atk-nano/board/ports/spi_flash_init.c
index 4c9ea041fd..26b0e10c4e 100644
--- a/bsp/stm32/stm32f411-atk-nano/board/ports/spi_flash_init.c
+++ b/bsp/stm32/stm32f411-atk-nano/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
diff --git a/bsp/stm32/stm32f429-armfly-v6/board/ports/spi_flash_init.c b/bsp/stm32/stm32f429-armfly-v6/board/ports/spi_flash_init.c
index 9e4397ba79..1afb26256a 100644
--- a/bsp/stm32/stm32f429-armfly-v6/board/ports/spi_flash_init.c
+++ b/bsp/stm32/stm32f429-armfly-v6/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
diff --git a/bsp/stm32/stm32f429-atk-apollo/board/ports/spi_flash_init.c b/bsp/stm32/stm32f429-atk-apollo/board/ports/spi_flash_init.c
index f4d81dc74a..795a40efeb 100644
--- a/bsp/stm32/stm32f429-atk-apollo/board/ports/spi_flash_init.c
+++ b/bsp/stm32/stm32f429-atk-apollo/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
diff --git a/bsp/stm32/stm32f429-fire-challenger/board/ports/spi_flash_init.c b/bsp/stm32/stm32f429-fire-challenger/board/ports/spi_flash_init.c
index 68347cb78b..072fdeb651 100644
--- a/bsp/stm32/stm32f429-fire-challenger/board/ports/spi_flash_init.c
+++ b/bsp/stm32/stm32f429-fire-challenger/board/ports/spi_flash_init.c
@@ -9,8 +9,8 @@
  */
 
 #include <rtthread.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 #include "drv_spi.h"
 
 #if defined(BSP_USING_SPI_FLASH)
diff --git a/bsp/stm32/stm32f469-st-disco/board/ports/drv_qspi_flash.c b/bsp/stm32/stm32f469-st-disco/board/ports/drv_qspi_flash.c
index fe963373e2..d7d24f0c0f 100644
--- a/bsp/stm32/stm32f469-st-disco/board/ports/drv_qspi_flash.c
+++ b/bsp/stm32/stm32f469-st-disco/board/ports/drv_qspi_flash.c
@@ -17,8 +17,8 @@
 
 #ifdef BSP_USING_QSPI_FLASH
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 char n25qxxa_read_status_register2(struct rt_qspi_device *device)
 {
diff --git a/bsp/stm32/stm32f746-st-disco/board/ports/drv_qspi_flash.c b/bsp/stm32/stm32f746-st-disco/board/ports/drv_qspi_flash.c
index 795f8a06a1..ed7386c057 100644
--- a/bsp/stm32/stm32f746-st-disco/board/ports/drv_qspi_flash.c
+++ b/bsp/stm32/stm32f746-st-disco/board/ports/drv_qspi_flash.c
@@ -16,8 +16,8 @@
 
 #ifdef BSP_USING_QSPI_FLASH
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 char n25qxx_read_status_register2(struct rt_qspi_device *device)
 {
diff --git a/bsp/stm32/stm32f767-atk-apollo/board/ports/drv_qspi_flash.c b/bsp/stm32/stm32f767-atk-apollo/board/ports/drv_qspi_flash.c
index da7ed4fc36..08d736f179 100644
--- a/bsp/stm32/stm32f767-atk-apollo/board/ports/drv_qspi_flash.c
+++ b/bsp/stm32/stm32f767-atk-apollo/board/ports/drv_qspi_flash.c
@@ -16,8 +16,8 @@
 
 #ifdef BSP_USING_QSPI_FLASH
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 char w25qxx_read_status_register2(struct rt_qspi_device *device)
 {
diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/board/ports/drv_qspi_flash.c b/bsp/stm32/stm32f767-fire-challenger-v1/board/ports/drv_qspi_flash.c
index 21c015dc89..947e92c2f7 100644
--- a/bsp/stm32/stm32f767-fire-challenger-v1/board/ports/drv_qspi_flash.c
+++ b/bsp/stm32/stm32f767-fire-challenger-v1/board/ports/drv_qspi_flash.c
@@ -16,8 +16,8 @@
 
 #ifdef BSP_USING_QSPI_FLASH
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 char w25qxx_read_status_register2(struct rt_qspi_device *device)
 {
diff --git a/bsp/stm32/stm32h563-st-nucleo/board/ports/drv_spi_flash.c b/bsp/stm32/stm32h563-st-nucleo/board/ports/drv_spi_flash.c
index d2566f7d82..2ca11eeec0 100644
--- a/bsp/stm32/stm32h563-st-nucleo/board/ports/drv_spi_flash.c
+++ b/bsp/stm32/stm32h563-st-nucleo/board/ports/drv_spi_flash.c
@@ -17,8 +17,8 @@
 
 #ifdef BSP_USING_SPI_FLASH
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 static int rt_hw_spi_flash_init(void)
 {
diff --git a/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_qspi_flash.c b/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_qspi_flash.c
index da7ed4fc36..08d736f179 100644
--- a/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_qspi_flash.c
+++ b/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_qspi_flash.c
@@ -16,8 +16,8 @@
 
 #ifdef BSP_USING_QSPI_FLASH
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 char w25qxx_read_status_register2(struct rt_qspi_device *device)
 {
diff --git a/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_sdio.h b/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_sdio.h
index 276064ddad..92f6509a3c 100644
--- a/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_sdio.h
+++ b/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_sdio.h
@@ -16,8 +16,8 @@
 #include <rthw.h>
 #include <drv_common.h>
 #include <string.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 
 #define SDIO_BUFF_SIZE       4096
 #define SDIO_ALIGN_LEN       32
diff --git a/bsp/stm32/stm32h743-openmv-h7plus/board/ports/drv_qspi_flash.c b/bsp/stm32/stm32h743-openmv-h7plus/board/ports/drv_qspi_flash.c
index 2b5bf84449..282b991d60 100644
--- a/bsp/stm32/stm32h743-openmv-h7plus/board/ports/drv_qspi_flash.c
+++ b/bsp/stm32/stm32h743-openmv-h7plus/board/ports/drv_qspi_flash.c
@@ -19,8 +19,8 @@
 
 #ifdef BSP_USING_QSPI_FLASH
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 char w25qxx_read_status_register2(struct rt_qspi_device *device)
 {
diff --git a/bsp/stm32/stm32h743-openmv-h7plus/board/ports/drv_sdio.h b/bsp/stm32/stm32h743-openmv-h7plus/board/ports/drv_sdio.h
index fb4f531e3b..7755dd76b9 100644
--- a/bsp/stm32/stm32h743-openmv-h7plus/board/ports/drv_sdio.h
+++ b/bsp/stm32/stm32h743-openmv-h7plus/board/ports/drv_sdio.h
@@ -16,8 +16,8 @@
 #include <rthw.h>
 #include <drv_common.h>
 #include <string.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 
 #define SDIO_BUFF_SIZE       4096
 #define SDIO_ALIGN_LEN       32
diff --git a/bsp/stm32/stm32h750-artpi/board/port/drv_qspi_flash.c b/bsp/stm32/stm32h750-artpi/board/port/drv_qspi_flash.c
index 5fc97b214e..3698c49884 100644
--- a/bsp/stm32/stm32h750-artpi/board/port/drv_qspi_flash.c
+++ b/bsp/stm32/stm32h750-artpi/board/port/drv_qspi_flash.c
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <spi_flash.h>
+#include <dev_spi_flash.h>
 #include <drv_qspi.h>
 
 #ifdef BSP_USING_QSPI_FLASH
diff --git a/bsp/stm32/stm32h750-artpi/board/port/drv_sdio.h b/bsp/stm32/stm32h750-artpi/board/port/drv_sdio.h
index 53ded93d59..976997204b 100644
--- a/bsp/stm32/stm32h750-artpi/board/port/drv_sdio.h
+++ b/bsp/stm32/stm32h750-artpi/board/port/drv_sdio.h
@@ -17,8 +17,8 @@
 #include <rthw.h>
 #include <drv_common.h>
 #include <string.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 
 #define SDIO_BUFF_SIZE       4096
 #define SDIO_ALIGN_LEN       32
diff --git a/bsp/stm32/stm32h750-artpi/board/port/drv_wlan.c b/bsp/stm32/stm32h750-artpi/board/port/drv_wlan.c
index 06b9d47eb0..3522be9a0b 100644
--- a/bsp/stm32/stm32h750-artpi/board/port/drv_wlan.c
+++ b/bsp/stm32/stm32h750-artpi/board/port/drv_wlan.c
@@ -14,9 +14,9 @@
 #ifdef RT_USING_WIFI
 
 #include <drv_common.h>
-#include <wlan_mgnt.h>
-#include <wlan_prot.h>
-#include <wlan_cfg.h>
+#include <dev_wlan_mgnt.h>
+#include <dev_wlan_prot.h>
+#include <dev_wlan_cfg.h>
 #include <string.h>
 #include <fal.h>
 
diff --git a/bsp/stm32/stm32h750-artpi/board/port/spi_flash_init.c b/bsp/stm32/stm32h750-artpi/board/port/spi_flash_init.c
index 92a6367e2f..408f36d8a9 100644
--- a/bsp/stm32/stm32h750-artpi/board/port/spi_flash_init.c
+++ b/bsp/stm32/stm32h750-artpi/board/port/spi_flash_init.c
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <spi_flash.h>
+#include <dev_spi_flash.h>
 #include <drv_spi.h>
 
 static int rt_flash_init(void)
diff --git a/bsp/stm32/stm32h750-artpi/board/port/wifi_config.c b/bsp/stm32/stm32h750-artpi/board/port/wifi_config.c
index 256739de07..83b0ab1900 100644
--- a/bsp/stm32/stm32h750-artpi/board/port/wifi_config.c
+++ b/bsp/stm32/stm32h750-artpi/board/port/wifi_config.c
@@ -27,9 +27,9 @@
 
 #ifdef BSP_USING_WIFI
 
-#include <wlan_mgnt.h>
-#include <wlan_cfg.h>
-#include <wlan_prot.h>
+#include <dev_wlan_mgnt.h>
+#include <dev_wlan_cfg.h>
+#include <dev_wlan_prot.h>
 
 #include <easyflash.h>
 #include <fal.h>
diff --git a/bsp/stm32/stm32h750-weact-ministm32h7xx/board/port/drv_qspi_flash.c b/bsp/stm32/stm32h750-weact-ministm32h7xx/board/port/drv_qspi_flash.c
index 9390301b78..42b59d72af 100644
--- a/bsp/stm32/stm32h750-weact-ministm32h7xx/board/port/drv_qspi_flash.c
+++ b/bsp/stm32/stm32h750-weact-ministm32h7xx/board/port/drv_qspi_flash.c
@@ -20,8 +20,8 @@
 #include <sfud.h>
 #include "dfs_fs.h"
 #include "drv_spi.h"
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 //#define DRV_DEBUG
 #define LOG_TAG             "drv.qspiflash"
diff --git a/bsp/stm32/stm32h750-weact-ministm32h7xx/board/port/drv_spi_flash.c b/bsp/stm32/stm32h750-weact-ministm32h7xx/board/port/drv_spi_flash.c
index 21135d2d1c..f276576aa9 100644
--- a/bsp/stm32/stm32h750-weact-ministm32h7xx/board/port/drv_spi_flash.c
+++ b/bsp/stm32/stm32h750-weact-ministm32h7xx/board/port/drv_spi_flash.c
@@ -10,8 +10,8 @@
 #include <rtthread.h>
 #include <rtdevice.h>
 #include <drv_spi.h>
-#include <spi_flash.h>
-#include <spi_flash_sfud.h>
+#include <dev_spi_flash.h>
+#include <dev_spi_flash_sfud.h>
 #include <fal.h>
 #include <dfs_fs.h>
 
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_filesystem.c b/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_filesystem.c
index 8b7720c189..e3378fb1ef 100644
--- a/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_filesystem.c
+++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_filesystem.c
@@ -29,7 +29,7 @@
 
 #ifdef BSP_USING_SDCARD_FATFS
 #include <drv_spi.h>
-#include <spi_msd.h>
+#include <dev_spi_msd.h>
 static int rt_hw_spi1_tfcard(void)
 {
     __HAL_RCC_GPIOC_CLK_ENABLE();
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_qspi_flash.c b/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_qspi_flash.c
index 417f0880e2..6dac69cce7 100644
--- a/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_qspi_flash.c
+++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_qspi_flash.c
@@ -16,8 +16,8 @@
 
 #ifdef BSP_USING_QSPI_FLASH
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 char w25qxx_read_status_register2(struct rt_qspi_device *device)
 {
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_sdio_adapter.c b/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_sdio_adapter.c
index c7f561e0b7..0c78e75d3e 100644
--- a/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_sdio_adapter.c
+++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/drv_sdio_adapter.c
@@ -9,8 +9,8 @@
 
 #include <rtthread.h>
 #include <rthw.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 
 #include "stm32l4xx.h"
 
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/fal_flash_sfud_port.c b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/fal_flash_sfud_port.c
index fc9a1c7ada..0483fe5102 100644
--- a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/fal_flash_sfud_port.c
+++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/fal_flash_sfud_port.c
@@ -12,7 +12,7 @@
 #include <fal.h>
 
 #include <sfud.h>
-#include <spi_flash_sfud.h>
+#include <dev_spi_flash_sfud.h>
 
 sfud_flash sfud_norflash0;
 
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/wifi/wifi_config.c b/bsp/stm32/stm32l475-atk-pandora/board/ports/wifi/wifi_config.c
index 7f0986e0d7..dc02b0364b 100644
--- a/bsp/stm32/stm32l475-atk-pandora/board/ports/wifi/wifi_config.c
+++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/wifi/wifi_config.c
@@ -13,9 +13,9 @@
 
 #ifdef BSP_USING_WIFI
 
-#include <wlan_mgnt.h>
-#include <wlan_cfg.h>
-#include <wlan_prot.h>
+#include <dev_wlan_mgnt.h>
+#include <dev_wlan_cfg.h>
+#include <dev_wlan_prot.h>
 
 #include <easyflash.h>
 #include <fal.h>
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/wlan/drv_wlan.c b/bsp/stm32/stm32l475-atk-pandora/board/ports/wlan/drv_wlan.c
index 25d45fff4c..a086f19216 100644
--- a/bsp/stm32/stm32l475-atk-pandora/board/ports/wlan/drv_wlan.c
+++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/wlan/drv_wlan.c
@@ -10,9 +10,9 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <wlan_mgnt.h>
-#include <wlan_prot.h>
-#include <wlan_cfg.h>
+#include <dev_wlan_mgnt.h>
+#include <dev_wlan_prot.h>
+#include <dev_wlan_cfg.h>
 #include <fal.h>
 
 #include "drv_wlan.h"
diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.h b/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.h
index 9383e812e4..976d4cf4a1 100644
--- a/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.h
+++ b/bsp/stm32/stm32mp157a-st-discovery/board/ports/drv_sdio.h
@@ -16,8 +16,8 @@
 #include <rthw.h>
 #include <drv_common.h>
 #include <string.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 
 #ifndef SDIO1_BASE_ADDRESS
 #define SDIO1_BASE_ADDRESS    (SDMMC1)
diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.h b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.h
index 7f3e8c1dc8..8d909ab352 100644
--- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.h
+++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_emmc.h
@@ -16,8 +16,8 @@
 #include <rthw.h>
 #include <drv_common.h>
 #include <string.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
 
 #define SDIO_BUFF_SIZE       4096
 
diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_qspi_flash.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_qspi_flash.c
index 9834669aa1..390e022805 100644
--- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_qspi_flash.c
+++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_qspi_flash.c
@@ -16,8 +16,8 @@
 
 #ifdef BSP_USING_QSPI_FLASH
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 /**
 * @brief QSPI MSP Initialization
diff --git a/bsp/stm32/stm32u575-st-nucleo/board/ports/drv_spi_flash.c b/bsp/stm32/stm32u575-st-nucleo/board/ports/drv_spi_flash.c
index d2566f7d82..2ca11eeec0 100644
--- a/bsp/stm32/stm32u575-st-nucleo/board/ports/drv_spi_flash.c
+++ b/bsp/stm32/stm32u575-st-nucleo/board/ports/drv_spi_flash.c
@@ -17,8 +17,8 @@
 
 #ifdef BSP_USING_SPI_FLASH
 
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 static int rt_hw_spi_flash_init(void)
 {
diff --git a/bsp/synopsys/boards/drivers/rt_board.c b/bsp/synopsys/boards/drivers/rt_board.c
index 10d958fa00..1e4e7f3b10 100644
--- a/bsp/synopsys/boards/drivers/rt_board.c
+++ b/bsp/synopsys/boards/drivers/rt_board.c
@@ -8,7 +8,7 @@
 #include <rtthread.h>
 
 #include <rtdevice.h>
-#include <drivers/serial.h>
+#include <drivers/dev_serial.h>
 
 #include "rt_board.h"
 #include "arc/arc_timer.h"
diff --git a/bsp/synwit/swm320-mini/applications/main.c b/bsp/synwit/swm320-mini/applications/main.c
index 8c58c6a208..ee150569ff 100644
--- a/bsp/synwit/swm320-mini/applications/main.c
+++ b/bsp/synwit/swm320-mini/applications/main.c
@@ -261,7 +261,7 @@ MSH_CMD_EXPORT(wdt_sample, wdt sample);
 
 #include "drv_spi.h"
 #ifdef RT_USING_SFUD
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash_sfud.h"
 
 static int rt_hw_spi_flash_init(void)
 {
@@ -388,7 +388,7 @@ MSH_CMD_EXPORT(spi_flash_elmfat_sample, spi flash elmfat sample);
 #define SDCARD_NAME "sd0"
 
 #include "drv_spi.h"
-#include "spi_msd.h"
+#include "dev_spi_msd.h"
 #include <dfs_file.h>
 #include <unistd.h>
 
diff --git a/bsp/synwit/swm341-mini/applications/main.c b/bsp/synwit/swm341-mini/applications/main.c
index 9d84b0ea24..f46e4395cd 100644
--- a/bsp/synwit/swm341-mini/applications/main.c
+++ b/bsp/synwit/swm341-mini/applications/main.c
@@ -428,7 +428,7 @@ MSH_CMD_EXPORT(wdt_sample, wdt sample);
 
 #include "drv_spi.h"
 #ifdef RT_USING_SFUD
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash_sfud.h"
 
 static int rt_hw_spi_flash_init(void)
 {
@@ -551,7 +551,7 @@ MSH_CMD_EXPORT(elmfat_sample, elmfat sample);
 #define SDCARD_NAME "sd0"
 
 #include "drv_spi.h"
-#include "spi_msd.h"
+#include "dev_spi_msd.h"
 #include <dfs_file.h>
 #include <unistd.h>
 static int rt_hw_spi0_tfcard(void)
diff --git a/bsp/tm4c123bsp/libraries/Drivers/drv_spi.h b/bsp/tm4c123bsp/libraries/Drivers/drv_spi.h
index f657f304b6..c58a71381c 100644
--- a/bsp/tm4c123bsp/libraries/Drivers/drv_spi.h
+++ b/bsp/tm4c123bsp/libraries/Drivers/drv_spi.h
@@ -14,7 +14,7 @@
 #include <stdint.h>
 #include <rtdevice.h>
 #include <rthw.h>
-#include "drivers/spi.h"
+#include "drivers/dev_spi.h"
 
 rt_err_t rt_hw_spi_device_attach(const char *bus_name, const char *device_name, uint32_t portindex, uint32_t  cs_gpiobase, uint32_t cs_gpio_pin);
 
diff --git a/bsp/w60x/drivers/drv_wifi.c b/bsp/w60x/drivers/drv_wifi.c
index 4d618958cd..63bfe2ae44 100644
--- a/bsp/w60x/drivers/drv_wifi.c
+++ b/bsp/w60x/drivers/drv_wifi.c
@@ -9,7 +9,7 @@
  */
 
 #include <rtthread.h>
-#include <wlan_dev.h>
+#include <dev_wlan.h>
 #include "wm_type_def.h"
 #include "wm_wifi.h"
 #include "drv_wifi.h"
diff --git a/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f10x.c b/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f10x.c
index 537676591a..35d9c9eb50 100644
--- a/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f10x.c
+++ b/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f10x.c
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include "board.h"
 #include "drv_spi.h"
 #include "ch32f10x_spi.h"
diff --git a/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f20x.c b/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f20x.c
index 5db7b82a65..306a15f518 100644
--- a/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f20x.c
+++ b/bsp/wch/arm/Libraries/ch32_drivers/drv_spi_ch32f20x.c
@@ -10,7 +10,7 @@
 
 #include <rtthread.h>
 #include <rtdevice.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include "board.h"
 #include "drv_spi.h"
 #include "ch32f20x_spi.h"
diff --git a/bsp/wch/risc-v/Libraries/ch32_drivers/drv_soft_spi.h b/bsp/wch/risc-v/Libraries/ch32_drivers/drv_soft_spi.h
index 4451952dfc..9833ca3635 100644
--- a/bsp/wch/risc-v/Libraries/ch32_drivers/drv_soft_spi.h
+++ b/bsp/wch/risc-v/Libraries/ch32_drivers/drv_soft_spi.h
@@ -12,7 +12,7 @@
 
 #include <rthw.h>
 #include <rtdevice.h>
-#include <spi-bit-ops.h>
+#include <dev_spi_bit_ops.h>
 
 /* ch32 soft spi config */
 struct ch32_soft_spi_config
diff --git a/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_spi.c b/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_spi.c
index a57952d98c..43ea1d4be8 100644
--- a/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_spi.c
+++ b/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_spi.c
@@ -8,7 +8,7 @@
  * 2022-07-30     Emuzit            first version
  */
 #include <rthw.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include <drivers/dev_pin.h>
 #include "ch56x_spi.h"
 #include "ch56x_sys.h"
diff --git a/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_uart.c b/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_uart.c
index 918b50c7bc..436401ecdb 100644
--- a/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_uart.c
+++ b/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_uart.c
@@ -11,9 +11,9 @@
 #include <ipc/completion.h>
 #include <ipc/dataqueue.h>
 #ifdef RT_USING_SERIAL_V2
-    #include <drivers/serial_v2.h>
+    #include <drivers/dev_serial_v2.h>
 #else
-    #include <drivers/serial.h>
+    #include <drivers/dev_serial.h>
 #endif
 #include <drivers/dev_pin.h>
 #include "ch56x_sys.h"
diff --git a/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_wdt.c b/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_wdt.c
index f04ab23fc9..2327bf3dcd 100644
--- a/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_wdt.c
+++ b/bsp/wch/risc-v/Libraries/ch56x_drivers/ch56x_wdt.c
@@ -8,7 +8,7 @@
  * 2022-07-20     Emuzit            first version
  */
 #include <rthw.h>
-#include <drivers/watchdog.h>
+#include "drivers/dev_watchdog.h"
 #include "ch56x_sys.h"
 
 #define WDOG_HICOUNT_MAX    0xfff  // enough to hold (4095 * 120M/524288) >> 8
diff --git a/bsp/wch/risc-v/ch569w-evt/applications/test.c b/bsp/wch/risc-v/ch569w-evt/applications/test.c
index e6e6cd5c17..f29811f8ca 100644
--- a/bsp/wch/risc-v/ch569w-evt/applications/test.c
+++ b/bsp/wch/risc-v/ch569w-evt/applications/test.c
@@ -13,9 +13,9 @@
  */
 #include <rtthread.h>
 #include <drivers/dev_pin.h>
-#include <drivers/watchdog.h>
+#include "drivers/dev_watchdog.h"
 #include <drivers/hwtimer.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include <drivers/dev_pwm.h>
 #include "board.h"
 
diff --git a/bsp/zynqmp-r5-axu4ev/drivers/drv_sdcard.c b/bsp/zynqmp-r5-axu4ev/drivers/drv_sdcard.c
index 3ce161b0d4..b1f700971b 100644
--- a/bsp/zynqmp-r5-axu4ev/drivers/drv_sdcard.c
+++ b/bsp/zynqmp-r5-axu4ev/drivers/drv_sdcard.c
@@ -11,7 +11,7 @@
 #include <rtthread.h>
 #include <rtdevice.h>
 #include <dfs_fs.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_mmcsd_core.h>
 
 #include <stdint.h>
 #include <stdio.h>
diff --git a/components/drivers/include/drivers/gpt.h b/components/drivers/include/drivers/dev_gpt.h
similarity index 98%
rename from components/drivers/include/drivers/gpt.h
rename to components/drivers/include/drivers/dev_gpt.h
index b88784764b..269208e82c 100644
--- a/components/drivers/include/drivers/gpt.h
+++ b/components/drivers/include/drivers/dev_gpt.h
@@ -7,8 +7,8 @@
  * Date           Author        Notes
  * 2022-05-05     linzhenxing     first version
  */
-#ifndef __GPT_H
-#define __GPT_H
+#ifndef __DEV_GPT_H__
+#define __DEV_GPT_H__
 
 #include <rtthread.h>
 #include <stdint.h>
@@ -129,4 +129,4 @@ typedef struct _legacy_mbr
 int check_gpt(struct rt_mmcsd_card *card);
 int gpt_get_partition_param(struct rt_mmcsd_card *card, struct dfs_partition *part, uint32_t pindex);
 void gpt_free(void);
-#endif /*__GPT_H*/
+#endif /*__DEV_GPT_H__*/
diff --git a/components/drivers/include/drivers/mmc.h b/components/drivers/include/drivers/dev_mmc.h
similarity index 99%
rename from components/drivers/include/drivers/mmc.h
rename to components/drivers/include/drivers/dev_mmc.h
index 88ee740050..a5372878b8 100644
--- a/components/drivers/include/drivers/mmc.h
+++ b/components/drivers/include/drivers/dev_mmc.h
@@ -9,8 +9,8 @@
  * 2024-05-25     HPMicro       add strobe support
  */
 
-#ifndef __MMC_H__
-#define __MMC_H__
+#ifndef __DEV_MMC_H__
+#define __DEV_MMC_H__
 
 #include <rtthread.h>
 #include <drivers/mmcsd_host.h>
diff --git a/components/drivers/include/drivers/mmcsd_core.h b/components/drivers/include/drivers/dev_mmcsd_core.h
similarity index 99%
rename from components/drivers/include/drivers/mmcsd_core.h
rename to components/drivers/include/drivers/dev_mmcsd_core.h
index 3a6ac13aa9..b6bb1edcc5 100644
--- a/components/drivers/include/drivers/mmcsd_core.h
+++ b/components/drivers/include/drivers/dev_mmcsd_core.h
@@ -8,8 +8,8 @@
  * 2011-07-25     weety     first version
  */
 
-#ifndef __CORE_H__
-#define __CORE_H__
+#ifndef __DEV_MMCSD_CORE_H__
+#define __DEV_MMCSD_CORE_H__
 
 #include <rtthread.h>
 #include <drivers/mmcsd_host.h>
diff --git a/components/drivers/include/drivers/sd.h b/components/drivers/include/drivers/dev_sd.h
similarity index 96%
rename from components/drivers/include/drivers/sd.h
rename to components/drivers/include/drivers/dev_sd.h
index 4b7b093600..ca8bb0cb47 100644
--- a/components/drivers/include/drivers/sd.h
+++ b/components/drivers/include/drivers/dev_sd.h
@@ -9,8 +9,8 @@
  * 2024-05-26     HPMicro       Add UHS-I support
  */
 
-#ifndef __SD_H__
-#define __SD_H__
+#ifndef __DEV_SD_H__
+#define __DEV_SD_H__
 
 #include <rtthread.h>
 #include <drivers/mmcsd_host.h>
diff --git a/components/drivers/include/drivers/sdio.h b/components/drivers/include/drivers/dev_sdio.h
similarity index 99%
rename from components/drivers/include/drivers/sdio.h
rename to components/drivers/include/drivers/dev_sdio.h
index b145ffd280..a8d30fd76b 100644
--- a/components/drivers/include/drivers/sdio.h
+++ b/components/drivers/include/drivers/dev_sdio.h
@@ -8,8 +8,8 @@
  * 2012-01-15     weety         first version
  */
 
-#ifndef __SDIO_H__
-#define __SDIO_H__
+#ifndef __DEV_SDIO_H__
+#define __DEV_SDIO_H__
 
 #include <rtthread.h>
 #include <drivers/mmcsd_host.h>
diff --git a/components/drivers/include/drivers/serial.h b/components/drivers/include/drivers/dev_serial.h
similarity index 99%
rename from components/drivers/include/drivers/serial.h
rename to components/drivers/include/drivers/dev_serial.h
index d90b90607c..418c25fa1d 100644
--- a/components/drivers/include/drivers/serial.h
+++ b/components/drivers/include/drivers/dev_serial.h
@@ -11,8 +11,8 @@
  *                             the size of ring buffer.
  */
 
-#ifndef __SERIAL_H__
-#define __SERIAL_H__
+#ifndef __DEV_SERIAL_H__
+#define __DEV_SERIAL_H__
 
 #include <rtthread.h>
 
diff --git a/components/drivers/include/drivers/serial_v2.h b/components/drivers/include/drivers/dev_serial_v2.h
similarity index 99%
rename from components/drivers/include/drivers/serial_v2.h
rename to components/drivers/include/drivers/dev_serial_v2.h
index d0dcf37813..0c3d095ab3 100644
--- a/components/drivers/include/drivers/serial_v2.h
+++ b/components/drivers/include/drivers/dev_serial_v2.h
@@ -8,8 +8,8 @@
  * 2021-06-01     KyleChan     first version
  */
 
-#ifndef __SERIAL_V2_H__
-#define __SERIAL_V2_H__
+#ifndef __DEV_SERIAL_V2_H__
+#define __DEV_SERIAL_V2_H__
 
 #include <rtthread.h>
 
diff --git a/components/drivers/include/drivers/spi.h b/components/drivers/include/drivers/dev_spi.h
similarity index 99%
rename from components/drivers/include/drivers/spi.h
rename to components/drivers/include/drivers/dev_spi.h
index 8c0bf0bbe9..d7eda39599 100644
--- a/components/drivers/include/drivers/spi.h
+++ b/components/drivers/include/drivers/dev_spi.h
@@ -10,8 +10,8 @@
  * 2022-09-01     liYony       fix api rt_spi_sendrecv16 about MSB and LSB bug
  */
 
-#ifndef __SPI_H__
-#define __SPI_H__
+#ifndef __DEV_SPI_H__
+#define __DEV_SPI_H__
 
 #include <stdlib.h>
 #include <rtthread.h>
diff --git a/components/drivers/include/drivers/touch.h b/components/drivers/include/drivers/dev_touch.h
similarity index 98%
rename from components/drivers/include/drivers/touch.h
rename to components/drivers/include/drivers/dev_touch.h
index edaf0ad230..d5cd08fc1c 100644
--- a/components/drivers/include/drivers/touch.h
+++ b/components/drivers/include/drivers/dev_touch.h
@@ -8,8 +8,8 @@
  * 2019-05-20     tyustli      the first version
  */
 
-#ifndef __TOUCH_H__
-#define __TOUCH_H__
+#ifndef __DEV_TOUCH_H__
+#define __DEV_TOUCH_H__
 
 #include <rtthread.h>
 #include "dev_pin.h"
@@ -110,4 +110,4 @@ void rt_hw_touch_isr(rt_touch_t touch);
 }
 #endif
 
-#endif /* __TOUCH_H__ */
+#endif /* __DEV_TOUCH_H__ */
diff --git a/components/drivers/include/drivers/watchdog.h b/components/drivers/include/drivers/dev_watchdog.h
similarity index 94%
rename from components/drivers/include/drivers/watchdog.h
rename to components/drivers/include/drivers/dev_watchdog.h
index e08d35d87e..4b5614fc87 100644
--- a/components/drivers/include/drivers/watchdog.h
+++ b/components/drivers/include/drivers/dev_watchdog.h
@@ -8,8 +8,8 @@
  * 2012-09-12     heyuanjie87  first version.
  */
 
-#ifndef  __WATCHDOG_H__
-#define  __WATCHDOG_H__
+#ifndef  __DEV_WATCHDOG_H__
+#define  __DEV_WATCHDOG_H__
 
 #include <rtthread.h>
 
@@ -39,4 +39,4 @@ rt_err_t rt_hw_watchdog_register(rt_watchdog_t *wdt,
                                  rt_uint32_t    flag,
                                  void          *data);
 
-#endif /* __WATCHDOG_H__ */
+#endif /* __DEV_WATCHDOG_H__ */
diff --git a/components/drivers/include/drivers/wlan.h b/components/drivers/include/drivers/wlan.h
index 946851808a..4a1ab5b26c 100644
--- a/components/drivers/include/drivers/wlan.h
+++ b/components/drivers/include/drivers/wlan.h
@@ -12,10 +12,10 @@
 #define __WLAN_H__
 
 #include <rtthread.h>
-#include <wlan_dev.h>
-#include <wlan_cfg.h>
-#include <wlan_mgnt.h>
-#include <wlan_prot.h>
-#include <wlan_workqueue.h>
+#include <dev_wlan.h>
+#include <dev_wlan_cfg.h>
+#include <dev_wlan_mgnt.h>
+#include <dev_wlan_prot.h>
+#include <dev_wlan_workqueue.h>
 
 #endif
diff --git a/components/drivers/include/rtdevice.h b/components/drivers/include/rtdevice.h
index caff5284e5..c8ed3c0489 100644
--- a/components/drivers/include/rtdevice.h
+++ b/components/drivers/include/rtdevice.h
@@ -66,7 +66,7 @@ extern "C" {
 #endif /* RT_USING_RTC */
 
 #ifdef RT_USING_SPI
-#include "drivers/spi.h"
+#include "drivers/dev_spi.h"
 #endif /* RT_USING_SPI */
 
 #ifdef RT_USING_MTD_NOR
@@ -87,9 +87,9 @@ extern "C" {
 
 #ifdef RT_USING_SERIAL
 #ifdef RT_USING_SERIAL_V2
-#include "drivers/serial_v2.h"
+#include "drivers/dev_serial_v2.h"
 #else
-#include "drivers/serial.h"
+#include "drivers/dev_serial.h"
 #endif
 #endif /* RT_USING_SERIAL */
 
@@ -111,14 +111,14 @@ extern "C" {
 #endif /* RT_USING_PHY */
 
 #ifdef RT_USING_SDIO
-#include "drivers/mmcsd_core.h"
-#include "drivers/sd.h"
-#include "drivers/sdio.h"
+#include "drivers/dev_mmcsd_core.h"
+#include "drivers/dev_sd.h"
+#include "drivers/dev_sdio.h"
 #endif /* RT_USING_SDIO */
 
 
 #ifdef RT_USING_WDT
-#include "drivers/watchdog.h"
+#include "drivers/dev_watchdog.h"
 #endif /* RT_USING_WDT */
 
 #ifdef RT_USING_PIN
@@ -190,7 +190,7 @@ extern "C" {
 #endif /* RT_USING_INPUT_CAPTURE */
 
 #ifdef RT_USING_TOUCH
-#include "drivers/touch.h"
+#include "drivers/dev_touch.h"
 #endif
 
 #ifdef RT_USING_DEV_BUS
diff --git a/components/drivers/sdio/SConscript b/components/drivers/sdio/SConscript
index d5b6eb1cb9..57f0587533 100644
--- a/components/drivers/sdio/SConscript
+++ b/components/drivers/sdio/SConscript
@@ -3,12 +3,12 @@ from building import *
 
 cwd = GetCurrentDir()
 src = Split("""
-block_dev.c
-mmcsd_core.c
-sd.c
-sdio.c
-gpt.c
-mmc.c
+dev_block.c
+dev_mmcsd_core.c
+dev_sd.c
+dev_sdio.c
+dev_gpt.c
+dev_mmc.c
 """)
 
 # The set of source files associated with this SConscript file.
diff --git a/components/drivers/sdio/block_dev.c b/components/drivers/sdio/dev_block.c
similarity index 99%
rename from components/drivers/sdio/block_dev.c
rename to components/drivers/sdio/dev_block.c
index fcef99f170..e4097bc329 100644
--- a/components/drivers/sdio/block_dev.c
+++ b/components/drivers/sdio/dev_block.c
@@ -12,8 +12,8 @@
 #include <dfs_fs.h>
 #include <dfs_file.h>
 
-#include <drivers/mmcsd_core.h>
-#include <drivers/gpt.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_gpt.h>
 
 #define DBG_TAG               "SDIO"
 #ifdef RT_SDIO_DEBUG
diff --git a/components/drivers/sdio/gpt.c b/components/drivers/sdio/dev_gpt.c
similarity index 99%
rename from components/drivers/sdio/gpt.c
rename to components/drivers/sdio/dev_gpt.c
index 53b686e9f6..047c6544fe 100644
--- a/components/drivers/sdio/gpt.c
+++ b/components/drivers/sdio/dev_gpt.c
@@ -9,8 +9,8 @@
  */
 #include <rtthread.h>
 #include <dfs_fs.h>
-#include <drivers/gpt.h>
-#include <drivers/mmcsd_core.h>
+#include <drivers/dev_gpt.h>
+#include <drivers/dev_mmcsd_core.h>
 
 #define DBG_TAG               "GPT"
 #ifdef RT_SDIO_DEBUG
diff --git a/components/drivers/sdio/mmc.c b/components/drivers/sdio/dev_mmc.c
similarity index 99%
rename from components/drivers/sdio/mmc.c
rename to components/drivers/sdio/dev_mmc.c
index 3723d9db76..6e1cdced0a 100644
--- a/components/drivers/sdio/mmc.c
+++ b/components/drivers/sdio/dev_mmc.c
@@ -9,8 +9,8 @@
  * 2024-05-25     HPMicro      add HS400 support
  */
 
-#include <drivers/mmcsd_core.h>
-#include <drivers/mmc.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_mmc.h>
 
 #define DBG_TAG               "SDIO"
 #ifdef RT_SDIO_DEBUG
diff --git a/components/drivers/sdio/mmcsd_core.c b/components/drivers/sdio/dev_mmcsd_core.c
similarity index 99%
rename from components/drivers/sdio/mmcsd_core.c
rename to components/drivers/sdio/dev_mmcsd_core.c
index 77570268c1..33072c10dd 100644
--- a/components/drivers/sdio/mmcsd_core.c
+++ b/components/drivers/sdio/dev_mmcsd_core.c
@@ -9,10 +9,10 @@
  */
 
 #include <rtthread.h>
-#include <drivers/mmcsd_core.h>
-#include <drivers/sd.h>
-#include <drivers/mmc.h>
-#include <drivers/sdio.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sd.h>
+#include <drivers/dev_mmc.h>
+#include <drivers/dev_sdio.h>
 #include <string.h>
 
 #define DBG_TAG               "SDIO"
diff --git a/components/drivers/sdio/sd.c b/components/drivers/sdio/dev_sd.c
similarity index 99%
rename from components/drivers/sdio/sd.c
rename to components/drivers/sdio/dev_sd.c
index a6f4dda93a..22725dbe1d 100644
--- a/components/drivers/sdio/sd.c
+++ b/components/drivers/sdio/dev_sd.c
@@ -9,8 +9,8 @@
  * 2024-05-26     HPMicro       add UHS-I support
  */
 
-#include <drivers/mmcsd_core.h>
-#include <drivers/sd.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sd.h>
 
 #define DBG_TAG               "SDIO"
 #ifdef RT_SDIO_DEBUG
diff --git a/components/drivers/sdio/sdio.c b/components/drivers/sdio/dev_sdio.c
similarity index 99%
rename from components/drivers/sdio/sdio.c
rename to components/drivers/sdio/dev_sdio.c
index 9fa3f539cd..013753a957 100644
--- a/components/drivers/sdio/sdio.c
+++ b/components/drivers/sdio/dev_sdio.c
@@ -10,9 +10,9 @@
  * 2024-07-05     Evlers        fix a bug that read members in non-existent functions
  */
 
-#include <drivers/mmcsd_core.h>
-#include <drivers/sdio.h>
-#include <drivers/sd.h>
+#include <drivers/dev_mmcsd_core.h>
+#include <drivers/dev_sdio.h>
+#include <drivers/dev_sd.h>
 
 #define DBG_TAG               "SDIO"
 #ifdef RT_SDIO_DEBUG
diff --git a/components/drivers/serial/SConscript b/components/drivers/serial/SConscript
index 7ee41a4331..ce9d221643 100644
--- a/components/drivers/serial/SConscript
+++ b/components/drivers/serial/SConscript
@@ -12,9 +12,9 @@ if GetDepend(['RT_USING_SMART']):
     src += Glob('serial_tty.c')
 
 if GetDepend(['RT_USING_SERIAL_V2']):
-    src += ['serial_v2.c']
+    src += ['dev_serial_v2.c']
 else:
-    src += ['serial.c']
+    src += ['dev_serial.c']
 
 if GetDepend(['RT_USING_DM']):
     src += ['serial_dm.c']
diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/dev_serial.c
similarity index 100%
rename from components/drivers/serial/serial.c
rename to components/drivers/serial/dev_serial.c
diff --git a/components/drivers/serial/serial_v2.c b/components/drivers/serial/dev_serial_v2.c
similarity index 100%
rename from components/drivers/serial/serial_v2.c
rename to components/drivers/serial/dev_serial_v2.c
diff --git a/components/drivers/spi/SConscript b/components/drivers/spi/SConscript
index cea447fab4..874db5b7e9 100644
--- a/components/drivers/spi/SConscript
+++ b/components/drivers/spi/SConscript
@@ -3,29 +3,29 @@ from gcc import *
 import rtconfig
 
 cwd = GetCurrentDir()
-src = ['spi_core.c', 'spi_dev.c']
+src = ['dev_spi_core.c', 'dev_spi.c']
 CPPPATH = [cwd, cwd + '/../include']
 LOCAL_CFLAGS = ''
 
 if GetDepend('RT_USING_SPI_BITOPS'):
-    src += ['spi-bit-ops.c']
+    src += ['dev_spi_bit_ops.c']
 
 if GetDepend('RT_USING_QSPI'):
-    src += ['qspi_core.c']
+    src += ['dev_qspi_core.c']
 
 src_device = []
 
 if GetDepend('RT_USING_SPI_WIFI'):
-    src_device += ['spi_wifi_rw009.c']
+    src_device += ['dev_spi_wifi_rw009.c']
 
 if GetDepend('RT_USING_ENC28J60'):
     src_device += ['enc28j60.c']
 
 if GetDepend('RT_USING_SPI_MSD'):
-    src_device += ['spi_msd.c']
+    src_device += ['dev_spi_msd.c']
 
 if GetDepend('RT_USING_SFUD'):
-    src_device += ['spi_flash_sfud.c', 'sfud/src/sfud.c']
+    src_device += ['dev_spi_flash_sfud.c', 'sfud/src/sfud.c']
     CPPPATH += [cwd + '/sfud/inc']
     if GetDepend('RT_SFUD_USING_SFDP'):
         src_device += ['sfud/src/sfud_sfdp.c']
diff --git a/components/drivers/spi/qspi_core.c b/components/drivers/spi/dev_qspi_core.c
similarity index 99%
rename from components/drivers/spi/qspi_core.c
rename to components/drivers/spi/dev_qspi_core.c
index cd40c51646..e56fd947d0 100644
--- a/components/drivers/spi/qspi_core.c
+++ b/components/drivers/spi/dev_qspi_core.c
@@ -8,7 +8,7 @@
  * 2018-11-16     zylx      first version.
  */
 
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 
 rt_err_t rt_qspi_configure(struct rt_qspi_device *device, struct rt_qspi_configuration *cfg)
 {
diff --git a/components/drivers/spi/spi_dev.c b/components/drivers/spi/dev_spi.c
similarity index 99%
rename from components/drivers/spi/spi_dev.c
rename to components/drivers/spi/dev_spi.c
index 963b70c23b..b40ffd90db 100644
--- a/components/drivers/spi/spi_dev.c
+++ b/components/drivers/spi/dev_spi.c
@@ -8,7 +8,7 @@
  */
 
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 
 /* SPI bus device interface, compatible with RT-Thread 0.3.x/1.0.x */
 static rt_ssize_t _spi_bus_device_read(rt_device_t dev,
diff --git a/components/drivers/spi/spi-bit-ops.c b/components/drivers/spi/dev_spi_bit_ops.c
similarity index 99%
rename from components/drivers/spi/spi-bit-ops.c
rename to components/drivers/spi/dev_spi_bit_ops.c
index 679ee44f0c..d2a26a766d 100644
--- a/components/drivers/spi/spi-bit-ops.c
+++ b/components/drivers/spi/dev_spi_bit_ops.c
@@ -8,7 +8,7 @@
  * 2021-10-11     kyle          first version
  */
 
-#include <spi-bit-ops.h>
+#include <dev_spi_bit_ops.h>
 #include <rtdevice.h>
 
 #define DBG_TAG               "SPI"
diff --git a/components/drivers/spi/spi-bit-ops.h b/components/drivers/spi/dev_spi_bit_ops.h
similarity index 95%
rename from components/drivers/spi/spi-bit-ops.h
rename to components/drivers/spi/dev_spi_bit_ops.h
index d1e83cdedd..cf2335efe6 100644
--- a/components/drivers/spi/spi-bit-ops.h
+++ b/components/drivers/spi/dev_spi_bit_ops.h
@@ -9,8 +9,8 @@
  * 2022-6-14      solar         Remove the const attribute of private data in ops
  */
 
-#ifndef __SPI_BIT_OPS_H__
-#define __SPI_BIT_OPS_H__
+#ifndef __DEV_SPI_BIT_OPS_H__
+#define __DEV_SPI_BIT_OPS_H__
 
 #include <rtdevice.h>
 
diff --git a/components/drivers/spi/spi_core.c b/components/drivers/spi/dev_spi_core.c
similarity index 99%
rename from components/drivers/spi/spi_core.c
rename to components/drivers/spi/dev_spi_core.c
index d9d4221d49..9733a01a5e 100644
--- a/components/drivers/spi/spi_core.c
+++ b/components/drivers/spi/dev_spi_core.c
@@ -13,7 +13,7 @@
  * 2012-09-28     aozima       fixed rt_spi_release_bus assert error.
  */
 
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 
 #define DBG_TAG    "spi.core"
 #define DBG_LVL    DBG_INFO
diff --git a/components/drivers/spi/spi_flash.h b/components/drivers/spi/dev_spi_flash.h
similarity index 93%
rename from components/drivers/spi/spi_flash.h
rename to components/drivers/spi/dev_spi_flash.h
index 2651c76fa4..5ae54c4e2a 100644
--- a/components/drivers/spi/spi_flash.h
+++ b/components/drivers/spi/dev_spi_flash.h
@@ -9,8 +9,8 @@
  * 2020/1/7       redoc        add include
  */
 
-#ifndef SPI_FLASH_H__
-#define SPI_FLASH_H__
+#ifndef __DEV_SPI_FLASH_H__
+#define __DEV_SPI_FLASH_H__
 
 #include <rtdevice.h>
 
diff --git a/components/drivers/spi/spi_flash_sfud.c b/components/drivers/spi/dev_spi_flash_sfud.c
similarity index 99%
rename from components/drivers/spi/spi_flash_sfud.c
rename to components/drivers/spi/dev_spi_flash_sfud.c
index 761c9ccc0d..e1c90db9e6 100644
--- a/components/drivers/spi/spi_flash_sfud.c
+++ b/components/drivers/spi/dev_spi_flash_sfud.c
@@ -11,8 +11,8 @@
 #include <stdint.h>
 #include <string.h>
 #include <rtdevice.h>
-#include "spi_flash.h"
-#include "spi_flash_sfud.h"
+#include "dev_spi_flash.h"
+#include "dev_spi_flash_sfud.h"
 
 #ifdef RT_USING_SFUD
 
diff --git a/components/drivers/spi/spi_flash_sfud.h b/components/drivers/spi/dev_spi_flash_sfud.h
similarity index 93%
rename from components/drivers/spi/spi_flash_sfud.h
rename to components/drivers/spi/dev_spi_flash_sfud.h
index 6099c9823b..7769ddc808 100644
--- a/components/drivers/spi/spi_flash_sfud.h
+++ b/components/drivers/spi/dev_spi_flash_sfud.h
@@ -8,13 +8,13 @@
  * 2016-09-28     armink       first version.
  */
 
-#ifndef _SPI_FLASH_SFUD_H_
-#define _SPI_FLASH_SFUD_H_
+#ifndef __DEV_SPI_FLASH_SFUD_H__
+#define __DEV_SPI_FLASH_SFUD_H__
 
 #include <rtthread.h>
 #include <rtdevice.h>
 #include "./sfud/inc/sfud.h"
-#include "spi_flash.h"
+#include "dev_spi_flash.h"
 
 /**
  * Probe SPI flash by SFUD(Serial Flash Universal Driver) driver library and though SPI device.
@@ -66,4 +66,4 @@ sfud_flash_t rt_sfud_flash_find(const char *spi_dev_name);
  */
 sfud_flash_t rt_sfud_flash_find_by_dev_name(const char *flash_dev_name);
 
-#endif /* _SPI_FLASH_SFUD_H_ */
+#endif /* __DEV_SPI_FLASH_SFUD_H__ */
diff --git a/components/drivers/spi/spi_msd.c b/components/drivers/spi/dev_spi_msd.c
similarity index 99%
rename from components/drivers/spi/spi_msd.c
rename to components/drivers/spi/dev_spi_msd.c
index 0ca1bdfbb5..8d81e348af 100644
--- a/components/drivers/spi/spi_msd.c
+++ b/components/drivers/spi/dev_spi_msd.c
@@ -14,7 +14,7 @@
  */
 
 #include <string.h>
-#include "spi_msd.h"
+#include "dev_spi_msd.h"
 
 //#define MSD_TRACE
 
diff --git a/components/drivers/spi/spi_msd.h b/components/drivers/spi/dev_spi_msd.h
similarity index 97%
rename from components/drivers/spi/spi_msd.h
rename to components/drivers/spi/dev_spi_msd.h
index 2b66be7d67..7304b13853 100644
--- a/components/drivers/spi/spi_msd.h
+++ b/components/drivers/spi/dev_spi_msd.h
@@ -8,12 +8,12 @@
  * 2009-04-17     Bernard      first version.
  */
 
-#ifndef SPI_MSD_H_INCLUDED
-#define SPI_MSD_H_INCLUDED
+#ifndef __DEV_SPI_MSD_H_INCLUDED__
+#define __DEV_SPI_MSD_H_INCLUDED__
 
 #include <stdint.h>
 #include <rtdevice.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 
 /* SD command (SPI mode) */
 #define GO_IDLE_STATE                       0   /* CMD0  R1  */
@@ -125,4 +125,4 @@ struct msd_device
 
 extern rt_err_t msd_init(const char * sd_device_name, const char * spi_device_name);
 
-#endif // SPI_MSD_H_INCLUDED
+#endif // __DEV_SPI_MSD_H_INCLUDED
diff --git a/components/drivers/spi/spi_wifi_rw009.c b/components/drivers/spi/dev_spi_wifi_rw009.c
similarity index 99%
rename from components/drivers/spi/spi_wifi_rw009.c
rename to components/drivers/spi/dev_spi_wifi_rw009.c
index 44f70e2b77..b3bd807ebd 100644
--- a/components/drivers/spi/spi_wifi_rw009.c
+++ b/components/drivers/spi/dev_spi_wifi_rw009.c
@@ -11,7 +11,7 @@
  */
 
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 
 #include <netif/ethernetif.h>
 #include <netif/etharp.h>
@@ -32,7 +32,7 @@
 #endif /* #ifdef WIFI_DEBUG_ON */
 
 /********************************* RW009 **************************************/
-#include "spi_wifi_rw009.h"
+#include "dev_spi_wifi_rw009.h"
 
 /* tools */
 #define node_entry(node, type, member) \
diff --git a/components/drivers/spi/spi_wifi_rw009.h b/components/drivers/spi/dev_spi_wifi_rw009.h
similarity index 98%
rename from components/drivers/spi/spi_wifi_rw009.h
rename to components/drivers/spi/dev_spi_wifi_rw009.h
index 9bba2694af..5aecbce935 100644
--- a/components/drivers/spi/spi_wifi_rw009.h
+++ b/components/drivers/spi/dev_spi_wifi_rw009.h
@@ -9,8 +9,8 @@
  * 2014-09-18     aozima       update command & response.
  */
 
-#ifndef SPI_WIFI_H_INCLUDED
-#define SPI_WIFI_H_INCLUDED
+#ifndef __DEV_SPI_WIFI_H_INCLUDED__
+#define __DEV_SPI_WIFI_H_INCLUDED__
 
 #include <stdint.h>
 
@@ -209,4 +209,4 @@ extern int32_t rw009_rssi(void);
 extern rt_err_t rw009_join(const char * SSID, const char * passwd);
 extern rt_err_t rw009_softap(const char * SSID, const char * passwd,uint32_t security,uint32_t channel);
 
-#endif // SPI_WIFI_H_INCLUDED
+#endif // __DEV_SPI_WIFI_H_INCLUDED__
diff --git a/components/drivers/spi/enc28j60.h b/components/drivers/spi/enc28j60.h
index 017877adcd..013222c7c8 100644
--- a/components/drivers/spi/enc28j60.h
+++ b/components/drivers/spi/enc28j60.h
@@ -6,13 +6,13 @@
  * Change Logs:
  * Date           Author       Notes
  */
-#ifndef EN28J60_H_INCLUDED
-#define EN28J60_H_INCLUDED
+#ifndef __EN28J60_H_INCLUDED__
+#define __EN28J60_H_INCLUDED__
 
 #include <stdint.h>
 
 #include <rtthread.h>
-#include <drivers/spi.h>
+#include "drivers/dev_spi.h"
 #include <netif/ethernetif.h>
 
 // ENC28J60 Control Registers
@@ -340,4 +340,4 @@ struct net_device
 extern rt_err_t enc28j60_attach(const char *spi_device_name);
 extern void enc28j60_isr(void);
 
-#endif // EN28J60_H_INCLUDED
+#endif // __EN28J60_H_INCLUDED__
diff --git a/components/drivers/touch/SConscript b/components/drivers/touch/SConscript
index df698c7840..ba646b0a80 100644
--- a/components/drivers/touch/SConscript
+++ b/components/drivers/touch/SConscript
@@ -3,7 +3,7 @@
 from building import *
 
 cwd = GetCurrentDir()
-src = ['touch.c']
+src = ['dev_touch.c']
 CPPPATH = [cwd, cwd + '/../include']
 
 group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_TOUCH', 'RT_USING_DEVICE'], CPPPATH = CPPPATH)
diff --git a/components/drivers/touch/touch.c b/components/drivers/touch/dev_touch.c
similarity index 100%
rename from components/drivers/touch/touch.c
rename to components/drivers/touch/dev_touch.c
diff --git a/components/drivers/watchdog/watchdog.c b/components/drivers/watchdog/dev_watchdog.c
similarity index 98%
rename from components/drivers/watchdog/watchdog.c
rename to components/drivers/watchdog/dev_watchdog.c
index 6d8238b129..9293ebd818 100644
--- a/components/drivers/watchdog/watchdog.c
+++ b/components/drivers/watchdog/dev_watchdog.c
@@ -9,7 +9,7 @@
  * 2014-03-04     Bernard      code cleanup
  */
 
-#include <drivers/watchdog.h>
+#include "drivers/dev_watchdog.h"
 
 /* RT-Thread Device Interface */
 
diff --git a/components/drivers/wlan/SConscript b/components/drivers/wlan/SConscript
index f2a6bbdc82..fed9478201 100644
--- a/components/drivers/wlan/SConscript
+++ b/components/drivers/wlan/SConscript
@@ -4,26 +4,26 @@ cwd     = GetCurrentDir()
 CPPPATH = [cwd]
 
 src = Split('''
-        wlan_dev.c
+        dev_wlan.c
         ''')
 
 if GetDepend(['RT_WLAN_MANAGE_ENABLE']):
-    src += ['wlan_mgnt.c']
+    src += ['dev_wlan_mgnt.c']
 
 if GetDepend(['RT_WLAN_MSH_CMD_ENABLE']):
-    src += ['wlan_cmd.c']
+    src += ['dev_wlan_cmd.c']
 
 if GetDepend(['RT_WLAN_PROT_ENABLE']):
-    src += ['wlan_prot.c']
+    src += ['dev_wlan_prot.c']
 
 if GetDepend(['RT_WLAN_PROT_LWIP_ENABLE']):
-    src += ['wlan_lwip.c']
+    src += ['dev_wlan_lwip.c']
 
 if GetDepend(['RT_WLAN_CFG_ENABLE']):
-    src += ['wlan_cfg.c']
+    src += ['dev_wlan_cfg.c']
 
 if GetDepend(['RT_WLAN_WORK_THREAD_ENABLE']):
-    src += ['wlan_workqueue.c']
+    src += ['dev_wlan_workqueue.c']
 
 group   = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_WIFI'], CPPPATH = CPPPATH)
 
diff --git a/components/drivers/wlan/wlan_dev.c b/components/drivers/wlan/dev_wlan.c
similarity index 99%
rename from components/drivers/wlan/wlan_dev.c
rename to components/drivers/wlan/dev_wlan.c
index da4aa57497..a7029e6233 100644
--- a/components/drivers/wlan/wlan_dev.c
+++ b/components/drivers/wlan/dev_wlan.c
@@ -10,8 +10,8 @@
 
 #include <rthw.h>
 #include <rtthread.h>
-#include <wlan_dev.h>
-#include <wlan_prot.h>
+#include <dev_wlan.h>
+#include <dev_wlan_prot.h>
 
 #define DBG_TAG "WLAN.dev"
 #ifdef RT_WLAN_DEV_DEBUG
diff --git a/components/drivers/wlan/wlan_dev.h b/components/drivers/wlan/dev_wlan.h
similarity index 99%
rename from components/drivers/wlan/wlan_dev.h
rename to components/drivers/wlan/dev_wlan.h
index 0a6c9b3d0d..d20487394e 100644
--- a/components/drivers/wlan/wlan_dev.h
+++ b/components/drivers/wlan/dev_wlan.h
@@ -8,8 +8,8 @@
  * 2018-08-03     tyx          the first version
  */
 
-#ifndef __WLAN_DEVICE_H__
-#define __WLAN_DEVICE_H__
+#ifndef __DEV_WLAN_DEVICE_H__
+#define __DEV_WLAN_DEVICE_H__
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/drivers/wlan/wlan_cfg.c b/components/drivers/wlan/dev_wlan_cfg.c
similarity index 99%
rename from components/drivers/wlan/wlan_cfg.c
rename to components/drivers/wlan/dev_wlan_cfg.c
index ac49877c8d..e62ed9d93a 100644
--- a/components/drivers/wlan/wlan_cfg.c
+++ b/components/drivers/wlan/dev_wlan_cfg.c
@@ -9,7 +9,7 @@
  */
 
 #include <rtthread.h>
-#include <wlan_cfg.h>
+#include <dev_wlan_cfg.h>
 
 #define DBG_TAG "WLAN.cfg"
 #ifdef RT_WLAN_CFG_DEBUG
diff --git a/components/drivers/wlan/wlan_cfg.h b/components/drivers/wlan/dev_wlan_cfg.h
similarity index 94%
rename from components/drivers/wlan/wlan_cfg.h
rename to components/drivers/wlan/dev_wlan_cfg.h
index 308850f74b..25e44ded72 100644
--- a/components/drivers/wlan/wlan_cfg.h
+++ b/components/drivers/wlan/dev_wlan_cfg.h
@@ -8,10 +8,10 @@
  * 2018-08-06     tyx          the first version
  */
 
-#ifndef __WLAN_CFG_H__
-#define __WLAN_CFG_H__
+#ifndef __DEV_WLAN_CFG_H__
+#define __DEV_WLAN_CFG_H__
 
-#include <wlan_dev.h>
+#include <dev_wlan.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/drivers/wlan/wlan_cmd.c b/components/drivers/wlan/dev_wlan_cmd.c
similarity index 99%
rename from components/drivers/wlan/wlan_cmd.c
rename to components/drivers/wlan/dev_wlan_cmd.c
index b50261d42a..6592281dac 100644
--- a/components/drivers/wlan/wlan_cmd.c
+++ b/components/drivers/wlan/dev_wlan_cmd.c
@@ -11,9 +11,9 @@
 
 #include <rtthread.h>
 #include <rthw.h>
-#include <wlan_mgnt.h>
-#include <wlan_cfg.h>
-#include <wlan_prot.h>
+#include <dev_wlan_mgnt.h>
+#include <dev_wlan_cfg.h>
+#include <dev_wlan_prot.h>
 
 #define DBG_TAG "WLAN.cmd"
 #ifdef RT_WLAN_MGNT_DEBUG
diff --git a/components/drivers/wlan/wlan_lwip.c b/components/drivers/wlan/dev_wlan_lwip.c
similarity index 99%
rename from components/drivers/wlan/wlan_lwip.c
rename to components/drivers/wlan/dev_wlan_lwip.c
index 08cf150d5f..21f43c115b 100644
--- a/components/drivers/wlan/wlan_lwip.c
+++ b/components/drivers/wlan/dev_wlan_lwip.c
@@ -10,9 +10,9 @@
 
 #include <rthw.h>
 #include <rtthread.h>
-#include <wlan_dev.h>
-#include <wlan_prot.h>
-#include <wlan_workqueue.h>
+#include <dev_wlan.h>
+#include <dev_wlan_prot.h>
+#include <dev_wlan_workqueue.h>
 
 #if defined(RT_WLAN_PROT_ENABLE) && defined(RT_WLAN_PROT_LWIP_ENABLE)
 
diff --git a/components/drivers/wlan/wlan_mgnt.c b/components/drivers/wlan/dev_wlan_mgnt.c
similarity index 99%
rename from components/drivers/wlan/wlan_mgnt.c
rename to components/drivers/wlan/dev_wlan_mgnt.c
index 5eccdfd101..124496aae2 100644
--- a/components/drivers/wlan/wlan_mgnt.c
+++ b/components/drivers/wlan/dev_wlan_mgnt.c
@@ -11,11 +11,11 @@
 
 #include <rthw.h>
 #include <rtthread.h>
-#include <wlan_dev.h>
-#include <wlan_cfg.h>
-#include <wlan_mgnt.h>
-#include <wlan_prot.h>
-#include <wlan_workqueue.h>
+#include <dev_wlan.h>
+#include <dev_wlan_cfg.h>
+#include <dev_wlan_mgnt.h>
+#include <dev_wlan_prot.h>
+#include <dev_wlan_workqueue.h>
 
 // #define RT_WLAN_MGNT_DEBUG
 #define DBG_TAG "WLAN.mgnt"
diff --git a/components/drivers/wlan/wlan_mgnt.h b/components/drivers/wlan/dev_wlan_mgnt.h
similarity index 98%
rename from components/drivers/wlan/wlan_mgnt.h
rename to components/drivers/wlan/dev_wlan_mgnt.h
index 4e98463a3c..dc5b17e994 100644
--- a/components/drivers/wlan/wlan_mgnt.h
+++ b/components/drivers/wlan/dev_wlan_mgnt.h
@@ -8,10 +8,10 @@
  * 2018-08-06     tyx          the first version
  */
 
-#ifndef __WLAN_MGNT_H__
-#define __WLAN_MGNT_H__
+#ifndef __DEV_WLAN_MGNT_H__
+#define __DEV_WLAN_MGNT_H__
 
-#include <wlan_dev.h>
+#include <dev_wlan.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/drivers/wlan/wlan_prot.c b/components/drivers/wlan/dev_wlan_prot.c
similarity index 99%
rename from components/drivers/wlan/wlan_prot.c
rename to components/drivers/wlan/dev_wlan_prot.c
index dd9b320655..53730338de 100644
--- a/components/drivers/wlan/wlan_prot.c
+++ b/components/drivers/wlan/dev_wlan_prot.c
@@ -10,8 +10,8 @@
 
 #include <rthw.h>
 #include <rtthread.h>
-#include <wlan_dev.h>
-#include <wlan_prot.h>
+#include <dev_wlan.h>
+#include <dev_wlan_prot.h>
 
 #define DBG_TAG "WLAN.prot"
 #ifdef RT_WLAN_PROT_DEBUG
diff --git a/components/drivers/wlan/wlan_prot.h b/components/drivers/wlan/dev_wlan_prot.h
similarity index 97%
rename from components/drivers/wlan/wlan_prot.h
rename to components/drivers/wlan/dev_wlan_prot.h
index 16515d68be..3ba1daa9fd 100644
--- a/components/drivers/wlan/wlan_prot.h
+++ b/components/drivers/wlan/dev_wlan_prot.h
@@ -8,8 +8,8 @@
  * 2018-08-14     tyx          the first version
  */
 
-#ifndef __WLAN_PROT_H__
-#define __WLAN_PROT_H__
+#ifndef __DEV_WLAN_PROT_H__
+#define __DEV_WLAN_PROT_H__
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/drivers/wlan/wlan_workqueue.c b/components/drivers/wlan/dev_wlan_workqueue.c
similarity index 98%
rename from components/drivers/wlan/wlan_workqueue.c
rename to components/drivers/wlan/dev_wlan_workqueue.c
index 4c966b1175..c663a4ed7c 100644
--- a/components/drivers/wlan/wlan_workqueue.c
+++ b/components/drivers/wlan/dev_wlan_workqueue.c
@@ -10,7 +10,7 @@
 
 #include <rthw.h>
 #include <rtthread.h>
-#include <wlan_workqueue.h>
+#include <dev_wlan_workqueue.h>
 #include <ipc/workqueue.h>
 
 #define DBG_TAG "WLAN.work"
diff --git a/components/drivers/wlan/wlan_workqueue.h b/components/drivers/wlan/dev_wlan_workqueue.h
similarity index 92%
rename from components/drivers/wlan/wlan_workqueue.h
rename to components/drivers/wlan/dev_wlan_workqueue.h
index af12b1d196..f85f8493ce 100644
--- a/components/drivers/wlan/wlan_workqueue.h
+++ b/components/drivers/wlan/dev_wlan_workqueue.h
@@ -8,8 +8,8 @@
  * 2018-08-19     tyx          the first version
  */
 
-#ifndef __WLAN_WORKQUEUE_H__
-#define __WLAN_WORKQUEUE_H__
+#ifndef __DEV_WLAN_WORKQUEUE_H__
+#define __DEV_WLAN_WORKQUEUE_H__
 
 #include <ipc/workqueue.h>
 
diff --git a/components/fal/samples/porting/fal_flash_sfud_port.c b/components/fal/samples/porting/fal_flash_sfud_port.c
index 35bbc0f276..87e5ed119e 100644
--- a/components/fal/samples/porting/fal_flash_sfud_port.c
+++ b/components/fal/samples/porting/fal_flash_sfud_port.c
@@ -13,7 +13,7 @@
 
 #ifdef FAL_USING_SFUD_PORT
 #ifdef RT_USING_SFUD
-#include <spi_flash_sfud.h>
+#include <dev_spi_flash_sfud.h>
 #endif
 
 #ifndef FAL_USING_NOR_FLASH_DEV_NAME
diff --git a/documentation/device/wlan/wlan.md b/documentation/device/wlan/wlan.md
index cf45cca402..cbde241ea4 100644
--- a/documentation/device/wlan/wlan.md
+++ b/documentation/device/wlan/wlan.md
@@ -208,9 +208,9 @@ The following code will show a WiFi sync scan, and then print the results on the
 #include <rthw.h>
 #include <rtthread.h>
 
-#include <wlan_mgnt.h>
-#include <wlan_prot.h>
-#include <wlan_cfg.h>
+#include <dev_wlan_mgnt.h>
+#include <dev_wlan_prot.h>
+#include <dev_wlan_cfg.h>
 
 void wifi_scan(void)
 {
@@ -251,9 +251,9 @@ After connecting to WIFI, wait for a while and then execute `rt_wlan_disconnect`
 #include <rthw.h>
 #include <rtthread.h>
 
-#include <wlan_mgnt.h>
-#include <wlan_prot.h>
-#include <wlan_cfg.h>
+#include <dev_wlan_mgnt.h>
+#include <dev_wlan_prot.h>
+#include <dev_wlan_cfg.h>
 
 #define WLAN_SSID               "SSID-A"
 #define WLAN_PASSWORD           "12345678"
@@ -372,9 +372,9 @@ First enable the automatic reconnection function, use the command line to connec
 #include <rthw.h>
 #include <rtthread.h>
 
-#include <wlan_mgnt.h>
-#include <wlan_prot.h>
-#include <wlan_cfg.h>
+#include <dev_wlan_mgnt.h>
+#include <dev_wlan_prot.h>
+#include <dev_wlan_cfg.h>
 
 static void
 wifi_ready_callback(int event, struct rt_wlan_buff *buff, void *parameter)