diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c
index ea7354c..5c337b2 100644
--- a/core/rtw_cmd.c
+++ b/core/rtw_cmd.c
@@ -530,7 +530,7 @@ void rtw_stop_cmd_thread(_adapter *adapter)
 	}
 }
 
-thread_return rtw_cmd_thread(thread_context context)
+int rtw_cmd_thread(void *context)
 {
 	u8 ret;
 	struct cmd_obj *pcmd;
diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c
index 58e2e26..55f9143 100644
--- a/core/rtw_xmit.c
+++ b/core/rtw_xmit.c
@@ -5354,7 +5354,7 @@ sint check_pending_xmitbuf(
 	return ret;
 }
 
-thread_return rtw_xmit_thread(thread_context context)
+int rtw_xmit_thread(void *context)
 {
 	s32 err;
 	PADAPTER padapter;
diff --git a/include/drv_types.h b/include/drv_types.h
index 9a0eaf8..45d1bd4 100644
--- a/include/drv_types.h
+++ b/include/drv_types.h
@@ -992,7 +992,7 @@ struct dvobj_priv {
 	struct rtw_traffic_statistics	traffic_stat;
 
 #ifdef PLATFORM_LINUX
-	_thread_hdl_ rtnl_lock_holder;
+	void * rtnl_lock_holder;
 
 	#if defined(CONFIG_IOCTL_CFG80211) && defined(RTW_SINGLE_WIPHY)
 	struct wiphy *wiphy;
@@ -1003,7 +1003,7 @@ struct dvobj_priv {
 	_timer txbcn_timer;
 #endif
 	_timer dynamic_chk_timer; /* dynamic/periodic check timer */
-	
+
 #ifdef CONFIG_RTW_NAPI_DYNAMIC
 	u8 en_napi_dynamic;
 #endif /* CONFIG_RTW_NAPI_DYNAMIC */
@@ -1258,7 +1258,7 @@ struct proxim {
 #ifdef CONFIG_MAC_LOOPBACK_DRIVER
 typedef struct loopbackdata {
 	_sema	sema;
-	_thread_hdl_ lbkthread;
+	void * lbkthread;
 	u8 bstop;
 	u32 cnt;
 	u16 size;
@@ -1371,15 +1371,15 @@ struct _ADAPTER {
 		void (*callback[8])(u8 level);
 	} gpiointpriv;
 #endif
-	_thread_hdl_ cmdThread;
+	void *cmdThread;
 #ifdef CONFIG_EVENT_THREAD_MODE
-	_thread_hdl_ evtThread;
+	void *evtThread;
 #endif
 #ifdef CONFIG_XMIT_THREAD_MODE
-	_thread_hdl_ xmitThread;
+	void *xmitThread;
 #endif
 #ifdef CONFIG_RECV_THREAD_MODE
-	_thread_hdl_ recvThread;
+	void *recvThread;
 #endif
 	u8 registered;
 #ifndef PLATFORM_LINUX
diff --git a/include/rtw_cmd.h b/include/rtw_cmd.h
index 036262d..61495a1 100644
--- a/include/rtw_cmd.h
+++ b/include/rtw_cmd.h
@@ -177,7 +177,7 @@ extern void rtw_free_evt_obj(struct evt_obj *pcmd);
 #endif
 
 void rtw_stop_cmd_thread(_adapter *adapter);
-thread_return rtw_cmd_thread(thread_context context);
+int rtw_cmd_thread(void *context);
 
 extern u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv);
 extern void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv);
diff --git a/include/rtw_xmit.h b/include/rtw_xmit.h
index 8234d9b..8dbaf71 100644
--- a/include/rtw_xmit.h
+++ b/include/rtw_xmit.h
@@ -974,7 +974,7 @@ void enqueue_pending_xmitbuf_to_head(struct xmit_priv *pxmitpriv, struct xmit_bu
 struct xmit_buf	*dequeue_pending_xmitbuf(struct xmit_priv *pxmitpriv);
 struct xmit_buf	*select_and_dequeue_pending_xmitbuf(_adapter *padapter);
 sint	check_pending_xmitbuf(struct xmit_priv *pxmitpriv);
-thread_return	rtw_xmit_thread(thread_context context);
+int	rtw_xmit_thread(void *context);
 #endif
 
 #ifdef CONFIG_TX_AMSDU
diff --git a/os_dep/linux/ioctl_linux.c b/os_dep/linux/ioctl_linux.c
index e6abac2..30f9584 100644
--- a/os_dep/linux/ioctl_linux.c
+++ b/os_dep/linux/ioctl_linux.c
@@ -11844,7 +11844,7 @@ static u8 pktcmp(PADAPTER padapter, u8 *txbuf, u32 txsz, u8 *rxbuf, u32 rxsz)
 	return ret;
 }
 
-thread_return lbk_thread(thread_context context)
+int lbk_thread(void *context)
 {
 	s32 err;
 	PADAPTER padapter;