diff --git a/include/basic_types.h b/include/basic_types.h
index 64c65a7..b6791b3 100644
--- a/include/basic_types.h
+++ b/include/basic_types.h
@@ -48,7 +48,7 @@
 	typedef	signed int sint;
 
 	#define u8 u8
-	#define USHORT u16
+	#define u16 u16
 	#define UINT u32
 	#define ULONG u32
 
diff --git a/include/rtw_bt_mp.h b/include/rtw_bt_mp.h
index c257a7f..0159c66 100644
--- a/include/rtw_bt_mp.h
+++ b/include/rtw_bt_mp.h
@@ -203,13 +203,13 @@ void mptbt_BtControlProcess(
 typedef struct _BT_REQ_CMD {
 	u8       opCodeVer;
 	u8       OpCode;
-	USHORT      paraLength;
+	u16      paraLength;
 	u8       pParamStart[100];
 } BT_REQ_CMD, *PBT_REQ_CMD;
 
 typedef struct _BT_RSP_CMD {
-	USHORT      status;
-	USHORT      paraLength;
+	u16      status;
+	u16      paraLength;
 	u8       pParamStart[100];
 } BT_RSP_CMD, *PBT_RSP_CMD;
 
diff --git a/include/rtw_mp.h b/include/rtw_mp.h
index e63ac61..24522b4 100644
--- a/include/rtw_mp.h
+++ b/include/rtw_mp.h
@@ -106,7 +106,6 @@ struct mp_tx {
 #define s8Byte		s64
 #define ps8Byte		s64*
 
-#define USHORT u16
 #define UINT u32
 #define ULONG u32
 #define PULONG u32*
@@ -133,14 +132,14 @@ typedef struct _RT_PMAC_TX_INFO {
 	u8			NDP_sound:1;
 	u8			BandWidth:3;		/* 0: 20 1:40 2:80Mhz */
 	u8			m_STBC;			/* bSTBC + 1 */
-	USHORT			PacketPeriod;
+	u16			PacketPeriod;
 	UINT		PacketCount;
 	UINT		PacketLength;
 	u8			PacketPattern;
-	USHORT			SFD;
+	u16			SFD;
 	u8			SignalField;
 	u8			ServiceField;
-	USHORT			LENGTH;
+	u16			LENGTH;
 	u8			CRC16[2];
 	u8			LSIG[3];
 	u8			HT_SIG[6];
diff --git a/include/wlan_bssdef.h b/include/wlan_bssdef.h
index c0f9d14..49441be 100644
--- a/include/wlan_bssdef.h
+++ b/include/wlan_bssdef.h
@@ -78,8 +78,8 @@ typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE {
 
 typedef struct _NDIS_802_11_FIXED_IEs {
 	u8  Timestamp[8];
-	USHORT  BeaconInterval;
-	USHORT  Capabilities;
+	u16  BeaconInterval;
+	u16  Capabilities;
 } NDIS_802_11_FIXED_IEs, *PNDIS_802_11_FIXED_IEs;
 
 typedef struct _NDIS_802_11_VARIABLE_IEs {
@@ -136,24 +136,24 @@ NDIS_802_11_ENCRYPTION_STATUS, *PNDIS_802_11_ENCRYPTION_STATUS;
 #define NDIS_802_11_AI_RESFI_ASSOCIATIONID     4
 
 typedef struct _NDIS_802_11_AI_REQFI {
-	USHORT Capabilities;
-	USHORT ListenInterval;
+	u16 Capabilities;
+	u16 ListenInterval;
 	NDIS_802_11_MAC_ADDRESS  CurrentAPAddress;
 } NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI;
 
 typedef struct _NDIS_802_11_AI_RESFI {
-	USHORT Capabilities;
-	USHORT StatusCode;
-	USHORT AssociationId;
+	u16 Capabilities;
+	u16 StatusCode;
+	u16 AssociationId;
 } NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI;
 
 typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION {
 	ULONG                   Length;
-	USHORT                  AvailableRequestFixedIEs;
+	u16                  AvailableRequestFixedIEs;
 	NDIS_802_11_AI_REQFI    RequestFixedIEs;
 	ULONG                   RequestIELength;
 	ULONG                   OffsetRequestIEs;
-	USHORT                  AvailableResponseFixedIEs;
+	u16                  AvailableResponseFixedIEs;
 	NDIS_802_11_AI_RESFI    ResponseFixedIEs;
 	ULONG                   ResponseIELength;
 	ULONG                   OffsetResponseIEs;