bool wilc_optaining_ip;
 static u8 P2P_LISTEN_STATE;
 static struct task_struct *hif_thread_handler;
-static WILC_MsgQueueHandle hif_msg_q;
+static struct message_queue hif_msg_q;
 static struct semaphore hif_sema_thread;
 static struct semaphore hif_sema_driver;
 static struct semaphore hif_sema_wait_response;
 
  *  @note              copied from FLO glue implementatuion
  *  @version           1.0
  */
-int wilc_mq_create(WILC_MsgQueueHandle *pHandle)
+int wilc_mq_create(struct message_queue *pHandle)
 {
        spin_lock_init(&pHandle->strCriticalSection);
        sema_init(&pHandle->hSem, 0);
  *  @note              copied from FLO glue implementatuion
  *  @version           1.0
  */
-int wilc_mq_destroy(WILC_MsgQueueHandle *pHandle)
+int wilc_mq_destroy(struct message_queue *pHandle)
 {
        pHandle->bExiting = true;
 
  *  @note              copied from FLO glue implementatuion
  *  @version           1.0
  */
-int wilc_mq_send(WILC_MsgQueueHandle *pHandle,
-                            const void *pvSendBuffer, u32 u32SendBufferSize)
+int wilc_mq_send(struct message_queue *pHandle,
+                const void *pvSendBuffer, u32 u32SendBufferSize)
 {
        unsigned long flags;
        struct message *pstrMessage = NULL;
  *  @note              copied from FLO glue implementatuion
  *  @version           1.0
  */
-int wilc_mq_recv(WILC_MsgQueueHandle *pHandle,
-                            void *pvRecvBuffer, u32 u32RecvBufferSize,
-                            u32 *pu32ReceivedLength)
+int wilc_mq_recv(struct message_queue *pHandle,
+                void *pvRecvBuffer, u32 u32RecvBufferSize,
+                u32 *pu32ReceivedLength)
 {
        struct message *pstrMessage;
        unsigned long flags;
 
        struct message *next;
 };
 
-typedef struct __MessageQueue_struct {
+struct message_queue {
        struct semaphore hSem;
        spinlock_t strCriticalSection;
        bool bExiting;
        u32 u32ReceiversCount;
        struct message *pstrMessageList;
-} WILC_MsgQueueHandle;
+};
 
 /*!
  *  @brief             Creates a new Message queue
  *  @date              30 Aug 2010
  *  @version           1.0
  */
-int wilc_mq_create(WILC_MsgQueueHandle *pHandle);
+int wilc_mq_create(struct message_queue *pHandle);
 
 /*!
  *  @brief             Sends a message
  *  @date              30 Aug 2010
  *  @version           1.0
  */
-int wilc_mq_send(WILC_MsgQueueHandle *pHandle,
-                            const void *pvSendBuffer, u32 u32SendBufferSize);
+int wilc_mq_send(struct message_queue *pHandle,
+                const void *pvSendBuffer, u32 u32SendBufferSize);
 
 /*!
  *  @brief             Receives a message
  *  @date              30 Aug 2010
  *  @version           1.0
  */
-int wilc_mq_recv(WILC_MsgQueueHandle *pHandle,
-                            void *pvRecvBuffer, u32 u32RecvBufferSize,
-                            u32 *pu32ReceivedLength);
+int wilc_mq_recv(struct message_queue *pHandle,
+                void *pvRecvBuffer, u32 u32RecvBufferSize,
+                u32 *pu32ReceivedLength);
 
 /*!
  *  @brief             Destroys an existing  Message queue
  *  @date              30 Aug 2010
  *  @version           1.0
  */
-int wilc_mq_destroy(WILC_MsgQueueHandle *pHandle);
+int wilc_mq_destroy(struct message_queue *pHandle);
 
 #endif