diff --git a/umac/cp_stats/core/src/wlan_cp_stats_comp_handler.c b/umac/cp_stats/core/src/wlan_cp_stats_comp_handler.c
index edab0cce2b..b4c98f8a61 100644
--- a/umac/cp_stats/core/src/wlan_cp_stats_comp_handler.c
+++ b/umac/cp_stats/core/src/wlan_cp_stats_comp_handler.c
@@ -32,6 +32,8 @@
 #include <wlan_cp_stats_ucfg_api.h>
 #include <wlan_cp_stats_utils_api.h>
 #include <wmi_unified_twt_param.h>
+#include <wlan_twt_public_structs.h>
+
 
 static QDF_STATUS
 wlan_cp_stats_psoc_comp_obj_config
@@ -265,7 +267,7 @@ wlan_cp_stats_twt_get_session_evt_handler(
 	if (twt_params->event_type == HOST_TWT_SESSION_UPDATE ||
 	    twt_params->event_type == HOST_TWT_SESSION_TEARDOWN) {
 		/* Update for a existing session, find by dialog_id */
-		for (i = 0; i < TWT_PEER_MAX_SESSIONS; i++) {
+		for (i = 0; i < WLAN_MAX_TWT_SESSIONS_PER_PEER; i++) {
 			if (peer_cp_stats_priv->twt_param[i].dialog_id !=
 			    twt_params->dialog_id)
 				continue;
@@ -275,7 +277,7 @@ wlan_cp_stats_twt_get_session_evt_handler(
 		}
 	} else if (twt_params->event_type == HOST_TWT_SESSION_SETUP) {
 		/* New session, fill in any existing invalid session */
-		for (i = 0; i < TWT_PEER_MAX_SESSIONS; i++) {
+		for (i = 0; i < WLAN_MAX_TWT_SESSIONS_PER_PEER; i++) {
 			event_type =
 				peer_cp_stats_priv->twt_param[i].event_type;
 			if (event_type != HOST_TWT_SESSION_SETUP &&
diff --git a/umac/cp_stats/core/src/wlan_cp_stats_defs.h b/umac/cp_stats/core/src/wlan_cp_stats_defs.h
index 00d82b613d..35f7053918 100644
--- a/umac/cp_stats/core/src/wlan_cp_stats_defs.h
+++ b/umac/cp_stats/core/src/wlan_cp_stats_defs.h
@@ -38,11 +38,7 @@
 #include <wlan_cp_stats_utils_api.h>
 #include <wlan_cp_stats_ext_type.h>
 #include <wlan_cp_stats_public_structs.h>
-#ifdef WLAN_FEATURE_MIB_STATS
-#include <wlan_cp_stats_mc_defs.h>
-#else
-#include <wlan_cp_stats_ic_defs.h>
-#endif
+#include <wlan_twt_public_structs.h>
 
 /* noise floor */
 #define CP_STATS_TGT_NOISE_FLOOR_DBM (-96)
@@ -124,7 +120,7 @@ struct peer_cp_stats {
 	qdf_spinlock_t peer_cp_stats_lock;
 	void (*rx_pnerr_stats_inc)(struct wlan_objmgr_peer *peer, uint32_t val);
 #if defined(WLAN_SUPPORT_TWT) && defined(WLAN_TWT_CONV_SUPPORTED)
-	struct twt_session_stats_info twt_param[TWT_PEER_MAX_SESSIONS];
+	struct twt_session_stats_info twt_param[WLAN_MAX_TWT_SESSIONS_PER_PEER];
 #endif
 };
 
diff --git a/umac/cp_stats/core/src/wlan_cp_stats_obj_mgr_handler.c b/umac/cp_stats/core/src/wlan_cp_stats_obj_mgr_handler.c
index bd814be591..b925f70ff8 100644
--- a/umac/cp_stats/core/src/wlan_cp_stats_obj_mgr_handler.c
+++ b/umac/cp_stats/core/src/wlan_cp_stats_obj_mgr_handler.c
@@ -31,6 +31,7 @@
 #include <wlan_cp_stats_ucfg_api.h>
 #include "wlan_cp_stats_utils_api.h"
 #include <target_if_cp_stats.h>
+#include <wlan_twt_public_structs.h>
 
 QDF_STATUS
 wlan_cp_stats_psoc_obj_create_handler(struct wlan_objmgr_psoc *psoc, void *arg)
@@ -489,7 +490,7 @@ wlan_cp_stats_twt_get_peer_session_param(struct peer_cp_stats *peer_cp_stat_prv,
 	if (!peer_cp_stat_prv || !params)
 		return qdf_status;
 
-	for (i = 0; i < TWT_PEER_MAX_SESSIONS; i++) {
+	for (i = 0; i < WLAN_MAX_TWT_SESSIONS_PER_PEER; i++) {
 		twt_params = &peer_cp_stat_prv->twt_param[i];
 		event_type = peer_cp_stat_prv->twt_param[i].event_type;
 
@@ -569,13 +570,13 @@ wlan_cp_stats_twt_get_all_peer_session_params(
 		}
 
 		if (opmode == QDF_STA_MODE &&
-		    num_twt_session >= TWT_PEER_MAX_SESSIONS) {
+		    num_twt_session >= WLAN_MAX_TWT_SESSIONS_PER_PEER) {
 			wlan_objmgr_peer_release_ref(peer, WLAN_CP_STATS_ID);
 			goto done;
 		}
 
 		if (opmode == QDF_SAP_MODE &&
-		    num_twt_session >= (sap_num_peer * TWT_PEER_MAX_SESSIONS)) {
+		    num_twt_session >= (sap_num_peer * WLAN_MAX_TWT_SESSIONS_PER_PEER)) {
 			wlan_objmgr_peer_release_ref(peer, WLAN_CP_STATS_ID);
 			goto done;
 		}
@@ -622,7 +623,7 @@ wlan_cp_stats_twt_get_peer_session_param_by_dlg_id(
 	if (!peer_cp_stats_priv || !dest_param)
 		return qdf_status;
 
-	for (i = 0; i < TWT_PEER_MAX_SESSIONS; i++) {
+	for (i = 0; i < WLAN_MAX_TWT_SESSIONS_PER_PEER; i++) {
 		event_type = peer_cp_stats_priv->twt_param[i].event_type;
 		src_param = &peer_cp_stats_priv->twt_param[i];
 		if (!event_type ||
@@ -636,7 +637,7 @@ wlan_cp_stats_twt_get_peer_session_param_by_dlg_id(
 				     sizeof(*src_param));
 			qdf_status = QDF_STATUS_SUCCESS;
 			*num_twt_session += 1;
-			if (*num_twt_session >= TWT_PEER_MAX_SESSIONS)
+			if (*num_twt_session >= WLAN_MAX_TWT_SESSIONS_PER_PEER)
 				break;
 		}
 	}