diff --git a/core/rtw_ioctl_query.c b/core/rtw_ioctl_query.c
index 6f7613e..9392138 100644
--- a/core/rtw_ioctl_query.c
+++ b/core/rtw_ioctl_query.c
@@ -17,150 +17,3 @@
 #include <drv_types.h>
 
 
-#ifdef PLATFORM_WINDOWS
-/*
- * Added for WPA2-PSK, by Annie, 2005-09-20.
- *   */
-u8
-query_802_11_capability(
-	_adapter		*Adapter,
-	u8			*pucBuf,
-	u32		*pulOutLen
-)
-{
-	static NDIS_802_11_AUTHENTICATION_ENCRYPTION szAuthEnc[] = {
-		{Ndis802_11AuthModeOpen, Ndis802_11EncryptionDisabled},
-		{Ndis802_11AuthModeOpen, Ndis802_11Encryption1Enabled},
-		{Ndis802_11AuthModeShared, Ndis802_11EncryptionDisabled},
-		{Ndis802_11AuthModeShared, Ndis802_11Encryption1Enabled},
-		{Ndis802_11AuthModeWPA, Ndis802_11Encryption2Enabled},
-		{Ndis802_11AuthModeWPA, Ndis802_11Encryption3Enabled},
-		{Ndis802_11AuthModeWPAPSK, Ndis802_11Encryption2Enabled},
-		{Ndis802_11AuthModeWPAPSK, Ndis802_11Encryption3Enabled},
-		{Ndis802_11AuthModeWPANone, Ndis802_11Encryption2Enabled},
-		{Ndis802_11AuthModeWPANone, Ndis802_11Encryption3Enabled},
-		{Ndis802_11AuthModeWPA2, Ndis802_11Encryption2Enabled},
-		{Ndis802_11AuthModeWPA2, Ndis802_11Encryption3Enabled},
-		{Ndis802_11AuthModeWPA2PSK, Ndis802_11Encryption2Enabled},
-		{Ndis802_11AuthModeWPA2PSK, Ndis802_11Encryption3Enabled}
-	};
-	static ULONG	ulNumOfPairSupported = sizeof(szAuthEnc) / sizeof(NDIS_802_11_AUTHENTICATION_ENCRYPTION);
-	NDIS_802_11_CAPABILITY *pCap = (NDIS_802_11_CAPABILITY *)pucBuf;
-	u8	*pucAuthEncryptionSupported = (u8 *) pCap->AuthenticationEncryptionSupported;
-
-
-	pCap->Length = sizeof(NDIS_802_11_CAPABILITY);
-	if (ulNumOfPairSupported > 1)
-		pCap->Length +=	(ulNumOfPairSupported - 1) * sizeof(NDIS_802_11_AUTHENTICATION_ENCRYPTION);
-
-	pCap->Version = 2;
-	pCap->NoOfPMKIDs = NUM_PMKID_CACHE;
-	pCap->NoOfAuthEncryptPairsSupported = ulNumOfPairSupported;
-
-	if (sizeof(szAuthEnc) <= 240)		/* 240 = 256 - 4*4	 */ { /* SecurityInfo.szCapability: only 256 bytes in size. */
-		_rtw_memcpy(pucAuthEncryptionSupported, (u8 *)szAuthEnc,  sizeof(szAuthEnc));
-		*pulOutLen = pCap->Length;
-		return _TRUE;
-	} else {
-		*pulOutLen = 0;
-		return _FALSE;
-	}
-}
-
-u8 query_802_11_association_information(_adapter *padapter, PNDIS_802_11_ASSOCIATION_INFORMATION	pAssocInfo)
-{
-	struct wlan_network *tgt_network;
-	struct	mlme_priv	*pmlmepriv = &(padapter->mlmepriv);
-	struct	security_priv  *psecuritypriv = &(padapter->securitypriv);
-	WLAN_BSSID_EX	*psecnetwork = (WLAN_BSSID_EX *)&pmlmepriv->cur_network.network;
-	u8	*pDest = (u8 *)pAssocInfo + sizeof(NDIS_802_11_ASSOCIATION_INFORMATION);
-	unsigned char i, *auth_ie, *supp_ie;
-
-	/* NdisZeroMemory(pAssocInfo, sizeof(NDIS_802_11_ASSOCIATION_INFORMATION)); */
-	_rtw_memset(pAssocInfo, 0, sizeof(NDIS_802_11_ASSOCIATION_INFORMATION));
-	/* pAssocInfo->Length = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION); */
-
-	/* ------------------------------------------------------ */
-	/* Association Request related information */
-	/* ------------------------------------------------------ */
-	/* Req_1. AvailableRequestFixedIEs */
-	if (psecnetwork != NULL) {
-
-		pAssocInfo->AvailableRequestFixedIEs |= NDIS_802_11_AI_REQFI_CAPABILITIES | NDIS_802_11_AI_REQFI_CURRENTAPADDRESS;
-		pAssocInfo->RequestFixedIEs.Capabilities = (unsigned short) *&psecnetwork->IEs[10];
-		_rtw_memcpy(pAssocInfo->RequestFixedIEs.CurrentAPAddress,
-			    &psecnetwork->MacAddress, 6);
-
-		pAssocInfo->OffsetRequestIEs = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION);
-
-		if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING | _FW_LINKED) == _TRUE) {
-
-			if (psecuritypriv->ndisauthtype >= Ndis802_11AuthModeWPA2)
-				pDest[0] = 48;		/* RSN Information Element */
-			else
-				pDest[0] = 221;	/* WPA(SSN) Information Element */
-
-			supp_ie = &psecuritypriv->supplicant_ie[0];
-
-			i = 13;	/* 0~11 is fixed information element		 */
-			while ((i < supp_ie[0]) && (i < 256)) {
-				if ((unsigned char)supp_ie[i] == pDest[0]) {
-					_rtw_memcpy((u8 *)(pDest),
-						    &supp_ie[i],
-						    supp_ie[1 + i] + 2);
-
-					break;
-				}
-
-				i = i + supp_ie[i + 1] + 2;
-				if (supp_ie[1 + i] == 0)
-					i = i + 1;
-
-			}
-
-
-			pAssocInfo->RequestIELength += (2 + supp_ie[1 + i]); /* (2 + psecnetwork->IEs[1+i]+4); */
-
-		}
-
-
-
-	}
-
-
-	/* ------------------------------------------------------ */
-	/* Association Response related information */
-	/* ------------------------------------------------------ */
-
-	if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) {
-		tgt_network = &(pmlmepriv->cur_network);
-		if (tgt_network != NULL) {
-			pAssocInfo->AvailableResponseFixedIEs =
-				NDIS_802_11_AI_RESFI_CAPABILITIES
-				| NDIS_802_11_AI_RESFI_ASSOCIATIONID
-				;
-
-			pAssocInfo->ResponseFixedIEs.Capabilities = (unsigned short) *&tgt_network->network.IEs[10];
-			pAssocInfo->ResponseFixedIEs.StatusCode = 0;
-			pAssocInfo->ResponseFixedIEs.AssociationId = (unsigned short) tgt_network->aid;
-
-			pDest = (u8 *)pAssocInfo + sizeof(NDIS_802_11_ASSOCIATION_INFORMATION) + pAssocInfo->RequestIELength;
-			auth_ie = &psecuritypriv->authenticator_ie[0];
-
-
-			i = auth_ie[0] - 12;
-			if (i > 0) {
-				_rtw_memcpy((u8 *)&pDest[0], &auth_ie[1], i);
-				pAssocInfo->ResponseIELength = i;
-			}
-
-
-			pAssocInfo->OffsetResponseIEs = sizeof(NDIS_802_11_ASSOCIATION_INFORMATION) + pAssocInfo->RequestIELength;
-
-
-		}
-	}
-
-	return _TRUE;
-}
-#endif
diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c
index 1b91233..b77035b 100644
--- a/core/rtw_ioctl_set.c
+++ b/core/rtw_ioctl_set.c
@@ -197,83 +197,6 @@ exit:
 	return ret;
 }
 
-#ifdef PLATFORM_WINDOWS
-u8 rtw_pnp_set_power_wakeup(_adapter *padapter)
-{
-	u8 res = _SUCCESS;
-
-
-
-	res = rtw_setstandby_cmd(padapter, 0);
-
-
-
-	return res;
-}
-
-u8 rtw_pnp_set_power_sleep(_adapter *padapter)
-{
-	u8 res = _SUCCESS;
-
-
-	/* DbgPrint("+rtw_pnp_set_power_sleep\n"); */
-
-	res = rtw_setstandby_cmd(padapter, 1);
-
-
-
-	return res;
-}
-
-u8 rtw_set_802_11_reload_defaults(_adapter *padapter, NDIS_802_11_RELOAD_DEFAULTS reloadDefaults)
-{
-
-
-
-	/* SecClearAllKeys(Adapter); */
-	/* 8711 CAM was not for En/Decrypt only */
-	/* so, we can't clear all keys. */
-	/* should we disable WPAcfg (ox0088) bit 1-2, instead of clear all CAM */
-
-	/* TO DO... */
-
-
-	return _TRUE;
-}
-
-u8 set_802_11_test(_adapter *padapter, NDIS_802_11_TEST *test)
-{
-	u8 ret = _TRUE;
-
-
-	switch (test->Type) {
-	case 1:
-		NdisMIndicateStatus(padapter->hndis_adapter, NDIS_STATUS_MEDIA_SPECIFIC_INDICATION, (PVOID)&test->AuthenticationEvent, test->Length - 8);
-		NdisMIndicateStatusComplete(padapter->hndis_adapter);
-		break;
-
-	case 2:
-		NdisMIndicateStatus(padapter->hndis_adapter, NDIS_STATUS_MEDIA_SPECIFIC_INDICATION, (PVOID)&test->RssiTrigger, sizeof(NDIS_802_11_RSSI));
-		NdisMIndicateStatusComplete(padapter->hndis_adapter);
-		break;
-
-	default:
-		ret = _FALSE;
-		break;
-	}
-
-
-	return ret;
-}
-
-u8	rtw_set_802_11_pmkid(_adapter	*padapter, NDIS_802_11_PMKID *pmkid)
-{
-	u8	ret = _SUCCESS;
-
-	return ret;
-}
-
-#endif
 
 u8 rtw_set_802_11_bssid(_adapter *padapter, u8 *bssid)
 {
diff --git a/core/rtw_mp_ioctl.c b/core/rtw_mp_ioctl.c
index 035d281..4c90d94 100644
--- a/core/rtw_mp_ioctl.c
+++ b/core/rtw_mp_ioctl.c
@@ -42,9 +42,6 @@ NDIS_STATUS oid_rt_wireless_mode_hdl(struct oid_par_priv *poid_par_priv)
 /* ****************  oid_rtl_seg_81_87_80   section start **************** */
 NDIS_STATUS oid_rt_pro_write_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL oldirql;
-#endif
 	struct bb_reg_param *pbbreg;
 	u16 offset;
 	u32 value;
@@ -78,9 +75,6 @@ NDIS_STATUS oid_rt_pro_write_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_read_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL oldirql;
-#endif
 	struct bb_reg_param *pbbreg;
 	u16 offset;
 	u32 value;
@@ -114,9 +108,6 @@ NDIS_STATUS oid_rt_pro_read_bb_reg_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_write_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL oldirql;
-#endif
 	struct rf_reg_param *pbbreg;
 	u8 path;
 	u8 offset;
@@ -156,9 +147,6 @@ NDIS_STATUS oid_rt_pro_write_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_read_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL oldirql;
-#endif
 	struct rf_reg_param *pbbreg;
 	u8 path;
 	u8 offset;
@@ -203,9 +191,6 @@ NDIS_STATUS oid_rt_pro_read_rf_reg_hdl(struct oid_par_priv *poid_par_priv)
  * ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u32		ratevalue;/* 4 */
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -234,9 +219,6 @@ NDIS_STATUS oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_start_test_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u32		mode;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -271,9 +253,6 @@ exit:
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_stop_test_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
@@ -293,9 +272,6 @@ NDIS_STATUS oid_rt_pro_stop_test_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_set_channel_direct_call_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u32		Channel;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -328,9 +304,6 @@ NDIS_STATUS oid_rt_pro_set_channel_direct_call_hdl(struct oid_par_priv *poid_par
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_set_bandwidth_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u16		bandwidth;
 	u16		channel_offset;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
@@ -363,9 +336,6 @@ NDIS_STATUS oid_rt_set_bandwidth_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_set_antenna_bb_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u32		antenna;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -395,9 +365,6 @@ NDIS_STATUS oid_rt_pro_set_antenna_bb_hdl(struct oid_par_priv *poid_par_priv)
 
 NDIS_STATUS oid_rt_pro_set_tx_power_control_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u32		tx_pwr_idx;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -530,9 +497,6 @@ NDIS_STATUS oid_rt_pro_reset_rx_packet_received_hdl(struct oid_par_priv *poid_pa
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
@@ -552,9 +516,6 @@ NDIS_STATUS oid_rt_reset_phy_rx_packet_count_hdl(struct oid_par_priv *poid_par_p
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_get_phy_rx_packet_received_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
@@ -579,9 +540,6 @@ NDIS_STATUS oid_rt_get_phy_rx_packet_received_hdl(struct oid_par_priv *poid_par_
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_get_phy_rx_packet_crc32_error_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
@@ -607,9 +565,6 @@ NDIS_STATUS oid_rt_get_phy_rx_packet_crc32_error_hdl(struct oid_par_priv *poid_p
 /* ****************  oid_rtl_seg_81_80_20   section end **************** */
 NDIS_STATUS oid_rt_pro_set_continuous_tx_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u32		bStartTest;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -642,9 +597,6 @@ NDIS_STATUS oid_rt_pro_set_continuous_tx_hdl(struct oid_par_priv *poid_par_priv)
 
 NDIS_STATUS oid_rt_pro_set_single_carrier_tx_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u32		bStartTest;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -677,9 +629,6 @@ NDIS_STATUS oid_rt_pro_set_single_carrier_tx_hdl(struct oid_par_priv *poid_par_p
 
 NDIS_STATUS oid_rt_pro_set_carrier_suppression_tx_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u32		bStartTest;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -712,9 +661,6 @@ NDIS_STATUS oid_rt_pro_set_carrier_suppression_tx_hdl(struct oid_par_priv *poid_
 
 NDIS_STATUS oid_rt_pro_set_single_tone_tx_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u32		bStartTest;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -743,9 +689,6 @@ NDIS_STATUS oid_rt_pro_trigger_gpio_hdl(struct oid_par_priv *poid_par_priv)
 {
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 
 	if (poid_par_priv->type_of_oid != SET_OID)
@@ -765,9 +708,6 @@ NDIS_STATUS oid_rt_pro8711_join_bss_hdl(struct oid_par_priv *poid_par_priv)
 #if 0
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 
 	PNDIS_802_11_SSID pssid;
@@ -801,9 +741,6 @@ NDIS_STATUS oid_rt_pro8711_join_bss_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	pRW_Reg	RegRWStruct;
 	u32		offset, width;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
@@ -846,9 +783,6 @@ NDIS_STATUS oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	pRW_Reg	RegRWStruct;
 	u32		offset, width, value;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
@@ -902,9 +836,6 @@ NDIS_STATUS oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv)
 NDIS_STATUS oid_rt_pro_burst_read_register_hdl(struct oid_par_priv *poid_par_priv)
 {
 #if 0
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	pBurst_RW_Reg	pBstRwReg;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	padapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -933,9 +864,6 @@ NDIS_STATUS oid_rt_pro_burst_read_register_hdl(struct oid_par_priv *poid_par_pri
 NDIS_STATUS oid_rt_pro_burst_write_register_hdl(struct oid_par_priv *poid_par_priv)
 {
 #if 0
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	pBurst_RW_Reg	pBstRwReg;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	padapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -966,9 +894,6 @@ NDIS_STATUS oid_rt_pro_write_txcmd_hdl(struct oid_par_priv *poid_par_priv)
 
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 
 	TX_CMD_Desc	*TxCmd_Info;
 
@@ -999,9 +924,6 @@ NDIS_STATUS oid_rt_pro_write_txcmd_hdl(struct oid_par_priv *poid_par_priv)
 NDIS_STATUS oid_rt_pro_read16_eeprom_hdl(struct oid_par_priv *poid_par_priv)
 {
 #if 0
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	pEEPROM_RWParam pEEPROM;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	padapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -1031,9 +953,6 @@ NDIS_STATUS oid_rt_pro_read16_eeprom_hdl(struct oid_par_priv *poid_par_priv)
 NDIS_STATUS oid_rt_pro_write16_eeprom_hdl(struct oid_par_priv *poid_par_priv)
 {
 #if 0
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	pEEPROM_RWParam pEEPROM;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	padapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -1126,9 +1045,6 @@ NDIS_STATUS oid_rt_rd_attrib_mem_hdl(struct oid_par_priv *poid_par_priv)
 	struct io_queue *pio_queue = (struct io_queue *)Adapter->pio_queue;
 	struct intf_hdl	*pintfhdl = &pio_queue->intf;
 
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 
 #ifdef CONFIG_SDIO_HCI
@@ -1166,9 +1082,6 @@ NDIS_STATUS oid_rt_wr_attrib_mem_hdl(struct oid_par_priv *poid_par_priv)
 	struct io_queue *pio_queue = (struct io_queue *)Adapter->pio_queue;
 	struct intf_hdl	*pintfhdl = &pio_queue->intf;
 
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 
 #ifdef CONFIG_SDIO_HCI
@@ -1202,9 +1115,6 @@ NDIS_STATUS  oid_rt_pro_set_rf_intfs_hdl(struct oid_par_priv *poid_par_priv)
 #if 0
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 
 
@@ -1287,9 +1197,6 @@ NDIS_STATUS oid_rt_pro_set_data_rate_ex_hdl(struct oid_par_priv *poid_par_priv)
 {
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 
 
@@ -1310,9 +1217,6 @@ NDIS_STATUS oid_rt_pro_set_data_rate_ex_hdl(struct oid_par_priv *poid_par_priv)
 /* ----------------------------------------------------------------------------- */
 NDIS_STATUS oid_rt_get_thermal_meter_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	u8 thermal = 0;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -1341,9 +1245,6 @@ NDIS_STATUS oid_rt_pro_read_tssi_hdl(struct oid_par_priv *poid_par_priv)
 #if 0
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 
 
@@ -1380,9 +1281,6 @@ NDIS_STATUS oid_rt_pro_read_tssi_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_set_power_tracking_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
@@ -1412,9 +1310,6 @@ NDIS_STATUS oid_rt_pro_set_power_tracking_hdl(struct oid_par_priv *poid_par_priv
 NDIS_STATUS oid_rt_pro_set_basic_rate_hdl(struct oid_par_priv *poid_par_priv)
 {
 #if 0
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u32 ratevalue;
 	u8 datarates[NumRates];
 	int i;
@@ -1513,9 +1408,6 @@ NDIS_STATUS oid_rt_pro_h2c_set_rate_table_hdl(struct oid_par_priv *poid_par_priv
 #if 0
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 
 	struct setratable_parm *prate_table;
@@ -1687,9 +1579,6 @@ NDIS_STATUS oid_rt_pro_add_sta_info_hdl(struct oid_par_priv *poid_par_priv)
 #if 0
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 
 	struct sta_info *psta = NULL;
@@ -1731,9 +1620,6 @@ NDIS_STATUS oid_rt_pro_dele_sta_info_hdl(struct oid_par_priv *poid_par_priv)
 #if 0
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 
 	struct sta_info *psta = NULL;
@@ -1866,9 +1752,6 @@ NDIS_STATUS oid_rt_pro_query_dr_variable_hdl(struct oid_par_priv *poid_par_priv)
 #if 0
 	PADAPTER		Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
-#ifdef PLATFORM_OS_XP
-	_irqL			oldirql;
-#endif
 	NDIS_STATUS		status = NDIS_STATUS_SUCCESS;
 
 	DR_VARIABLE_STRUCT	*pdrv_var;
@@ -1930,9 +1813,6 @@ NDIS_STATUS oid_rt_pro_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL oldirql;
-#endif
 	PEFUSE_ACCESS_STRUCT pefuse;
 	u8 *data;
 	u16 addr = 0, cnts = 0, max_available_size = 0;
@@ -1971,9 +1851,6 @@ NDIS_STATUS oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL oldirql;
-#endif
 	PEFUSE_ACCESS_STRUCT pefuse;
 	u8 *data;
 	u16 addr = 0, cnts = 0, max_available_size = 0;
@@ -2008,9 +1885,6 @@ NDIS_STATUS oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	PPGPKT_STRUCT	ppgpkt;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -2053,9 +1927,6 @@ NDIS_STATUS oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_get_efuse_current_size_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u16 size;
 	u8 ret;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
@@ -2119,9 +1990,6 @@ NDIS_STATUS oid_rt_pro_efuse_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_pro_efuse_map_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u8		*data;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
@@ -2170,9 +2038,6 @@ NDIS_STATUS oid_rt_set_crystal_cap_hdl(struct oid_par_priv *poid_par_priv)
 #if 0
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 
 	u32		crystal_cap = 0;
 
@@ -2200,9 +2065,6 @@ NDIS_STATUS oid_rt_set_crystal_cap_hdl(struct oid_par_priv *poid_par_priv)
 
 NDIS_STATUS oid_rt_set_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u8		rx_pkt_type;
 	/*	u32		rcr_val32; */
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
@@ -2282,9 +2144,6 @@ NDIS_STATUS oid_rt_pro_set_tx_agc_offset_hdl(struct oid_par_priv *poid_par_priv)
 #if 0
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
 
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 
 	u32		txagc;
@@ -2460,9 +2319,6 @@ unsigned int mp_ioctl_xmit_packet_hdl(struct oid_par_priv *poid_par_priv)
 /* ------------------------------------------------------------------------------ */
 NDIS_STATUS oid_rt_set_power_down_hdl(struct oid_par_priv *poid_par_priv)
 {
-#ifdef PLATFORM_OS_XP
-	_irqL		oldirql;
-#endif
 	u8		bpwrup;
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 #ifdef PLATFORM_LINUX
@@ -2501,9 +2357,6 @@ NDIS_STATUS oid_rt_get_power_mode_hdl(struct oid_par_priv *poid_par_priv)
 #if 0
 	NDIS_STATUS	status = NDIS_STATUS_SUCCESS;
 	PADAPTER	Adapter = (PADAPTER)(poid_par_priv->adapter_context);
-	/* #ifdef PLATFORM_OS_XP */
-	/*	_irqL		oldirql;
-	 * #endif */
 
 
 	if (poid_par_priv->type_of_oid != QUERY_OID) {
diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c
index b7d6dca..34e10dc 100644
--- a/core/rtw_pwrctrl.c
+++ b/core/rtw_pwrctrl.c
@@ -2090,10 +2090,6 @@ void rtw_init_pwrctrl_priv(PADAPTER padapter)
 		return;
 #endif
 
-#ifdef PLATFORM_WINDOWS
-	pwrctrlpriv->pnp_current_pwr_state = NdisDeviceStateD0;
-#endif
-
 	_init_pwrlock(&pwrctrlpriv->lock);
 	_init_pwrlock(&pwrctrlpriv->check_32k_lock);
 	pwrctrlpriv->rf_pwrstate = rf_on;
diff --git a/core/rtw_recv.c b/core/rtw_recv.c
index 025b300..3c18074 100644
--- a/core/rtw_recv.c
+++ b/core/rtw_recv.c
@@ -2572,21 +2572,7 @@ sint wlanhdr_to_ethhdr(union recv_frame *precvframe)
 		/* ptr -= 16; */
 		/* _rtw_memcpy(ptr, get_rxmem(precvframe), 16); */
 	} else {
-#ifdef PLATFORM_OS_XP
-		NDIS_PACKET_8021Q_INFO VlanPriInfo;
-		UINT32 UserPriority = precvframe->u.hdr.attrib.priority;
-		UINT32 VlanID = (pvlan != NULL ? get_vlan_id(pvlan) : 0);
 
-		VlanPriInfo.Value =          /* Get current value. */
-			NDIS_PER_PACKET_INFO_FROM_PACKET(precvframe->u.hdr.pkt, Ieee8021QInfo);
-
-		VlanPriInfo.TagHeader.UserPriority = UserPriority;
-		VlanPriInfo.TagHeader.VlanId =  VlanID ;
-
-		VlanPriInfo.TagHeader.CanonicalFormatId = 0; /* Should be zero. */
-		VlanPriInfo.TagHeader.Reserved = 0; /* Should be zero. */
-		NDIS_PER_PACKET_INFO_FROM_PACKET(precvframe->u.hdr.pkt, Ieee8021QInfo) = VlanPriInfo.Value;
-#endif
 	}
 
 	if (eth_type == 0x8712) { /* append rx status for mp test packets */
@@ -2603,8 +2589,6 @@ sint wlanhdr_to_ethhdr(union recv_frame *precvframe)
 	_rtw_memcpy(ptr + 12, &eth_type, 2);
 
 exit:
-
-
 	return ret;
 }
 #endif
diff --git a/hal/phydm/halrf/rtl8814a/halrf_8814a_ap.c b/hal/phydm/halrf/rtl8814a/halrf_8814a_ap.c
index 238df1b..6c93e5f 100644
--- a/hal/phydm/halrf/rtl8814a/halrf_8814a_ap.c
+++ b/hal/phydm/halrf/rtl8814a/halrf_8814a_ap.c
@@ -1190,11 +1190,9 @@ VOID
 #define		DP_DPK_VALUE_NUM	2
 
 
-
-
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 //digital predistortion
-VOID	
+VOID
 	phy_DigitalPredistortion_8814A(
 #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
 			IN	PADAPTER	pAdapter,
@@ -1213,19 +1211,19 @@ VOID
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 	PDM_ODM_T		pDM_Odm = &pHalData->DM_OutSrc;
 #endif
-#endif	
+#endif
 
-	u4Byte			tmpReg, tmpReg2, index,  i;		
+	u4Byte			tmpReg, tmpReg2, index,  i;
 	u1Byte			path, pathbound = PATH_NUM;
 	u4Byte			AFE_backup[IQK_ADDA_REG_NUM];
-	u4Byte			AFE_REG[IQK_ADDA_REG_NUM] = {	
-		rFPGA0_XCD_SwitchControl, 	rBlue_Tooth, 	
+	u4Byte			AFE_REG[IQK_ADDA_REG_NUM] = {
+		rFPGA0_XCD_SwitchControl, 	rBlue_Tooth,
 		rRx_Wait_CCA, 		rTx_CCK_RFON,
-		rTx_CCK_BBON, 	rTx_OFDM_RFON, 	
+		rTx_CCK_BBON, 	rTx_OFDM_RFON,
 		rTx_OFDM_BBON, 	rTx_To_Rx,
-		rTx_To_Tx, 		rRx_CCK, 	
+		rTx_To_Tx, 		rRx_CCK,
 		rRx_OFDM, 		rRx_Wait_RIFS,
-		rRx_TO_Rx, 		rStandby, 	
+		rRx_TO_Rx, 		rStandby,
 		rSleep, 			rPMPD_ANAEN };
 
 	u4Byte			BB_backup[DP_BB_REG_NUM];	
diff --git a/hal/phydm/rtl8814a/halphyrf_8814a_ap.c b/hal/phydm/rtl8814a/halphyrf_8814a_ap.c
index 948f919..adf2cd9 100644
--- a/hal/phydm/rtl8814a/halphyrf_8814a_ap.c
+++ b/hal/phydm/rtl8814a/halphyrf_8814a_ap.c
@@ -1189,12 +1189,9 @@ VOID
 #define		DP_DPK_NUM			3
 #define		DP_DPK_VALUE_NUM	2
 
-
-
-
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 //digital predistortion
-VOID	
+VOID
 	phy_DigitalPredistortion_8814A(
 #if !(DM_ODM_SUPPORT_TYPE & ODM_AP)
 			IN	PADAPTER	pAdapter,
@@ -1213,9 +1210,9 @@ VOID
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 	PDM_ODM_T		pDM_Odm = &pHalData->DM_OutSrc;
 #endif
-#endif	
+#endif
 
-	u32			tmpReg, tmpReg2, index,  i;		
+	u32			tmpReg, tmpReg2, index,  i;
 	u8			path, pathbound = PATH_NUM;
 	u32			AFE_backup[IQK_ADDA_REG_NUM];
 	u32			AFE_REG[IQK_ADDA_REG_NUM] = {	
diff --git a/include/byteorder/generic.h b/include/byteorder/generic.h
index f85114b..c822010 100644
--- a/include/byteorder/generic.h
+++ b/include/byteorder/generic.h
@@ -93,7 +93,7 @@
  */
 
 
-#if defined(PLATFORM_LINUX) || defined(PLATFORM_WINDOWS) || defined(PLATFORM_MPIXEL) || defined(PLATFORM_FREEBSD)
+#if defined(PLATFORM_LINUX) || defined(PLATFORM_MPIXEL) || defined(PLATFORM_FREEBSD)
 	/*
 	* inside the kernel, we can use nicknames;
 	* outside of it, we must avoid POSIX namespace pollution...
@@ -192,16 +192,4 @@
 	#define ntohs(x) ___ntohs(x)
 
 #endif /* OPTIMIZE */
-
-
-#if defined(PLATFORM_WINDOWS)
-
-	#define htonl(x) __cpu_to_be32(x)
-	#define ntohl(x) __be32_to_cpu(x)
-	#define htons(x) __cpu_to_be16(x)
-	#define ntohs(x) __be16_to_cpu(x)
-
-
-#endif
-
 #endif /* _LINUX_BYTEORDER_GENERIC_H */
diff --git a/include/byteorder/swab.h b/include/byteorder/swab.h
index a8dd46b..ad3a76d 100644
--- a/include/byteorder/swab.h
+++ b/include/byteorder/swab.h
@@ -121,7 +121,7 @@ __inline static __u64 __arch__swab64(__u64 x)
 	return __arch__swab32(x);
 }
 
-#if defined(PLATFORM_LINUX) || defined(PLATFORM_WINDOWS)
+#if defined(PLATFORM_LINUX)
 	#define swab16 __swab16
 	#define swab32 __swab32
 	#define swab64 __swab64
diff --git a/include/custom_gpio.h b/include/custom_gpio.h
index 49411b6..f5ab06e 100644
--- a/include/custom_gpio.h
+++ b/include/custom_gpio.h
@@ -18,13 +18,6 @@
 #include <drv_conf.h>
 #include <osdep_service.h>
 
-#ifdef PLATFORM_OS_XP
-	#include <drv_types_xp.h>
-#endif
-
-#ifdef PLATFORM_OS_CE
-	#include <drv_types_ce.h>
-#endif
 
 #ifdef PLATFORM_LINUX
 	#include <drv_types_linux.h>
diff --git a/include/drv_types.h b/include/drv_types.h
index e52608d..a9cb272 100644
--- a/include/drv_types.h
+++ b/include/drv_types.h
@@ -92,7 +92,6 @@ typedef struct _ADAPTER _adapter, ADAPTER, *PADAPTER;
 #include <rtw_io.h>
 #include <rtw_ioctl.h>
 #include <rtw_ioctl_set.h>
-#include <rtw_ioctl_query.h>
 #include <rtw_ioctl_rtl.h>
 #include <osdep_intf.h>
 #include <rtw_eeprom.h>
@@ -1166,31 +1165,6 @@ struct dvobj_priv {
 	u8 *usb_vendor_req_buf;
 #endif
 
-#ifdef PLATFORM_WINDOWS
-	/* related device objects */
-	PDEVICE_OBJECT	pphysdevobj;/* pPhysDevObj; */
-	PDEVICE_OBJECT	pfuncdevobj;/* pFuncDevObj; */
-	PDEVICE_OBJECT	pnextdevobj;/* pNextDevObj; */
-
-	u8	nextdevstacksz;/* unsigned char NextDeviceStackSize;	 */ /* = (CHAR)CEdevice->pUsbDevObj->StackSize + 1; */
-
-	/* urb for control diescriptor request */
-
-#ifdef PLATFORM_OS_XP
-	struct _URB_CONTROL_DESCRIPTOR_REQUEST descriptor_urb;
-	PUSB_CONFIGURATION_DESCRIPTOR	pconfig_descriptor;/* UsbConfigurationDescriptor; */
-#endif
-
-#ifdef PLATFORM_OS_CE
-	WCHAR			active_path[MAX_ACTIVE_REG_PATH];	/* adapter regpath */
-	USB_EXTENSION	usb_extension;
-
-	_nic_hdl		pipehdls_r8192c[0x10];
-#endif
-
-	u32	config_descriptor_len;/* ULONG UsbConfigurationDescriptorLength; */
-#endif/* PLATFORM_WINDOWS */
-
 #ifdef PLATFORM_LINUX
 	struct usb_interface *pusbintf;
 	struct usb_device *pusbdev;
@@ -1531,17 +1505,6 @@ struct _ADAPTER {
 	void (*intf_start)(_adapter *adapter);
 	void (*intf_stop)(_adapter *adapter);
 
-#ifdef PLATFORM_WINDOWS
-	_nic_hdl		hndis_adapter;/* hNdisAdapter(NDISMiniportAdapterHandle); */
-	_nic_hdl		hndis_config;/* hNdisConfiguration; */
-	NDIS_STRING fw_img;
-
-	u32	NdisPacketFilter;
-	u8	MCList[MAX_MCAST_LIST_NUM][6];
-	u32	MCAddrCount;
-#endif /* end of PLATFORM_WINDOWS */
-
-
 #ifdef PLATFORM_LINUX
 	_nic_hdl pnetdev;
 	char old_ifname[IFNAMSIZ];
diff --git a/include/drv_types_sdio.h b/include/drv_types_sdio.h
index 9feca12..dac72ed 100644
--- a/include/drv_types_sdio.h
+++ b/include/drv_types_sdio.h
@@ -28,15 +28,6 @@
 	#endif /* CONFIG_PLATFORM_SPRD */
 #endif
 
-#ifdef PLATFORM_OS_XP
-	#include <wdm.h>
-	#include <ntddsd.h>
-#endif
-
-#ifdef PLATFORM_OS_CE
-	#include <sdcardddk.h>
-#endif
-
 #define RTW_SDIO_CLK_33M	33000000
 #define RTW_SDIO_CLK_40M	40000000
 #define RTW_SDIO_CLK_80M	80000000
@@ -56,23 +47,6 @@ typedef struct sdio_data {
 	unsigned int timing;
 	u8	sd3_bus_mode;
 #endif
-
-#ifdef PLATFORM_OS_XP
-	PDEVICE_OBJECT				pphysdevobj;
-	PDEVICE_OBJECT				pfuncdevobj;
-	PDEVICE_OBJECT				pnextdevobj;
-	SDBUS_INTERFACE_STANDARD	sdbusinft;
-	u8							nextdevstacksz;
-#endif
-
-#ifdef PLATFORM_OS_CE
-	SD_DEVICE_HANDLE			hDevice;
-	SD_CARD_RCA					sd_rca;
-	SD_CARD_INTERFACE			card_intf;
-	BOOLEAN						enableIsarWithStatus;
-	WCHAR						active_path[MAX_ACTIVE_REG_PATH];
-	SD_HOST_BLOCK_CAPABILITY	sd_host_blk_cap;
-#endif
 } SDIO_DATA, *PSDIO_DATA;
 
 #define dvobj_to_sdio_func(d)	((d)->intf_data.func)
diff --git a/include/ieee80211.h b/include/ieee80211.h
index 3360ba0..d70326f 100644
--- a/include/ieee80211.h
+++ b/include/ieee80211.h
@@ -16,15 +16,6 @@
 #define __IEEE80211_H
 
 
-#ifndef CONFIG_RTL8711FW
-
-	#if defined PLATFORM_OS_XP
-		#include <ntstrsafe.h>
-	#endif
-#else
-
-#endif
-
 #define MGMT_QUEUE_NUM 5
 
 #define ETH_ALEN	6
@@ -498,54 +489,6 @@ struct rtw_ieee80211s_hdr {
 } __attribute__((packed));
 #endif
 
-
-
-#ifdef PLATFORM_WINDOWS
-
-#pragma pack(1)
-struct rtw_ieee80211_hdr {
-	u16 frame_ctl;
-	u16 duration_id;
-	u8 addr1[ETH_ALEN];
-	u8 addr2[ETH_ALEN];
-	u8 addr3[ETH_ALEN];
-	u16 seq_ctl;
-	u8 addr4[ETH_ALEN];
-};
-
-struct rtw_ieee80211_hdr_3addr {
-	u16 frame_ctl;
-	u16 duration_id;
-	u8 addr1[ETH_ALEN];
-	u8 addr2[ETH_ALEN];
-	u8 addr3[ETH_ALEN];
-	u16 seq_ctl;
-};
-
-
-struct rtw_ieee80211_hdr_qos {
-	struct rtw_ieee80211_hdr wlan_hdr;
-	u16	qc;
-};
-
-struct rtw_ieee80211_hdr_3addr_qos {
-	struct  rtw_ieee80211_hdr_3addr wlan_hdr;
-	u16     qc;
-};
-
-struct eapol {
-	u8 snap[6];
-	u16 ethertype;
-	u8 version;
-	u8 type;
-	u16 length;
-};
-#pragma pack()
-
-#endif
-
-
-
 enum eap_type {
 	EAP_PACKET = 0,
 	EAPOL_START,
@@ -667,22 +610,6 @@ struct ieee80211_snap_hdr {
 
 #endif
 
-#ifdef PLATFORM_WINDOWS
-
-#pragma pack(1)
-struct ieee80211_snap_hdr {
-
-	u8    dsap;   /* always 0xAA */
-	u8    ssap;   /* always 0xAA */
-	u8    ctrl;   /* always 0x03 */
-	u8    oui[P80211_OUI_LEN];    /* organizational universal id */
-
-};
-#pragma pack()
-
-#endif
-
-
 #define SNAP_SIZE sizeof(struct ieee80211_snap_hdr)
 
 #define WLAN_FC_GET_TYPE(fc) ((fc) & RTW_IEEE80211_FCTL_FTYPE)
@@ -1258,24 +1185,6 @@ struct ieee80211_security {
 
 #endif
 
-#ifdef PLATFORM_WINDOWS
-
-#pragma pack(1)
-struct ieee80211_security {
-	u16 active_key:2,
-	    enabled:1,
-	    auth_mode:2,
-	    auth_algo:4,
-	    unicast_uses_group:1;
-	u8 key_sizes[WEP_KEYS];
-	u8 keys[WEP_KEYS][WEP_KEY_LEN];
-	u8 level;
-	u16 flags;
-} ;
-#pragma pack()
-
-#endif
-
 /*
 
  802.11 data frame from AP
@@ -1330,24 +1239,6 @@ struct ieee80211_info_element {
 } __attribute__((packed));
 #endif
 
-#ifdef PLATFORM_WINDOWS
-
-#pragma pack(1)
-struct ieee80211_info_element_hdr {
-	u8 id;
-	u8 len;
-} ;
-
-struct ieee80211_info_element {
-	u8 id;
-	u8 len;
-	u8 data[0];
-} ;
-#pragma pack()
-
-#endif
-
-
 /*
  * These are the data types that can make up management packets
  *
@@ -1411,57 +1302,6 @@ struct ieee80211_assoc_response_frame {
 } __attribute__((packed));
 #endif
 
-
-
-#ifdef PLATFORM_WINDOWS
-
-#pragma pack(1)
-
-struct ieee80211_authentication {
-	struct ieee80211_header_data header;
-	u16 algorithm;
-	u16 transaction;
-	u16 status;
-	/* struct ieee80211_info_element_hdr info_element; */
-} ;
-
-
-struct ieee80211_probe_response {
-	struct ieee80211_header_data header;
-	u32 time_stamp[2];
-	u16 beacon_interval;
-	u16 capability;
-	struct ieee80211_info_element info_element;
-} ;
-
-struct ieee80211_probe_request {
-	struct ieee80211_header_data header;
-	/*struct ieee80211_info_element info_element;*/
-} ;
-
-struct ieee80211_assoc_request_frame {
-	struct rtw_ieee80211_hdr_3addr header;
-	u16 capability;
-	u16 listen_interval;
-	/* u8 current_ap[ETH_ALEN]; */
-	struct ieee80211_info_element_hdr info_element;
-} ;
-
-struct ieee80211_assoc_response_frame {
-	struct rtw_ieee80211_hdr_3addr header;
-	u16 capability;
-	u16 status;
-	u16 aid;
-	/*	struct ieee80211_info_element info_element;  supported rates  */
-};
-
-#pragma pack()
-
-#endif
-
-
-
-
 struct ieee80211_txb {
 	u8 nr_frags;
 	u8 encrypted;
diff --git a/include/ieee80211_ext.h b/include/ieee80211_ext.h
index 94a8e58..3ac0780 100644
--- a/include/ieee80211_ext.h
+++ b/include/ieee80211_ext.h
@@ -100,27 +100,6 @@ struct wme_parameter_element {
 
 #endif
 
-#ifdef PLATFORM_WINDOWS
-
-#pragma pack(1)
-
-struct wpa_ie_hdr {
-	u8 elem_id;
-	u8 len;
-	u8 oui[4]; /* 24-bit OUI followed by 8-bit OUI type */
-	u8 version[2]; /* little endian */
-};
-
-struct rsn_ie_hdr {
-	u8 elem_id; /* WLAN_EID_RSN */
-	u8 len;
-	u8 version[2]; /* little endian */
-};
-
-#pragma pack()
-
-#endif
-
 #define WPA_PUT_LE16(a, val)			\
 	do {					\
 		(a)[1] = ((u16) (val)) >> 8;	\
@@ -325,147 +304,6 @@ struct ieee80211_mgmt {
 
 #endif
 
-
-#ifdef PLATFORM_WINDOWS
-
-#pragma pack(1)
-
-struct ieee80211_mgmt {
-	u16 frame_control;
-	u16 duration;
-	u8 da[6];
-	u8 sa[6];
-	u8 bssid[6];
-	u16 seq_ctrl;
-	union {
-		struct {
-			u16 auth_alg;
-			u16 auth_transaction;
-			u16 status_code;
-			/* possibly followed by Challenge text */
-			u8 variable[0];
-		}  auth;
-		struct {
-			u16 reason_code;
-		}  deauth;
-		struct {
-			u16 capab_info;
-			u16 listen_interval;
-			/* followed by SSID and Supported rates */
-			u8 variable[0];
-		}  assoc_req;
-		struct {
-			u16 capab_info;
-			u16 status_code;
-			u16 aid;
-			/* followed by Supported rates */
-			u8 variable[0];
-		}  assoc_resp, reassoc_resp;
-		struct {
-			u16 capab_info;
-			u16 listen_interval;
-			u8 current_ap[6];
-			/* followed by SSID and Supported rates */
-			u8 variable[0];
-		}  reassoc_req;
-		struct {
-			u16 reason_code;
-		}  disassoc;
-#if 0
-		struct {
-			__le64 timestamp;
-			u16 beacon_int;
-			u16 capab_info;
-			/* followed by some of SSID, Supported rates,
-			 * FH Params, DS Params, CF Params, IBSS Params, TIM */
-			u8 variable[0];
-		}  beacon;
-		struct {
-			/* only variable items: SSID, Supported rates */
-			u8 variable[0];
-		}  probe_req;
-
-		struct {
-			__le64 timestamp;
-			u16 beacon_int;
-			u16 capab_info;
-			/* followed by some of SSID, Supported rates,
-			 * FH Params, DS Params, CF Params, IBSS Params */
-			u8 variable[0];
-		}  probe_resp;
-#endif
-		struct {
-			u8 category;
-			union {
-				struct {
-					u8 action_code;
-					u8 dialog_token;
-					u8 status_code;
-					u8 variable[0];
-				}  wme_action;
-				#if 0
-				struct{
-					u8 action_code;
-					u8 element_id;
-					u8 length;
-					struct ieee80211_channel_sw_ie sw_elem;
-				}  chan_switch;
-				struct{
-					u8 action_code;
-					u8 dialog_token;
-					u8 element_id;
-					u8 length;
-					struct ieee80211_msrment_ie msr_elem;
-				}  measurement;
-				#endif
-				struct {
-					u8 action_code;
-					u8 dialog_token;
-					u16 capab;
-					u16 timeout;
-					u16 start_seq_num;
-				}  addba_req;
-				struct {
-					u8 action_code;
-					u8 dialog_token;
-					u16 status;
-					u16 capab;
-					u16 timeout;
-				}  addba_resp;
-				struct {
-					u8 action_code;
-					u16 params;
-					u16 reason_code;
-				}  delba;
-				struct {
-					u8 action_code;
-					/* capab_info for open and confirm,
-					 * reason for close
-					 */
-					u16 aux;
-					/* Followed in plink_confirm by status
-					 * code, AID and supported rates,
-					 * and directly by supported rates in
-					 * plink_open and plink_close
-					 */
-					u8 variable[0];
-				}  plink_action;
-				struct {
-					u8 action_code;
-					u8 variable[0];
-				}  mesh_action;
-			} u;
-		}  action;
-	} u;
-} ;
-
-#pragma pack()
-
-#endif
-
 /* mgmt header + 1 byte category code */
 #define IEEE80211_MIN_ACTION_SIZE FIELD_OFFSET(struct ieee80211_mgmt, u.action.u)
-
-
-
 #endif
diff --git a/include/osdep_service.h b/include/osdep_service.h
index f7b4de3..bbc2dbf 100644
--- a/include/osdep_service.h
+++ b/include/osdep_service.h
@@ -457,15 +457,6 @@ __inline static _OS_STATUS res_to_status(sint res)
 	return res;
 #endif
 
-#ifdef PLATFORM_WINDOWS
-
-	if (res == _SUCCESS)
-		return NDIS_STATUS_SUCCESS;
-	else
-		return NDIS_STATUS_FAILURE;
-
-#endif
-
 }
 
 __inline static void rtw_dump_stack(void)
@@ -485,16 +476,6 @@ __inline static int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *p
 {
 	int ret = _TRUE;
 
-#ifdef PLATFORM_WINDOWS
-	if (((uint)parg1) <= 0x7fffffff ||
-	    ((uint)parg2) <= 0x7fffffff ||
-	    ((uint)parg3) <= 0x7fffffff ||
-	    ((uint)parg4) <= 0x7fffffff) {
-		ret = _FALSE;
-		KeBugCheckEx(0x87110000, (ULONG_PTR)parg1, (ULONG_PTR)parg2, (ULONG_PTR)parg3, (ULONG_PTR)parg4);
-	}
-#endif
-
 	return ret;
 
 }
diff --git a/include/rtw_debug.h b/include/rtw_debug.h
index baad0a5..e3562ca 100644
--- a/include/rtw_debug.h
+++ b/include/rtw_debug.h
@@ -56,11 +56,7 @@ extern void rtl871x_cedbg(const char *fmt, ...);
 #undef _dbgdump
 #undef _seqdump
 
-#if defined(PLATFORM_WINDOWS) && defined(PLATFORM_OS_XP)
-	#define _dbgdump DbgPrint
-	#define KERN_CONT
-	#define _seqdump(sel, fmt, arg...) _dbgdump(fmt, ##arg)
-#elif defined PLATFORM_LINUX
+#if defined PLATFORM_LINUX
 	#define _dbgdump printk
 	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24))
 	#define KERN_CONT
diff --git a/include/rtw_io.h b/include/rtw_io.h
index cafb12d..e3378d9 100644
--- a/include/rtw_io.h
+++ b/include/rtw_io.h
@@ -18,9 +18,6 @@
 
 #define NUM_IOREQ		8
 
-#ifdef PLATFORM_WINDOWS
-	#define MAX_PROT_SZ	64
-#endif
 #ifdef PLATFORM_LINUX
 	#define MAX_PROT_SZ	(64-16)
 #endif
@@ -141,27 +138,9 @@ struct io_req {
 	u8	*pbuf;
 	_sema	sema;
 
-#ifdef PLATFORM_OS_CE
-#ifdef CONFIG_USB_HCI
-	/* URB handler for rtw_write_mem */
-	USB_TRANSFER usb_transfer_write_mem;
-#endif
-#endif
 
 	void (*_async_io_callback)(_adapter *padater, struct io_req *pio_req, u8 *cnxt);
 	u8 *cnxt;
-
-#ifdef PLATFORM_OS_XP
-	PMDL pmdl;
-	PIRP  pirp;
-
-#ifdef CONFIG_SDIO_HCI
-	PSDBUS_REQUEST_PACKET sdrp;
-#endif
-
-#endif
-
-
 };
 
 struct	intf_hdl {
diff --git a/include/rtw_ioctl.h b/include/rtw_ioctl.h
index 4924751..9c698c5 100644
--- a/include/rtw_ioctl.h
+++ b/include/rtw_ioctl.h
@@ -15,68 +15,6 @@
 #ifndef _RTW_IOCTL_H_
 #define _RTW_IOCTL_H_
 
-#ifndef PLATFORM_WINDOWS
-/*	00 - Success
-*	11 - Error */
-#define STATUS_SUCCESS				(0x00000000L)
-#define STATUS_PENDING				(0x00000103L)
-
-#define STATUS_UNSUCCESSFUL			(0xC0000001L)
-#define STATUS_INSUFFICIENT_RESOURCES		(0xC000009AL)
-#define STATUS_NOT_SUPPORTED			(0xC00000BBL)
-
-#define NDIS_STATUS_SUCCESS			((NDIS_STATUS)STATUS_SUCCESS)
-#define NDIS_STATUS_PENDING			((NDIS_STATUS)STATUS_PENDING)
-#define NDIS_STATUS_NOT_RECOGNIZED		((NDIS_STATUS)0x00010001L)
-#define NDIS_STATUS_NOT_COPIED			((NDIS_STATUS)0x00010002L)
-#define NDIS_STATUS_NOT_ACCEPTED		((NDIS_STATUS)0x00010003L)
-#define NDIS_STATUS_CALL_ACTIVE			((NDIS_STATUS)0x00010007L)
-
-#define NDIS_STATUS_FAILURE			((NDIS_STATUS)STATUS_UNSUCCESSFUL)
-#define NDIS_STATUS_RESOURCES			((NDIS_STATUS)STATUS_INSUFFICIENT_RESOURCES)
-#define NDIS_STATUS_CLOSING			((NDIS_STATUS)0xC0010002L)
-#define NDIS_STATUS_BAD_VERSION			((NDIS_STATUS)0xC0010004L)
-#define NDIS_STATUS_BAD_CHARACTERISTICS		((NDIS_STATUS)0xC0010005L)
-#define NDIS_STATUS_ADAPTER_NOT_FOUND		((NDIS_STATUS)0xC0010006L)
-#define NDIS_STATUS_OPEN_FAILED			((NDIS_STATUS)0xC0010007L)
-#define NDIS_STATUS_DEVICE_FAILED		((NDIS_STATUS)0xC0010008L)
-#define NDIS_STATUS_MULTICAST_FULL		((NDIS_STATUS)0xC0010009L)
-#define NDIS_STATUS_MULTICAST_EXISTS		((NDIS_STATUS)0xC001000AL)
-#define NDIS_STATUS_MULTICAST_NOT_FOUND		((NDIS_STATUS)0xC001000BL)
-#define NDIS_STATUS_REQUEST_ABORTED		((NDIS_STATUS)0xC001000CL)
-#define NDIS_STATUS_RESET_IN_PROGRESS		((NDIS_STATUS)0xC001000DL)
-#define NDIS_STATUS_CLOSING_INDICATING		((NDIS_STATUS)0xC001000EL)
-#define NDIS_STATUS_NOT_SUPPORTED		((NDIS_STATUS)STATUS_NOT_SUPPORTED)
-#define NDIS_STATUS_INVALID_PACKET		((NDIS_STATUS)0xC001000FL)
-#define NDIS_STATUS_OPEN_LIST_FULL		((NDIS_STATUS)0xC0010010L)
-#define NDIS_STATUS_ADAPTER_NOT_READY		((NDIS_STATUS)0xC0010011L)
-#define NDIS_STATUS_ADAPTER_NOT_OPEN		((NDIS_STATUS)0xC0010012L)
-#define NDIS_STATUS_NOT_INDICATING		((NDIS_STATUS)0xC0010013L)
-#define NDIS_STATUS_INVALID_LENGTH		((NDIS_STATUS)0xC0010014L)
-#define NDIS_STATUS_INVALID_DATA		((NDIS_STATUS)0xC0010015L)
-#define NDIS_STATUS_BUFFER_TOO_SHORT		((NDIS_STATUS)0xC0010016L)
-#define NDIS_STATUS_INVALID_OID			((NDIS_STATUS)0xC0010017L)
-#define NDIS_STATUS_ADAPTER_REMOVED		((NDIS_STATUS)0xC0010018L)
-#define NDIS_STATUS_UNSUPPORTED_MEDIA		((NDIS_STATUS)0xC0010019L)
-#define NDIS_STATUS_GROUP_ADDRESS_IN_USE	((NDIS_STATUS)0xC001001AL)
-#define NDIS_STATUS_FILE_NOT_FOUND		((NDIS_STATUS)0xC001001BL)
-#define NDIS_STATUS_ERROR_READING_FILE		((NDIS_STATUS)0xC001001CL)
-#define NDIS_STATUS_ALREADY_MAPPED		((NDIS_STATUS)0xC001001DL)
-#define NDIS_STATUS_RESOURCE_CONFLICT		((NDIS_STATUS)0xC001001EL)
-#define NDIS_STATUS_NO_CABLE			((NDIS_STATUS)0xC001001FL)
-
-#define NDIS_STATUS_INVALID_SAP			((NDIS_STATUS)0xC0010020L)
-#define NDIS_STATUS_SAP_IN_USE			((NDIS_STATUS)0xC0010021L)
-#define NDIS_STATUS_INVALID_ADDRESS		((NDIS_STATUS)0xC0010022L)
-#define NDIS_STATUS_VC_NOT_ACTIVATED		((NDIS_STATUS)0xC0010023L)
-#define NDIS_STATUS_DEST_OUT_OF_ORDER		((NDIS_STATUS)0xC0010024L)  /* cause 27 */
-#define NDIS_STATUS_VC_NOT_AVAILABLE		((NDIS_STATUS)0xC0010025L)  /* cause 35, 45 */
-#define NDIS_STATUS_CELLRATE_NOT_AVAILABLE	((NDIS_STATUS)0xC0010026L)  /* cause 37 */
-#define NDIS_STATUS_INCOMPATABLE_QOS		((NDIS_STATUS)0xC0010027L)  /* cause 49 */
-#define NDIS_STATUS_AAL_PARAMS_UNSUPPORTED	((NDIS_STATUS)0xC0010028L)  /* cause 93 */
-#define NDIS_STATUS_NO_ROUTE_TO_DESTINATION	((NDIS_STATUS)0xC0010029L)  /* cause 3 */
-#endif /* #ifndef PLATFORM_WINDOWS */
-
 
 #ifndef OID_802_11_CAPABILITY
 	#define OID_802_11_CAPABILITY                   0x0d010122
@@ -148,143 +86,13 @@ struct oid_obj_priv {
 };
 
 #if (defined(CONFIG_MP_INCLUDED) && defined(_RTW_MP_IOCTL_C_)) || \
-	(defined(PLATFORM_WINDOWS) && defined(_RTW_IOCTL_RTL_C_))
+	(defined(_RTW_IOCTL_RTL_C_))
 static NDIS_STATUS oid_null_function(struct oid_par_priv *poid_par_priv)
 {
 	return NDIS_STATUS_SUCCESS;
 }
 #endif
 
-#ifdef PLATFORM_WINDOWS
-
-int TranslateNdisPsToRtPs(IN NDIS_802_11_POWER_MODE	ndisPsMode);
-
-/* OID Handler for Segment 1 */
-NDIS_STATUS oid_gen_supported_list_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_hardware_status_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_media_supported_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_media_in_use_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_maximum_lookahead_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_maximum_frame_size_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_link_speed_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_transmit_buffer_space_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_receive_buffer_space_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_transmit_block_size_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_receive_block_size_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_vendor_id_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_vendor_description_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_current_packet_filter_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_current_lookahead_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_driver_version_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_maximum_total_size_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_protocol_options_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_mac_options_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_media_connect_status_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_maximum_send_packets_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_vendor_driver_version_hdl(struct oid_par_priv *poid_par_priv);
-
-
-/* OID Handler for Segment 2 */
-NDIS_STATUS oid_gen_physical_medium_hdl(struct oid_par_priv *poid_par_priv);
-
-/* OID Handler for Segment 3 */
-NDIS_STATUS oid_gen_xmit_ok_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_rcv_ok_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_xmit_error_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_rcv_error_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_gen_rcv_no_buffer_hdl(struct oid_par_priv *poid_par_priv);
-
-
-/* OID Handler for Segment 4 */
-NDIS_STATUS oid_802_3_permanent_address_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_3_current_address_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_3_multicast_list_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_3_maximum_list_size_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_3_mac_options_hdl(struct oid_par_priv *poid_par_priv);
-
-
-
-/* OID Handler for Segment 5 */
-NDIS_STATUS oid_802_3_rcv_error_alignment_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_3_xmit_one_collision_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_3_xmit_more_collisions_hdl(struct oid_par_priv *poid_par_priv);
-
-
-/* OID Handler for Segment 6 */
-NDIS_STATUS oid_802_3_xmit_deferred_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_3_xmit_max_collisions_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_3_rcv_overrun_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_3_xmit_underrun_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_3_xmit_heartbeat_failure_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_3_xmit_times_crs_lost_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_3_xmit_late_collisions_hdl(struct oid_par_priv *poid_par_priv);
-
-
-
-/* OID Handler for Segment 7 */
-NDIS_STATUS oid_pnp_capabilities_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_pnp_set_power_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_pnp_query_power_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_pnp_add_wake_up_pattern_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_pnp_remove_wake_up_pattern_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_pnp_wake_up_pattern_list_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_pnp_enable_wake_up_hdl(struct oid_par_priv *poid_par_priv);
-
-
-
-/* OID Handler for Segment 8 */
-NDIS_STATUS oid_802_11_bssid_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_ssid_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_infrastructure_mode_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_add_wep_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_remove_wep_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_disassociate_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_authentication_mode_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_privacy_filter_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_bssid_list_scan_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_encryption_status_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_reload_defaults_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_add_key_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_remove_key_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_association_information_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_test_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_media_stream_mode_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_capability_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_pmkid_hdl(struct oid_par_priv *poid_par_priv);
-
-
-
-
-
-/* OID Handler for Segment 9 */
-NDIS_STATUS oid_802_11_network_types_supported_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_network_type_in_use_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_tx_power_level_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_rssi_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_rssi_trigger_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_fragmentation_threshold_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_rts_threshold_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_number_of_antennas_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_rx_antenna_selected_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_tx_antenna_selected_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_supported_rates_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_desired_rates_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_configuration_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_power_mode_hdl(struct oid_par_priv *poid_par_priv);
-NDIS_STATUS oid_802_11_bssid_list_hdl(struct oid_par_priv *poid_par_priv);
-
-
-/* OID Handler for Segment 10 */
-NDIS_STATUS oid_802_11_statistics_hdl(struct oid_par_priv *poid_par_priv);
-
-
-/* OID Handler for Segment ED */
-NDIS_STATUS oid_rt_mh_vender_id_hdl(struct oid_par_priv *poid_par_priv);
-
-void Set_802_3_MULTICAST_LIST(ADAPTER *pAdapter, UCHAR *MCListbuf, ULONG MCListlen, BOOLEAN bAcceptAllMulticast);
-
-#endif/* end of PLATFORM_WINDOWS */
-
 #if defined(PLATFORM_LINUX) && defined(CONFIG_WIRELESS_EXT)
 extern struct iw_handler_def  rtw_handlers_def;
 #endif
diff --git a/include/rtw_ioctl_query.h b/include/rtw_ioctl_query.h
deleted file mode 100644
index cc7b557..0000000
--- a/include/rtw_ioctl_query.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2017 Realtek Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- *****************************************************************************/
-#ifndef _RTW_IOCTL_QUERY_H_
-#define _RTW_IOCTL_QUERY_H_
-
-
-#ifdef PLATFORM_WINDOWS
-u8 query_802_11_capability(_adapter	*padapter, u8 *pucBuf, u32 *pulOutLen);
-u8 query_802_11_association_information(_adapter *padapter, PNDIS_802_11_ASSOCIATION_INFORMATION pAssocInfo);
-#endif
-
-
-#endif
diff --git a/include/rtw_ioctl_set.h b/include/rtw_ioctl_set.h
index 2af4a54..98d0b0d 100644
--- a/include/rtw_ioctl_set.h
+++ b/include/rtw_ioctl_set.h
@@ -24,28 +24,6 @@ typedef struct _BSSIDInfo {
 } BSSIDInfo, *PBSSIDInfo;
 
 
-#ifdef PLATFORM_OS_XP
-typedef struct _NDIS_802_11_PMKID {
-	u32	Length;
-	u32	BSSIDInfoCount;
-	BSSIDInfo BSSIDInfo[1];
-} NDIS_802_11_PMKID, *PNDIS_802_11_PMKID;
-#endif
-
-
-#ifdef PLATFORM_WINDOWS
-u8 rtw_set_802_11_reload_defaults(_adapter *padapter, NDIS_802_11_RELOAD_DEFAULTS reloadDefaults);
-u8 rtw_set_802_11_test(_adapter *padapter, NDIS_802_11_TEST *test);
-u8 rtw_set_802_11_pmkid(_adapter *pdapter, NDIS_802_11_PMKID *pmkid);
-
-u8 rtw_pnp_set_power_sleep(_adapter *padapter);
-u8 rtw_pnp_set_power_wakeup(_adapter *padapter);
-
-void rtw_pnp_resume_wk(void *context);
-void rtw_pnp_sleep_wk(void *context);
-
-#endif
-
 u8 rtw_set_802_11_authentication_mode(_adapter *pdapter, NDIS_802_11_AUTHENTICATION_MODE authmode);
 u8 rtw_set_802_11_bssid(_adapter *padapter, u8 *bssid);
 u8 rtw_set_802_11_add_wep(_adapter *padapter, NDIS_802_11_WEP *wep);
diff --git a/include/rtw_mp_ioctl.h b/include/rtw_mp_ioctl.h
index a9dabfc..2127ec1 100644
--- a/include/rtw_mp_ioctl.h
+++ b/include/rtw_mp_ioctl.h
@@ -73,24 +73,7 @@ typedef struct _DR_VARIABLE_STRUCT_ {
 /* int mp_start_joinbss(_adapter *padapter, NDIS_802_11_SSID *pssid); */
 
 /* void _irqlevel_changed_(_irqL *irqlevel, BOOLEANunsigned char bLower); */
-#ifdef PLATFORM_OS_XP
-static void _irqlevel_changed_(_irqL *irqlevel, u8 bLower)
-{
-
-	if (bLower == LOWER) {
-		*irqlevel = KeGetCurrentIrql();
-
-		if (*irqlevel > PASSIVE_LEVEL)
-			KeLowerIrql(PASSIVE_LEVEL);
-	} else {
-		if (KeGetCurrentIrql() == PASSIVE_LEVEL)
-			KeRaiseIrql(DISPATCH_LEVEL, irqlevel);
-	}
-
-}
-#else
 #define _irqlevel_changed_(a, b)
-#endif
 
 /* oid_rtl_seg_81_80_00 */
 NDIS_STATUS oid_rt_pro_set_data_rate_hdl(struct oid_par_priv *poid_par_priv);
diff --git a/include/rtw_security.h b/include/rtw_security.h
index f09f8a3..16fb628 100644
--- a/include/rtw_security.h
+++ b/include/rtw_security.h
@@ -194,9 +194,6 @@ struct security_priv {
 	u32 ndisencryptstatus;	/* NDIS_802_11_ENCRYPTION_STATUS */
 
 	NDIS_802_11_WEP ndiswep;
-#ifdef PLATFORM_WINDOWS
-	u8 KeyMaterial[16];/* variable length depending on above field. */
-#endif
 
 	u8 assoc_info[600];
 	u8 szofcapability[256]; /* for wpa2 usage */
diff --git a/include/sdio_ops.h b/include/sdio_ops.h
index 613613d..f1531bd 100644
--- a/include/sdio_ops.h
+++ b/include/sdio_ops.h
@@ -25,24 +25,6 @@
 #include <sdio_ops_linux.h>
 #endif
 
-#ifdef PLATFORM_WINDOWS
-
-#ifdef PLATFORM_OS_XP
-#include <sdio_ops_xp.h>
-struct async_context {
-	PMDL pmdl;
-	PSDBUS_REQUEST_PACKET sdrp;
-	unsigned char *r_buf;
-	unsigned char *padapter;
-};
-#endif
-
-#ifdef PLATFORM_OS_CE
-#include <sdio_ops_ce.h>
-#endif
-
-#endif /* PLATFORM_WINDOWS */
-
 
 extern void sdio_set_intf_ops(_adapter *padapter, struct _io_ops *pops);
 void dump_sdio_card_info(void *sel, struct dvobj_priv *dvobj);
diff --git a/include/sdio_ops_ce.h b/include/sdio_ops_ce.h
deleted file mode 100644
index d542cb7..0000000
--- a/include/sdio_ops_ce.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2017 Realtek Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- *****************************************************************************/
-#ifndef _SDIO_OPS_WINCE_H_
-#define _SDIO_OPS_WINCE_H_
-
-#include <drv_conf.h>
-#include <osdep_service.h>
-#include <drv_types.h>
-#include <osdep_intf.h>
-
-
-#ifdef PLATFORM_OS_CE
-
-
-extern u8 sdbus_cmd52r_ce(struct intf_priv *pintfpriv, u32 addr);
-
-
-extern void sdbus_cmd52w_ce(struct intf_priv *pintfpriv, u32 addr, u8 val8);
-
-
-uint sdbus_read_blocks_to_membuf_ce(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf);
-
-extern uint sdbus_read_bytes_to_membuf_ce(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf);
-
-
-extern uint sdbus_write_blocks_from_membuf_ce(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf, u8 async);
-
-extern uint sdbus_write_bytes_from_membuf_ce(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf);
-extern u8 sdbus_func1cmd52r_ce(struct intf_priv *pintfpriv, u32 addr);
-extern void sdbus_func1cmd52w_ce(struct intf_priv *pintfpriv, u32 addr, u8 val8);
-extern uint sdbus_read_reg(struct intf_priv *pintfpriv, u32 addr, u32 cnt, void *pdata);
-extern uint sdbus_write_reg(struct intf_priv *pintfpriv, u32 addr, u32 cnt, void *pdata);
-extern void sdio_read_int(_adapter *padapter, u32 addr, u8 sz, void *pdata);
-
-#endif
-
-#endif
diff --git a/include/sdio_ops_xp.h b/include/sdio_ops_xp.h
deleted file mode 100644
index d3d8764..0000000
--- a/include/sdio_ops_xp.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2017 Realtek Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- *****************************************************************************/
-#ifndef _SDIO_OPS_XP_H_
-#define _SDIO_OPS_XP_H_
-
-#include <drv_conf.h>
-#include <osdep_service.h>
-#include <drv_types.h>
-#include <osdep_intf.h>
-
-
-#ifdef PLATFORM_OS_XP
-
-
-extern u8 sdbus_cmd52r_xp(struct intf_priv *pintfpriv, u32 addr);
-
-
-extern void sdbus_cmd52w_xp(struct intf_priv *pintfpriv, u32 addr, u8 val8);
-
-
-uint sdbus_read_blocks_to_membuf_xp(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf);
-
-extern uint sdbus_read_bytes_to_membuf_xp(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf);
-
-
-extern uint sdbus_write_blocks_from_membuf_xp(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf, u8 async);
-
-extern uint sdbus_write_bytes_from_membuf_xp(struct intf_priv *pintfpriv, u32 addr, u32 cnt, u8 *pbuf);
-extern u8 sdbus_func1cmd52r_xp(struct intf_priv *pintfpriv, u32 addr);
-extern void sdbus_func1cmd52w_xp(struct intf_priv *pintfpriv, u32 addr, u8 val8);
-extern uint sdbus_read_reg(struct intf_priv *pintfpriv, u32 addr, u32 cnt, void *pdata);
-extern uint sdbus_write_reg(struct intf_priv *pintfpriv, u32 addr, u32 cnt, void *pdata);
-extern void sdio_read_int(_adapter *padapter, u32 addr, u8 sz, void *pdata);
-
-#endif
-
-#endif
diff --git a/include/wifi.h b/include/wifi.h
index 622e005..905544a 100644
--- a/include/wifi.h
+++ b/include/wifi.h
@@ -880,76 +880,6 @@ struct ADDBA_request {
 	unsigned short	BA_timeout_value;
 	unsigned short	BA_starting_seqctrl;
 }  __attribute__((packed));
-
-
-
-#endif
-
-
-#ifdef PLATFORM_WINDOWS
-
-#pragma pack(1)
-
-struct rtw_ieee80211_ht_cap {
-	unsigned short	cap_info;
-	unsigned char	ampdu_params_info;
-	unsigned char	supp_mcs_set[16];
-	unsigned short	extended_ht_cap_info;
-	unsigned int		tx_BF_cap_info;
-	unsigned char	       antenna_selection_info;
-};
-
-
-struct ieee80211_ht_addt_info {
-	unsigned char	control_chan;
-	unsigned char		ht_param;
-	unsigned short	operation_mode;
-	unsigned short	stbc_param;
-	unsigned char		basic_set[16];
-};
-
-struct HT_caps_element {
-	union {
-		struct {
-			unsigned short	HT_caps_info;
-			unsigned char	AMPDU_para;
-			unsigned char	MCS_rate[16];
-			unsigned short	HT_ext_caps;
-			unsigned int	Beamforming_caps;
-			unsigned char	ASEL_caps;
-		} HT_cap_element;
-		unsigned char HT_cap[26];
-	};
-};
-
-struct HT_info_element {
-	unsigned char	primary_channel;
-	unsigned char	infos[5];
-	unsigned char	MCS_rate[16];
-};
-
-struct AC_param {
-	unsigned char		ACI_AIFSN;
-	unsigned char		CW;
-	unsigned short	TXOP_limit;
-};
-
-struct WMM_para_element {
-	unsigned char		QoS_info;
-	unsigned char		reserved;
-	struct AC_param	ac_param[4];
-};
-
-struct ADDBA_request {
-	unsigned char		dialog_token;
-	unsigned short	BA_para_set;
-	unsigned short	BA_timeout_value;
-	unsigned short	BA_starting_seqctrl;
-};
-
-
-#pragma pack()
-
 #endif
 
 typedef enum _HT_CAP_AMPDU_FACTOR {
diff --git a/include/wlan_bssdef.h b/include/wlan_bssdef.h
index 167ae7f..e078eb8 100644
--- a/include/wlan_bssdef.h
+++ b/include/wlan_bssdef.h
@@ -553,10 +553,6 @@ enum bss_type {
 /* temporally add #pragma pack for structure alignment issue of
 *   WLAN_BSSID_EX and get_WLAN_BSSID_EX_sz()
 */
-#ifdef PLATFORM_WINDOWS
-#pragma pack(push)
-#pragma pack(1)
-#endif
 typedef struct _WLAN_BSSID_EX {
 	ULONG  Length;
 	NDIS_802_11_MAC_ADDRESS  MacAddress;
@@ -573,13 +569,7 @@ typedef struct _WLAN_BSSID_EX {
 	ULONG  IELength;
 	UCHAR  IEs[MAX_IE_SZ];	/* (timestamp, beacon interval, and capability information) */
 }
-#ifndef PLATFORM_WINDOWS
-__attribute__((packed))
-#endif
 WLAN_BSSID_EX, *PWLAN_BSSID_EX;
-#ifdef PLATFORM_WINDOWS
-#pragma pack(pop)
-#endif
 
 #define BSS_EX_IES(bss_ex) ((bss_ex)->IEs)
 #define BSS_EX_IES_LEN(bss_ex) ((bss_ex)->IELength)
@@ -627,10 +617,6 @@ struct	wlan_network {
 	int	aid;			/* will only be valid when a BSS is joinned. */
 	int	join_res;
 	WLAN_BSSID_EX	network; /* must be the last item */
-#ifdef PLATFORM_WINDOWS
-	unsigned char  iebuf[MAX_IE_SZ];
-#endif
-
 };
 
 enum VRTL_CARRIER_SENSE {
@@ -645,16 +631,12 @@ enum VCS_TYPE {
 	CTS_TO_SELF
 };
 
-
-
-
 #define PWR_CAM 0
 #define PWR_MINPS 1
 #define PWR_MAXPS 2
 #define PWR_UAPSD 3
 #define PWR_VOIP 4
 
-
 enum UAPSD_MAX_SP {
 	NO_LIMIT,
 	TWO_MSDU,
@@ -662,7 +644,6 @@ enum UAPSD_MAX_SP {
 	SIX_MSDU
 };
 
-
 /* john */
 #define NUM_PRE_AUTH_KEY 16
 #define NUM_PMKID_CACHE NUM_PRE_AUTH_KEY
@@ -671,34 +652,4 @@ enum UAPSD_MAX_SP {
 *	WPA2
 */
 
-#ifndef PLATFORM_OS_CE
-typedef struct _PMKID_CANDIDATE {
-	NDIS_802_11_MAC_ADDRESS BSSID;
-	ULONG Flags;
-} PMKID_CANDIDATE, *PPMKID_CANDIDATE;
-
-typedef struct _NDIS_802_11_PMKID_CANDIDATE_LIST {
-	ULONG Version;       /* Version of the structure */
-	ULONG NumCandidates; /* No. of pmkid candidates */
-	PMKID_CANDIDATE CandidateList[1];
-} NDIS_802_11_PMKID_CANDIDATE_LIST, *PNDIS_802_11_PMKID_CANDIDATE_LIST;
-
-
-typedef struct _NDIS_802_11_AUTHENTICATION_ENCRYPTION {
-	NDIS_802_11_AUTHENTICATION_MODE AuthModeSupported;
-	NDIS_802_11_ENCRYPTION_STATUS EncryptStatusSupported;
-
-} NDIS_802_11_AUTHENTICATION_ENCRYPTION, *PNDIS_802_11_AUTHENTICATION_ENCRYPTION;
-
-typedef struct _NDIS_802_11_CAPABILITY {
-	ULONG  Length;
-	ULONG  Version;
-	ULONG  NoOfPMKIDs;
-	ULONG  NoOfAuthEncryptPairsSupported;
-	NDIS_802_11_AUTHENTICATION_ENCRYPTION AuthenticationEncryptionSupported[1];
-
-} NDIS_802_11_CAPABILITY, *PNDIS_802_11_CAPABILITY;
-#endif
-
-
 #endif /* #ifndef WLAN_BSSDEF_H_ */
diff --git a/include/xmit_osdep.h b/include/xmit_osdep.h
index f51b8de..ae82761 100644
--- a/include/xmit_osdep.h
+++ b/include/xmit_osdep.h
@@ -25,32 +25,6 @@ struct pkt_file {
 	SIZE_T buf_len;
 };
 
-#ifdef PLATFORM_WINDOWS
-
-#ifdef PLATFORM_OS_XP
-#ifdef CONFIG_USB_HCI
-#include <usb.h>
-#include <usbdlib.h>
-#include <usbioctl.h>
-#endif
-#endif
-
-#ifdef CONFIG_GSPI_HCI
-	#define NR_XMITFRAME     64
-#else
-	#define NR_XMITFRAME     128
-#endif
-
-#define ETH_ALEN	6
-
-extern NDIS_STATUS rtw_xmit_entry(
-	IN _nic_hdl		cnxt,
-	IN NDIS_PACKET		*pkt,
-	IN UINT				flags
-);
-
-#endif /* PLATFORM_WINDOWS */
-
 #ifdef PLATFORM_FREEBSD
 #define NR_XMITFRAME	256
 extern int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev);