diff --git a/components/drivers/include/drivers/usb_common.h b/components/drivers/include/drivers/usb_common.h
index 495cc1778744114144097c4da5807870878f7faa..5881e11dc622f95c22190f3427c8bdf4aaf7cdbf 100644
--- a/components/drivers/include/drivers/usb_common.h
+++ b/components/drivers/include/drivers/usb_common.h
@@ -351,6 +351,27 @@ typedef struct ureqest* ureq_t;
 #define CSW_SIGNATURE                   0x53425355
 #define CBW_TAG_VALUE                   0x12345678
 
+struct ustorage_cbw 
+{
+    rt_uint32_t signature;
+    rt_uint32_t tag;
+    rt_uint32_t xfer_len;
+    rt_uint8_t dflags;
+    rt_uint8_t lun;
+    rt_uint8_t cb_len;
+    rt_uint8_t cb[16];
+};
+typedef struct ustorage_cbw* ustorage_cbw_t;
+
+struct ustorage_csw 
+{
+    rt_uint32_t signature;
+    rt_uint32_t tag;
+    rt_uint32_t data_reside;
+    rt_uint8_t  status;
+};
+typedef struct ustorage_csw* ustorage_csw_t;
+
 #pragma pack()
 
 #ifdef __cplusplus
diff --git a/components/drivers/include/drivers/usb_device.h b/components/drivers/include/drivers/usb_device.h
index e4b623ab0034014b6da3318b93cfc650f49778f1..79658b9a1b556e36229139f2e7f7028bae3ad737 100644
--- a/components/drivers/include/drivers/usb_device.h
+++ b/components/drivers/include/drivers/usb_device.h
@@ -21,13 +21,13 @@
 
 /* Vendor ID */
 #ifdef USB_VENDOR_ID
-#define USB_VENDOR_ID _VENDOR_ID
+#define _VENDOR_ID USB_VENDOR_ID
 #else
 #define _VENDOR_ID 0x0EFF
 #endif
 /* Product ID */
 #ifdef USB_PRODUCT_ID
-#define USB_PRODUCT_ID _PRODUCT_ID
+#define _PRODUCT_ID USB_PRODUCT_ID
 #else 
 #define _PRODUCT_ID 0x0001
 #endif
diff --git a/components/drivers/usb/usbdevice/class/mstorage.h b/components/drivers/usb/usbdevice/class/mstorage.h
index eb8e81a68f7371841297c8e60269525cefde2ef0..951cbdfef80ce22c72416ca8ea4c2ef3f80b7729 100644
--- a/components/drivers/usb/usbdevice/class/mstorage.h
+++ b/components/drivers/usb/usbdevice/class/mstorage.h
@@ -20,27 +20,6 @@
 
 #pragma pack(1)
 
-struct ustorage_cbw 
-{
-    rt_uint32_t signature;
-    rt_uint32_t tag;
-    rt_uint32_t xfer_len;
-    rt_uint8_t dflags;
-    rt_uint8_t lun;
-    rt_uint8_t cb_len;
-    rt_uint8_t cb[16];
-};
-typedef struct ustorage_cbw* ustorage_cbw_t;
-
-struct ustorage_csw 
-{
-    rt_uint32_t signature;
-    rt_uint32_t tag;
-    rt_uint32_t data_reside;
-    rt_uint8_t  status;
-};
-typedef struct ustorage_csw* ustorage_csw_t;
-
 struct umass_descriptor
 {
     struct uinterface_descriptor intf_desc;