diff --git a/disa/core/inc/wlan_disa_objmgr.h b/disa/core/inc/wlan_disa_objmgr.h
index 6fcb0b7854..6bb497741a 100644
--- a/disa/core/inc/wlan_disa_objmgr.h
+++ b/disa/core/inc/wlan_disa_objmgr.h
@@ -23,10 +23,7 @@
 #ifndef _WLAN_DISA_OBJMGR_H
 #define _WLAN_DISA_OBJMGR_H
 
-#include "wlan_cmn.h"
-#include "wlan_objmgr_cmn.h"
 #include "wlan_objmgr_vdev_obj.h"
-#include "wlan_objmgr_pdev_obj.h"
 #include "wlan_objmgr_psoc_obj.h"
 #include "wlan_disa_obj_mgmt_public_struct.h"
 
diff --git a/disa/core/inc/wlan_disa_priv.h b/disa/core/inc/wlan_disa_priv.h
index 71107d194d..010d82f08d 100644
--- a/disa/core/inc/wlan_disa_priv.h
+++ b/disa/core/inc/wlan_disa_priv.h
@@ -26,6 +26,7 @@
 #ifndef _WLAN_DISA_PRIV_STRUCT_H_
 #define _WLAN_DISA_PRIV_STRUCT_H_
 
+#include <qdf_lock.h>
 #include "wlan_disa_public_struct.h"
 
 /**
diff --git a/disa/dispatcher/inc/wlan_disa_obj_mgmt_api.h b/disa/dispatcher/inc/wlan_disa_obj_mgmt_api.h
index 2f4b0674a4..12a689a699 100644
--- a/disa/dispatcher/inc/wlan_disa_obj_mgmt_api.h
+++ b/disa/dispatcher/inc/wlan_disa_obj_mgmt_api.h
@@ -23,7 +23,9 @@
 #ifndef _WLAN_DISA_OBJ_MGMT_API_H_
 #define _WLAN_DISA_OBJ_MGMT_API_H_
 
-#include "wlan_disa_obj_mgmt_public_struct.h"
+#include <qdf_types.h>
+
+struct wlan_objmgr_psoc;
 
 /**
  * disa_init() - register disa notification handlers.
diff --git a/disa/dispatcher/inc/wlan_disa_obj_mgmt_public_struct.h b/disa/dispatcher/inc/wlan_disa_obj_mgmt_public_struct.h
index 1716689903..76aae8163d 100644
--- a/disa/dispatcher/inc/wlan_disa_obj_mgmt_public_struct.h
+++ b/disa/dispatcher/inc/wlan_disa_obj_mgmt_public_struct.h
@@ -25,9 +25,9 @@
 #ifndef _WLAN_DISA_OBJ_MGMT_PUBLIC_STRUCT_H_
 #define _WLAN_DISA_OBJ_MGMT_PUBLIC_STRUCT_H_
 
-#include "wlan_disa_public_struct.h"
-#include "wlan_objmgr_cmn.h"
-#include "wlan_objmgr_psoc_obj.h"
+struct wlan_objmgr_psoc;
+struct disa_encrypt_decrypt_req_params;
+struct disa_encrypt_decrypt_resp_params;
 
 /**
  * struct wlan_disa_tx_ops - structure of tx operation function
diff --git a/disa/dispatcher/inc/wlan_disa_public_struct.h b/disa/dispatcher/inc/wlan_disa_public_struct.h
index 020518255e..1c30f85316 100644
--- a/disa/dispatcher/inc/wlan_disa_public_struct.h
+++ b/disa/dispatcher/inc/wlan_disa_public_struct.h
@@ -26,8 +26,7 @@
 #ifndef _WLAN_DISA_PUBLIC_STRUCT_H_
 #define _WLAN_DISA_PUBLIC_STRUCT_H_
 
-#include <wlan_cmn.h>
-#include <qdf_status.h>
+#include <qdf_types.h>
 
 #define MAC_MAX_KEY_LENGTH 32
 #define MAC_PN_LENGTH 8
diff --git a/disa/dispatcher/inc/wlan_disa_tgt_api.h b/disa/dispatcher/inc/wlan_disa_tgt_api.h
index 3360074b38..39887079ec 100644
--- a/disa/dispatcher/inc/wlan_disa_tgt_api.h
+++ b/disa/dispatcher/inc/wlan_disa_tgt_api.h
@@ -22,8 +22,11 @@
 #ifndef _WLAN_DISA_TGT_API_H_
 #define _WLAN_DISA_TGT_API_H_
 
-#include "wlan_disa_obj_mgmt_public_struct.h"
-#include "wlan_disa_public_struct.h"
+#include <qdf_types.h>
+
+struct wlan_objmgr_psoc;
+struct disa_encrypt_decrypt_req_params;
+struct disa_encrypt_decrypt_resp_params;
 
 #define GET_DISA_TX_OPS_FROM_VDEV(vedv) \
 	(&disa_psoc_get_priv(psoc)->disa_tx_ops)
diff --git a/disa/dispatcher/inc/wlan_disa_ucfg_api.h b/disa/dispatcher/inc/wlan_disa_ucfg_api.h
index e69f52f5e7..b9c8206d35 100644
--- a/disa/dispatcher/inc/wlan_disa_ucfg_api.h
+++ b/disa/dispatcher/inc/wlan_disa_ucfg_api.h
@@ -23,7 +23,9 @@
 #define _WLAN_DISA_UCFG_API_H_
 
 #include "wlan_disa_public_struct.h"
-#include "wlan_disa_obj_mgmt_api.h"
+struct wlan_objmgr_psoc;
+struct disa_encrypt_decrypt_req_params;
+
 
 /**
  * ucfg_disa_encrypt_decrypt_req() - Send encrypt/decrypt request to the DISA
diff --git a/disa/dispatcher/src/wlan_disa_obj_mgmt_api.c b/disa/dispatcher/src/wlan_disa_obj_mgmt_api.c
index c28cebc209..7c6a1feca2 100644
--- a/disa/dispatcher/src/wlan_disa_obj_mgmt_api.c
+++ b/disa/dispatcher/src/wlan_disa_obj_mgmt_api.c
@@ -24,6 +24,7 @@
 #include "wlan_disa_main.h"
 #include "target_if_disa.h"
 #include "wlan_disa_tgt_api.h"
+#include "wlan_objmgr_global_obj.h"
 
 /**
  * disa_init() - register disa notification handlers.
diff --git a/target_if/disa/inc/target_if_disa.h b/target_if/disa/inc/target_if_disa.h
index a2a757112c..c501b6cb6e 100644
--- a/target_if/disa/inc/target_if_disa.h
+++ b/target_if/disa/inc/target_if_disa.h
@@ -24,11 +24,8 @@
 #ifndef _TARGET_IF_DISA_H_
 #define _TARGET_IF_DISA_H_
 
-#include "target_if.h"
-#include <wmi_unified_api.h>
-#include <wmi_unified_priv.h>
+#include <wlan_objmgr_psoc_obj.h>
 #include <wmi_unified_param.h>
-#include "wlan_disa_tgt_api.h"
 #include "wlan_disa_obj_mgmt_public_struct.h"
 
 /**
diff --git a/target_if/disa/src/target_if_disa.c b/target_if/disa/src/target_if_disa.c
index c1ac4a24d9..054b613d41 100644
--- a/target_if/disa/src/target_if_disa.c
+++ b/target_if/disa/src/target_if_disa.c
@@ -21,9 +21,11 @@
  * in target if internally.
  */
 
+#include "target_if.h"
 #include "target_if_disa.h"
 #include "wlan_disa_tgt_api.h"
 #include "wlan_disa_public_struct.h"
+#include <wmi_unified_api.h>
 
 int
 target_if_encrypt_decrypt_event_handler(ol_scn_t scn_handle, uint8_t *data,