diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h
index 8e4db637af..2a3e1a67d7 100644
--- a/wmi/inc/wmi_unified_param.h
+++ b/wmi/inc/wmi_unified_param.h
@@ -5523,6 +5523,7 @@ typedef enum {
 #if defined(WLAN_DFS_PARTIAL_OFFLOAD) && defined(HOST_DFS_SPOOF_TEST)
 	wmi_host_dfs_status_check_event_id,
 #endif
+	wmi_twt_enable_complete_event_id,
 
 	wmi_events_max,
 } wmi_conv_event_id;
diff --git a/wmi/inc/wmi_unified_twt_api.h b/wmi/inc/wmi_unified_twt_api.h
index a7211d7546..ce5c53b894 100644
--- a/wmi/inc/wmi_unified_twt_api.h
+++ b/wmi/inc/wmi_unified_twt_api.h
@@ -164,4 +164,13 @@ QDF_STATUS wmi_extract_twt_resume_dialog_comp_event(void *wmi_hdl,
 		uint8_t *evt_buf,
 		struct wmi_twt_resume_dialog_complete_event_param *params);
 
+#ifdef WLAN_SUPPORT_TWT
+void wmi_twt_attach_tlv(struct wmi_unified *wmi_handle);
+#else
+static void wmi_twt_attach_tlv(struct wmi_unified *wmi_handle)
+{
+	return;
+}
+#endif
+
 #endif /* _WMI_UNIFIED_TWT_API_H_ */
diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c
index f2828c6c35..be5ef006e1 100644
--- a/wmi/src/wmi_unified_tlv.c
+++ b/wmi/src/wmi_unified_tlv.c
@@ -39,6 +39,7 @@
 #ifdef WLAN_FEATURE_NAN_CONVERGENCE
 #include "nan_public_structs.h"
 #endif
+#include "wmi_unified_twt_api.h"
 
 #ifdef WLAN_POLICY_MGR_ENABLE
 #include "wlan_policy_mgr_public_struct.h"
@@ -23267,6 +23268,8 @@ static void populate_tlv_events_id(uint32_t *event_ids)
 		WMI_OBSS_COLOR_COLLISION_DETECTION_EVENTID;
 	event_ids[wmi_pdev_div_rssi_antid_event_id] =
 		WMI_PDEV_DIV_RSSI_ANTID_EVENTID;
+	event_ids[wmi_twt_enable_complete_event_id] =
+		WMI_TWT_ENABLE_COMPLETE_EVENTID;
 }
 
 /**
@@ -23927,14 +23930,6 @@ static inline void wmi_ocb_ut_attach(struct wmi_unified *wmi_handle)
 }
 #endif
 
-#ifdef WLAN_SUPPORT_TWT
-void wmi_twt_attach_tlv(struct wmi_unified *wmi_handle);
-#else
-static void wmi_twt_attach_tlv(struct wmi_unified *wmi_handle)
-{
-	return;
-}
-#endif
 /**
  * wmi_tlv_attach() - Attach TLV APIs
  *
diff --git a/wmi/src/wmi_unified_twt_tlv.c b/wmi/src/wmi_unified_twt_tlv.c
index 7b4fbc0a32..66ba9e8177 100644
--- a/wmi/src/wmi_unified_twt_tlv.c
+++ b/wmi/src/wmi_unified_twt_tlv.c
@@ -21,6 +21,7 @@
 #include "wmi.h"
 #include "wmi_unified_priv.h"
 #include "wmi_unified_twt_param.h"
+#include "wmi_unified_twt_api.h"
 
 static QDF_STATUS send_twt_enable_cmd_tlv(wmi_unified_t wmi_handle,
 			struct wmi_twt_enable_param *params)