diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h
index 0f302c910dde..39bb7c59d542 100644
--- a/core/cds/inc/cds_api.h
+++ b/core/cds/inc/cds_api.h
@@ -34,6 +34,8 @@
 #include <qdf_trace.h>
 #include <qdf_event.h>
 #include <qdf_lock.h>
+#include "qdf_platform.h"
+#include "qdf_cpuhp.h"
 #include "reg_services_public_struct.h"
 #include <cds_reg_service.h>
 #include <cds_packet.h>
diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c
index cae80f00c23b..4eb959cdda69 100644
--- a/core/cds/src/cds_api.c
+++ b/core/cds/src/cds_api.c
@@ -22,7 +22,6 @@
  * Connectivity driver services APIs
  */
 
-#include "cds_sched.h"
 #include <cds_api.h>
 #include "sir_types.h"
 #include "sir_api.h"
@@ -39,7 +38,6 @@
 
 #include "pld_common.h"
 #include "sap_api.h"
-#include "qdf_trace.h"
 #include "bmi.h"
 #include "ol_fw.h"
 #include "ol_if_athvar.h"
@@ -56,10 +54,8 @@
 #include <cdp_txrx_misc.h>
 #include <dispatcher_init_deinit.h>
 #include <cdp_txrx_handle.h>
-#include "qdf_cpuhp.h"
 #include "target_type.h"
 #include "wlan_ocb_ucfg_api.h"
-#include "qdf_platform.h"
 #include "wlan_ipa_ucfg_api.h"
 
 #ifdef ENABLE_SMMU_S1_TRANSLATION
@@ -171,6 +167,10 @@ QDF_STATUS cds_init(void)
 	qdf_cpuhp_init();
 	qdf_register_self_recovery_callback(cds_trigger_recovery);
 	qdf_register_fw_down_callback(cds_is_fw_down);
+	qdf_register_ssr_protect_callbacks(cds_ssr_protect,
+					   cds_ssr_unprotect);
+	qdf_register_module_state_query_callback(
+				cds_is_module_state_transitioning);
 
 	gp_cds_context = &g_cds_context;