12 files changed, 36 insertions, 36 deletions
diff --git a/components/drivers/include/drivers/gpt.h b/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
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
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
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
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
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
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
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
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
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