#include "Mp_Precomp.h"
 
 /*  Global variables, these are static variables */
-static COEX_DM_8723B_1ANT GLCoexDm8723b1Ant;
-static PCOEX_DM_8723B_1ANT pCoexDm = &GLCoexDm8723b1Ant;
-static COEX_STA_8723B_1ANT GLCoexSta8723b1Ant;
-static PCOEX_STA_8723B_1ANT    pCoexSta = &GLCoexSta8723b1Ant;
+static struct COEX_DM_8723B_1ANT GLCoexDm8723b1Ant;
+static struct COEX_DM_8723B_1ANT * pCoexDm = &GLCoexDm8723b1Ant;
+static struct COEX_STA_8723B_1ANT GLCoexSta8723b1Ant;
+static struct COEX_STA_8723B_1ANT * pCoexSta = &GLCoexSta8723b1Ant;
 
 static const char *const GLBtInfoSrc8723b1Ant[] = {
        "BT Info[wifi fw]",
 
 
 #define  BT_8723B_1ANT_WIFI_NOISY_THRESH 30   /* max: 255 */
 
-typedef enum _BT_INFO_SRC_8723B_1ANT {
+enum BT_INFO_SRC_8723B_1ANT {
        BT_INFO_SRC_8723B_1ANT_WIFI_FW                  = 0x0,
        BT_INFO_SRC_8723B_1ANT_BT_RSP                           = 0x1,
        BT_INFO_SRC_8723B_1ANT_BT_ACTIVE_SEND           = 0x2,
        BT_INFO_SRC_8723B_1ANT_MAX
-} BT_INFO_SRC_8723B_1ANT, *PBT_INFO_SRC_8723B_1ANT;
+};
 
-typedef enum _BT_8723B_1ANT_BT_STATUS {
+enum BT_8723B_1ANT_BT_STATUS {
        BT_8723B_1ANT_BT_STATUS_NON_CONNECTED_IDLE      = 0x0,
        BT_8723B_1ANT_BT_STATUS_CONNECTED_IDLE          = 0x1,
        BT_8723B_1ANT_BT_STATUS_INQ_PAGE                                = 0x2,
        BT_8723B_1ANT_BT_STATUS_SCO_BUSY                                = 0x4,
        BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY                    = 0x5,
        BT_8723B_1ANT_BT_STATUS_MAX
-} BT_8723B_1ANT_BT_STATUS, *PBT_8723B_1ANT_BT_STATUS;
+};
 
-typedef enum _BT_8723B_1ANT_WIFI_STATUS {
+enum BT_8723B_1ANT_WIFI_STATUS {
        BT_8723B_1ANT_WIFI_STATUS_NON_CONNECTED_IDLE           = 0x0,
        BT_8723B_1ANT_WIFI_STATUS_NON_CONNECTED_ASSO_AUTH_SCAN = 0x1,
        BT_8723B_1ANT_WIFI_STATUS_CONNECTED_SCAN               = 0x2,
        BT_8723B_1ANT_WIFI_STATUS_CONNECTED_IDLE               = 0x4,
        BT_8723B_1ANT_WIFI_STATUS_CONNECTED_BUSY               = 0x5,
        BT_8723B_1ANT_WIFI_STATUS_MAX
-} BT_8723B_1ANT_WIFI_STATUS, *PBT_8723B_1ANT_WIFI_STATUS;
+};
 
-typedef enum _BT_8723B_1ANT_COEX_ALGO {
+enum BT_8723B_1ANT_COEX_ALGO {
        BT_8723B_1ANT_COEX_ALGO_UNDEFINED               = 0x0,
        BT_8723B_1ANT_COEX_ALGO_SCO                             = 0x1,
        BT_8723B_1ANT_COEX_ALGO_HID                             = 0x2,
        BT_8723B_1ANT_COEX_ALGO_HID_A2DP_PANEDR = 0x9,
        BT_8723B_1ANT_COEX_ALGO_HID_A2DP                = 0xa,
        BT_8723B_1ANT_COEX_ALGO_MAX                             = 0xb,
-} BT_8723B_1ANT_COEX_ALGO, *PBT_8723B_1ANT_COEX_ALGO;
+};
 
-typedef struct _COEX_DM_8723B_1ANT {
+struct COEX_DM_8723B_1ANT {
        /*  fw mechanism */
        bool bCurIgnoreWlanAct;
        bool bPreIgnoreWlanAct;
        u32 nArpCnt;
 
        u8 errorCondition;
-} COEX_DM_8723B_1ANT, *PCOEX_DM_8723B_1ANT;
+};
 
-typedef struct _COEX_STA_8723B_1ANT {
+struct COEX_STA_8723B_1ANT {
        bool bBtLinkExist;
        bool bScoExist;
        bool bA2dpExist;
        u8 nCoexTableType;
 
        bool bForceLpsOn;
-} COEX_STA_8723B_1ANT, *PCOEX_STA_8723B_1ANT;
+};
 
 /*  */
 /*  The following is interface which will notify coex module. */