diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c
index 5cd7bda..2d8391b 100644
--- a/core/rtw_mlme.c
+++ b/core/rtw_mlme.c
@@ -2625,7 +2625,7 @@ void rtw_joinbss_reset(struct adapter *padapter)
 unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ie, uint in_len, uint *pout_len)
 {
 	u32 ielen, out_len;
-	HT_CAP_AMPDU_FACTOR max_rx_ampdu_factor;
+	enum ht_cap_ampdu_factor max_rx_ampdu_factor;
 	unsigned char *p;
 	struct rtw_ieee80211_ht_cap ht_capie;
 	unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01, 0x00};
diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c
index 3a9fdd0..a665d31 100644
--- a/core/rtw_mlme_ext.c
+++ b/core/rtw_mlme_ext.c
@@ -6778,7 +6778,7 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch
 	u16	BA_timeout_value;
 	__le16	le_tmp;
 	u16	BA_starting_seqctrl;
-	HT_CAP_AMPDU_FACTOR max_rx_ampdu_factor;
+	enum ht_cap_ampdu_factor max_rx_ampdu_factor;
 	struct xmit_frame		*pmgntframe;
 	struct pkt_attrib		*pattrib;
 	u8					*pframe;
diff --git a/include/drv_types.h b/include/drv_types.h
index 5c36b69..e3e2cfd 100644
--- a/include/drv_types.h
+++ b/include/drv_types.h
@@ -230,11 +230,11 @@ enum _ADAPTER_TYPE {
 	MAX_ADAPTER,
 };
 
-typedef enum _DRIVER_STATE{
+enum driver_state {
 	DRIVER_NORMAL = 0,
 	DRIVER_DISAPPEAR = 1,
 	DRIVER_REPLACE_DONGLE = 2,
-}DRIVER_STATE;
+};
 
 struct adapter {
 	int	DriverState;// for disable driver using module, use dongle to replace module.
diff --git a/include/sta_info.h b/include/sta_info.h
index 78640e3..fd11e01 100644
--- a/include/sta_info.h
+++ b/include/sta_info.h
@@ -47,13 +47,13 @@ struct wlan_acl_pool {
 	struct __queue acl_node_q;
 };
 
-typedef struct _RSSI_STA{
+struct rssi_sta {
 	s32	UndecoratedSmoothedPWDB;
 	s32	UndecoratedSmoothedCCK;
 	s32	UndecoratedSmoothedOFDM;
 	u64	PacketMap;
 	u8	ValidBit;
-}RSSI_STA, *PRSSI_STA;
+};
 
 struct	stainfo_stats	{
 
@@ -217,7 +217,7 @@ struct sta_info {
 #endif	// CONFIG_AP_MODE
 
 	//for DM
-	RSSI_STA	 rssi_stat;
+	struct rssi_sta rssi_stat;
 
 	//
 	// ================ODM Relative Info=======================
diff --git a/include/wifi.h b/include/wifi.h
index 171c452..d973e1e 100644
--- a/include/wifi.h
+++ b/include/wifi.h
@@ -735,12 +735,12 @@ struct ADDBA_request {
 	unsigned short	BA_starting_seqctrl;
 }  __attribute__ ((packed));
 
-typedef enum _HT_CAP_AMPDU_FACTOR {
+enum ht_cap_ampdu_factor {
 	MAX_AMPDU_FACTOR_8K		= 0,
 	MAX_AMPDU_FACTOR_16K	= 1,
 	MAX_AMPDU_FACTOR_32K	= 2,
 	MAX_AMPDU_FACTOR_64K	= 3,
-}HT_CAP_AMPDU_FACTOR;
+};
 
 /* 802.11n HT capabilities masks */
 #define IEEE80211_HT_CAP_SUP_WIDTH		0x0002