diff --git a/dp/inc/cdp_txrx_ops.h b/dp/inc/cdp_txrx_ops.h
index 795f12415e79..5748dc8147c0 100644
--- a/dp/inc/cdp_txrx_ops.h
+++ b/dp/inc/cdp_txrx_ops.h
@@ -27,6 +27,9 @@
 
 
 #include <cdp_txrx_cmn_struct.h>
+#ifdef CONFIG_WIN
+#include <cdp_txrx_stats_struct.h>
+#endif
 
 /******************************************************************************
  *
diff --git a/dp/inc/cdp_txrx_stats_struct.h b/dp/inc/cdp_txrx_stats_struct.h
index 6aaf0c240381..11e449c45063 100644
--- a/dp/inc/cdp_txrx_stats_struct.h
+++ b/dp/inc/cdp_txrx_stats_struct.h
@@ -31,7 +31,9 @@
  */
 #ifndef _CDP_TXRX_STATS_STRUCT_H_
 #define _CDP_TXRX_STATS_STRUCT_H_
+#ifndef CONFIG_WIN
 #include <wlan_defs.h>
+#endif
 
 #define TXRX_STATS_LEVEL_OFF   0
 #define TXRX_STATS_LEVEL_BASIC 1
@@ -213,6 +215,7 @@ struct ol_ath_radiostats {
 	A_INT16     chan_nf_sec80;
 };
 
+#ifndef CONFIG_WIN
 /*
 ** structure to hold all stats information
 ** for offload device interface
@@ -225,6 +228,7 @@ struct ol_stats {
 	struct wlan_dbg_tidq_stats tidq_stats;
 };
 
+#endif
 /*
 ** Enumeration of PDEV Configuration parameter
 */
diff --git a/dp/wifi3.0/dp_internal.h b/dp/wifi3.0/dp_internal.h
index 2b87ed432d50..79d44cdf1bad 100644
--- a/dp/wifi3.0/dp_internal.h
+++ b/dp/wifi3.0/dp_internal.h
@@ -63,6 +63,7 @@ extern void dp_rx_discard(struct dp_vdev *vdev, struct dp_peer *peer,
 	unsigned tid, qdf_nbuf_t msdu_list);
 extern void *dp_find_peer_by_addr(void *dev,
 	uint8_t *peer_mac_addr, uint8_t *peer_id);
+#ifndef CONFIG_WIN
 QDF_STATUS dp_register_peer(void *pdev_handle,
 		struct ol_txrx_desc_type *sta_desc);
 QDF_STATUS dp_clear_peer(void *pdev_handle, uint8_t local_id);
@@ -79,4 +80,5 @@ int dp_get_peer_state(void *peer_handle);
 void dp_local_peer_id_pool_init(struct dp_pdev *pdev);
 void dp_local_peer_id_alloc(struct dp_pdev *pdev, struct dp_peer *peer);
 void dp_local_peer_id_free(struct dp_pdev *pdev, struct dp_peer *peer);
+#endif
 #endif /* #ifndef _DP_INTERNAL_H_ */
diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c
index 16c416c481e4..a2b1a9fb2ab9 100644
--- a/dp/wifi3.0/dp_main.c
+++ b/dp/wifi3.0/dp_main.c
@@ -963,8 +963,10 @@ void *dp_pdev_attach_wifi3(struct cdp_soc_t *txrx_soc, void *ctrl_pdev,
 			goto fail0;
 	}
 
+#ifndef CONFIG_WIN
 	/* MCL */
 	dp_local_peer_id_pool_init(pdev);
+#endif
 
 	return (void *)pdev;
 
@@ -1371,7 +1373,9 @@ void *dp_peer_attach_wifi3(void *vdev_handle, uint8_t *peer_mac_addr)
 		vdev->vap_bss_peer = peer;
 	}
 
+#ifndef CONFIG_WIN
 	dp_local_peer_id_alloc(pdev, peer);
+#endif
 	return (void *)peer;
 }
 
@@ -1540,7 +1544,9 @@ void dp_peer_detach_wifi3(void *peer_handle)
 	 * reference, added by the PEER_MAP message.
 	 */
 	dp_peer_unref_delete(peer_handle);
+#ifndef CONFIG_WIN
 	dp_local_peer_id_free(peer->vdev->pdev, peer);
+#endif
 	qdf_spinlock_destroy(&peer->peer_info_lock);
 }
 
@@ -1639,6 +1645,7 @@ static struct cdp_pflow_ops dp_ops_pflow = {
 };
 #endif /* CONFIG_WIN */
 
+#ifndef CONFIG_WIN
 static struct cdp_misc_ops dp_ops_misc = {
 	.get_opmode = dp_get_opmode,
 };
@@ -1693,6 +1700,7 @@ static struct cdp_peer_ops dp_ops_peer = {
 	.get_vdev_for_peer = dp_get_vdev_for_peer,
 	.get_peer_state = dp_get_peer_state,
 };
+#endif
 
 static struct cdp_ops dp_txrx_ops = {
 	.cmn_drv_ops = &dp_ops_cmn,
@@ -1705,6 +1713,7 @@ static struct cdp_ops dp_txrx_ops = {
 #ifdef CONFIG_WIN
 	.pflow_ops = &dp_ops_pflow,
 #endif /* CONFIG_WIN */
+#ifndef CONFIG_WIN
 	.misc_ops = &dp_ops_misc,
 	.cfg_ops = &dp_ops_cfg,
 	.flowctl_ops = &dp_ops_flowctl,
@@ -1716,6 +1725,7 @@ static struct cdp_ops dp_txrx_ops = {
 	.peer_ops = &dp_ops_peer,
 	.throttle_ops = &dp_ops_throttle,
 	.mob_stats_ops = &dp_ops_mob_stats,
+#endif
 };
 
 /*
diff --git a/dp/wifi3.0/dp_peer.c b/dp/wifi3.0/dp_peer.c
index 1b7ecd1d974f..044d2bcdb1b9 100644
--- a/dp/wifi3.0/dp_peer.c
+++ b/dp/wifi3.0/dp_peer.c
@@ -428,8 +428,12 @@ void *dp_find_peer_by_addr(void *dev, uint8_t *peer_mac_addr,
 	struct dp_pdev *pdev = dev;
 	struct dp_peer *peer;
 
+#if ATH_SUPPORT_WRAP
+	peer = dp_peer_find_hash_find(pdev->soc, peer_mac_addr, 0, 0);
 	/* WAR, VDEV ID? TEMP 0 */
+#else
 	peer = dp_peer_find_hash_find(pdev->soc, peer_mac_addr, 0);
+#endif
 	if (!peer)
 		return NULL;
 
@@ -864,6 +868,7 @@ dp_rx_sec_ind_handler(void *soc_handle, uint16_t peer_id,
 	 */
 }
 
+#ifndef CONFIG_WIN
 /**
  * dp_register_peer() - Register peer into physical device
  * @pdev - data path device instance
@@ -1165,4 +1170,4 @@ void dp_local_peer_id_free(struct dp_pdev *pdev, struct dp_peer *peer)
 	pdev->local_peer_ids.map[i] = NULL;
 	qdf_spin_unlock_bh(&pdev->local_peer_ids.lock);
 }
-
+#endif
diff --git a/dp/wifi3.0/dp_types.h b/dp/wifi3.0/dp_types.h
index f695dace3219..ab1763e3d461 100644
--- a/dp/wifi3.0/dp_types.h
+++ b/dp/wifi3.0/dp_types.h
@@ -27,7 +27,9 @@
 #include <queue.h>
 
 #include <cdp_txrx_cmn.h>
+#ifndef CONFIG_WIN
 #include <wdi_event_api.h>    /* WDI subscriber event list */
+#endif
 
 #include <hal_tx.h>
 #define MAX_PDEV_CNT 3
@@ -357,8 +359,10 @@ struct dp_soc {
 	/* Rx ring map for interrupt processing */
 	struct dp_srng *rx_ring_map[DP_MAX_RX_RINGS];
 
+#ifndef CONFIG_WIN
 	/* WDI event handlers */
 	struct wdi_event_subscribe_t **wdi_event_list;
+#endif
 
 	/* peer ID to peer object map (array of pointers to peer objects) */
 	struct dp_peer **peer_id_to_obj_map;