diff --git a/hal/hal_com.c b/hal/hal_com.c
index e2efcba..182320f 100644
--- a/hal/hal_com.c
+++ b/hal/hal_com.c
@@ -26,7 +26,7 @@
 
 #define _HAL_INIT_C_
 
-void dump_chip_info(HAL_VERSION	ChipVersion)
+void dump_chip_info(struct HAL_VERSION	ChipVersion)
 {
 	uint cnt = 0;
 	char buf[128];
diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c
index 6d74660..f4fdbf7 100644
--- a/hal/rtl8188e_hal_init.c
+++ b/hal/rtl8188e_hal_init.c
@@ -2376,10 +2376,10 @@ rtl8188e_Efuse_PgPacketWrite(	PADAPTER	pAdapter,
 	return ret;
 }
 
-static HAL_VERSION ReadChipVersion8188E(PADAPTER padapter)
+static struct HAL_VERSION ReadChipVersion8188E(PADAPTER padapter)
 {
 	u32				value32;
-	HAL_VERSION				ChipVersion;
+	struct HAL_VERSION		ChipVersion;
 	HAL_DATA_TYPE	*pHalData;
 
 
diff --git a/include/HalVerDef.h b/include/HalVerDef.h
index 1b9e2a1..e6d19e4 100644
--- a/include/HalVerDef.h
+++ b/include/HalVerDef.h
@@ -20,9 +20,7 @@
 #ifndef __HAL_VERSION_DEF_H__
 #define __HAL_VERSION_DEF_H__
 
-// HAL_IC_TYPE_E
-typedef enum tag_HAL_IC_Type_Definition
-{
+enum HAL_IC_TYPE {
 	CHIP_8192S		=	0,
 	CHIP_8188C	=	1,
 	CHIP_8192C	=	2,
@@ -34,19 +32,15 @@ typedef enum tag_HAL_IC_Type_Definition
 	CHIP_8821A	=	8,
 	CHIP_8723B	=	9,
 	CHIP_8192E		=	10,
-}HAL_IC_TYPE_E;
+};
 
-//HAL_CHIP_TYPE_E
-typedef enum tag_HAL_CHIP_Type_Definition
-{
+enum HAL_CHIP_TYPE {
 	TEST_CHIP		=	0,
 	NORMAL_CHIP	=	1,
 	FPGA			=	2,
-}HAL_CHIP_TYPE_E;
+};
 
-//HAL_CUT_VERSION_E
-typedef enum tag_HAL_Cut_Version_Definition
-{
+enum HAL_CUT_VERSION {
 	A_CUT_VERSION		=	0,
 	B_CUT_VERSION		=	1,
 	C_CUT_VERSION		=	2,
@@ -54,17 +48,14 @@ typedef enum tag_HAL_Cut_Version_Definition
 	E_CUT_VERSION		=	4,
 	F_CUT_VERSION		=	5,
 	G_CUT_VERSION		=	6,
-}HAL_CUT_VERSION_E;
+};
 
-// HAL_Manufacturer
-typedef enum tag_HAL_Manufacturer_Version_Definition
-{
+enum HAL_VENDOR {
 	CHIP_VENDOR_TSMC	=	0,
 	CHIP_VENDOR_UMC		=	1,
-}HAL_VENDOR_E;
+};
 
-typedef enum tag_HAL_RF_Type_Definition
-{
+enum HAL_RF_TYPE {
 	RF_TYPE_1T1R	=	0,
 	RF_TYPE_1T2R	=	1,
 	RF_TYPE_2T2R	=	2,
@@ -73,20 +64,16 @@ typedef enum tag_HAL_RF_Type_Definition
 	RF_TYPE_3T3R	=	5,
 	RF_TYPE_3T4R	=	6,
 	RF_TYPE_4T4R	=	7,
-}HAL_RF_TYPE_E;
+};
 
-typedef	struct tag_HAL_VERSION
-{
-	HAL_IC_TYPE_E		ICType;
-	HAL_CHIP_TYPE_E		ChipType;
-	HAL_CUT_VERSION_E	CUTVersion;
-	HAL_VENDOR_E		VendorType;
-	HAL_RF_TYPE_E		RFType;
-	u8					ROMVer;
-}HAL_VERSION,*PHAL_VERSION;
-
-//VERSION_8192C			VersionID;
-//HAL_VERSION			VersionID;
+struct HAL_VERSION {
+	enum HAL_IC_TYPE	ICType;
+	enum HAL_CHIP_TYPE	ChipType;
+	enum HAL_CUT_VERSION	CUTVersion;
+	enum HAL_VENDOR		VendorType;
+	enum HAL_RF_TYPE	RFType;
+	u8			ROMVer;
+};
 
 // Get element
 #define GET_CVID_IC_TYPE(version)		(((version).ICType))
diff --git a/include/hal_com.h b/include/hal_com.h
index ed96a5f..b30cf7a 100644
--- a/include/hal_com.h
+++ b/include/hal_com.h
@@ -148,7 +148,7 @@
 #define REG_NOA_DESC_COUNT			0x05EC
 
 #include "HalVerDef.h"
-void dump_chip_info(HAL_VERSION	ChipVersion);
+void dump_chip_info(struct HAL_VERSION	ChipVersion);
 
 
 u8	//return the final channel plan decision
diff --git a/include/rtl8188e_hal.h b/include/rtl8188e_hal.h
index 754c6f7..e8ab9d0 100644
--- a/include/rtl8188e_hal.h
+++ b/include/rtl8188e_hal.h
@@ -289,7 +289,7 @@ typedef enum _RT_REGULATOR_MODE {
 
 typedef struct hal_data_8188e
 {
-	HAL_VERSION			VersionID;
+	struct HAL_VERSION	VersionID;
 	RT_MULTI_FUNC		MultiFunc; // For multi-function consideration.
 	RT_POLARITY_CTL		PolarityCtl; // For Wifi PDn Polarity control.
 	RT_REGULATOR_MODE	RegulatorMode; // switching regulator or LDO