diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c
index f2d631c650e3..43e237895434 100644
--- a/core/mac/src/pe/lim/lim_process_action_frame.c
+++ b/core/mac/src/pe/lim/lim_process_action_frame.c
@@ -58,6 +58,7 @@
 #include "wma_types.h"
 #include "wma.h"
 #include <cdp_txrx_cmn.h>
+#include <cdp_txrx_peer_ops.h>
 
 #define BA_DEFAULT_TX_BUFFER_SIZE 64
 
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c
index 6f47847b9b62..6db79d35ba58 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -62,6 +62,7 @@
 
 #include "wma_types.h"
 #include <cdp_txrx_cmn.h>
+#include <cdp_txrx_peer_ops.h>
 
 /**
  *
diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index c03e7df1c6df..abc058583735 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -54,6 +54,11 @@
 #include <wlan_objmgr_pdev_obj.h>
 #include <wlan_objmgr_vdev_obj.h>
 #include <wlan_utility.h>
+#include <linux/netdevice.h>
+#include <net/cfg80211.h>
+#include <qca_vendor.h>
+#include <wlan_scan_ucfg_api.h>
+
 /*----------------------------------------------------------------------------
  * Preprocessor Definitions and Constants
  * -------------------------------------------------------------------------*/
diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c
index d6301baac10c..9f7440b36797 100644
--- a/core/sap/src/sap_module.c
+++ b/core/sap/src/sap_module.c
@@ -55,6 +55,7 @@
 #include "cds_ieee80211_common_i.h"
 #include "cds_regdomain.h"
 #include "wlan_policy_mgr_api.h"
+#include <wlan_scan_ucfg_api.h>
 
 /*----------------------------------------------------------------------------
  * Preprocessor Definitions and Constants
diff --git a/core/sme/src/csr/csr_inside_api.h b/core/sme/src/csr/csr_inside_api.h
index c673d7d54bdd..c5c8e20bccd0 100644
--- a/core/sme/src/csr/csr_inside_api.h
+++ b/core/sme/src/csr/csr_inside_api.h
@@ -39,6 +39,8 @@
 #include "sme_inside.h"
 #include "cds_reg_service.h"
 
+extern void wlan_objmgr_vdev_release_ref(struct wlan_objmgr_vdev *vdev,
+						wlan_objmgr_ref_dbgid id);
 #define CSR_PASSIVE_MAX_CHANNEL_TIME   110
 #define CSR_PASSIVE_MIN_CHANNEL_TIME   60
 
diff --git a/core/wma/inc/wma_api.h b/core/wma/inc/wma_api.h
index a9d8eb6a9717..f2ef56017f5e 100644
--- a/core/wma/inc/wma_api.h
+++ b/core/wma/inc/wma_api.h
@@ -40,6 +40,7 @@
 #include "cds_utils.h"
 #include "scheduler_api.h"
 #include "wlan_policy_mgr_api.h"
+#include <cdp_txrx_ops.h>
 
 typedef void *WMA_HANDLE;
 
diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c
index 608ff94a2f85..6dfad01be8cc 100644
--- a/core/wma/src/wma_data.c
+++ b/core/wma/src/wma_data.c
@@ -82,6 +82,7 @@
 #include "wlan_objmgr_vdev_obj.h"
 #include "wlan_objmgr_peer_obj.h"
 #include <cdp_txrx_handle.h>
+#include <wlan_pmo_ucfg_api.h>
 
 typedef struct {
 	int32_t rate;
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index 976c739448b9..f062d7ce36c3 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -89,6 +89,8 @@
 #include "wlan_pmo_obj_mgmt_api.h"
 
 #include <cdp_txrx_handle.h>
+#include <wlan_pmo_ucfg_api.h>
+
 #define WMA_LOG_COMPLETION_TIMER 10000 /* 10 seconds */
 
 #define WMI_TLV_HEADROOM 128