diff --git a/umac/mlme/include/wlan_pdev_mlme.h b/umac/mlme/include/wlan_pdev_mlme.h
index 20d420ffc4..6f3c68ffeb 100644
--- a/umac/mlme/include/wlan_pdev_mlme.h
+++ b/umac/mlme/include/wlan_pdev_mlme.h
@@ -22,6 +22,7 @@
 
 #include <qdf_timer.h>
 #include <include/wlan_vdev_mlme.h>
+#include <wlan_ext_mlme_obj_types.h>
 
 /*
  * struct pdev_restart_attr - Pdev restart attributes
@@ -46,7 +47,7 @@ struct pdev_restart_attr {
  */
 struct pdev_mlme_obj {
 	struct wlan_objmgr_pdev *pdev;
-	void *ext_pdev_ptr;
+	mlme_pdev_ext_t *ext_pdev_ptr;
 	QDF_STATUS (*mlme_register_ops)(struct vdev_mlme_obj *vdev_mlme);
 	qdf_spinlock_t vdev_restart_lock;
 	qdf_timer_t restart_req_timer;
diff --git a/umac/mlme/include/wlan_vdev_mlme.h b/umac/mlme/include/wlan_vdev_mlme.h
index d5e2ef3ddf..d244f66ee5 100644
--- a/umac/mlme/include/wlan_vdev_mlme.h
+++ b/umac/mlme/include/wlan_vdev_mlme.h
@@ -23,6 +23,7 @@
 #include <wlan_vdev_mgr_tgt_if_rx_defs.h>
 #include <wlan_objmgr_vdev_obj.h>
 #include <wlan_vdev_mlme_api.h>
+#include <wlan_ext_mlme_obj_types.h>
 
 struct vdev_mlme_obj;
 
@@ -555,7 +556,7 @@ struct vdev_mlme_obj {
 	struct wlan_sm *sm_hdl;
 	struct wlan_objmgr_vdev *vdev;
 	struct vdev_mlme_ops *ops;
-	void *ext_vdev_ptr;
+	mlme_vdev_ext_t *ext_vdev_ptr;
 	struct vdev_response_timer vdev_rt;
 #ifdef FEATURE_VDEV_RSP_WAKELOCK
 	struct vdev_mlme_wakelock vdev_wakelock;
diff --git a/umac/mlme/pdev_mgr/dispatcher/inc/wlan_pdev_mlme_api.h b/umac/mlme/pdev_mgr/dispatcher/inc/wlan_pdev_mlme_api.h
index 739832a4b1..4b99fd0812 100644
--- a/umac/mlme/pdev_mgr/dispatcher/inc/wlan_pdev_mlme_api.h
+++ b/umac/mlme/pdev_mgr/dispatcher/inc/wlan_pdev_mlme_api.h
@@ -23,6 +23,7 @@
 
 /**
  * wlan_pdev_mlme_get_cmpt_obj - Returns MLME component object
+ * @pdev: PDEV object
  *
  * Retrieves MLME component object from PDEV object
  *
@@ -33,12 +34,13 @@ struct pdev_mlme_obj *wlan_pdev_mlme_get_cmpt_obj(
 						struct wlan_objmgr_pdev *pdev);
 /**
  * wlan_pdev_mlme_get_ext_hdl - Returns legacy handle
+ * @pdev: PDEV object
  *
  * Retrieves legacy handle from pdev mlme component object
  *
  * Return: legacy handle on SUCCESS
  *         NULL, if it fails to retrieve
  */
-void *wlan_pdev_mlme_get_ext_hdl(struct wlan_objmgr_pdev *pdev);
+mlme_pdev_ext_t *wlan_pdev_mlme_get_ext_hdl(struct wlan_objmgr_pdev *pdev);
 
 #endif
diff --git a/umac/mlme/pdev_mgr/dispatcher/src/wlan_pdev_mlme_api.c b/umac/mlme/pdev_mgr/dispatcher/src/wlan_pdev_mlme_api.c
index 03b04ac61e..87973069be 100644
--- a/umac/mlme/pdev_mgr/dispatcher/src/wlan_pdev_mlme_api.c
+++ b/umac/mlme/pdev_mgr/dispatcher/src/wlan_pdev_mlme_api.c
@@ -43,7 +43,7 @@ struct pdev_mlme_obj *wlan_pdev_mlme_get_cmpt_obj(struct wlan_objmgr_pdev *pdev)
 	return pdev_mlme;
 }
 
-void *wlan_pdev_mlme_get_ext_hdl(struct wlan_objmgr_pdev *pdev)
+mlme_pdev_ext_t *wlan_pdev_mlme_get_ext_hdl(struct wlan_objmgr_pdev *pdev)
 {
 	struct pdev_mlme_obj *pdev_mlme;
 
diff --git a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mlme_api.h b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mlme_api.h
index 278da74f59..11945cc8c4 100644
--- a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mlme_api.h
+++ b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mlme_api.h
@@ -21,6 +21,7 @@
 #ifndef _WLAN_VDEV_MLME_API_H_
 #define _WLAN_VDEV_MLME_API_H_
 
+#include <wlan_ext_mlme_obj_types.h>
 /**
  * wlan_vdev_mlme_get_cmpt_obj - Retrieves MLME component object
  * from VDEV object
@@ -42,7 +43,8 @@ struct vdev_mlme_obj *wlan_vdev_mlme_get_cmpt_obj(
  *
  * Return:
  */
-void wlan_vdev_mlme_set_ext_hdl(struct wlan_objmgr_vdev *vdev, void *ext_hdl);
+void wlan_vdev_mlme_set_ext_hdl(struct wlan_objmgr_vdev *vdev,
+				mlme_vdev_ext_t *ext_hdl);
 
 /**
  * wlan_vdev_mlme_get_ext_hdl - Returns legacy handle
@@ -53,7 +55,7 @@ void wlan_vdev_mlme_set_ext_hdl(struct wlan_objmgr_vdev *vdev, void *ext_hdl);
  * Return: legacy handle on SUCCESS
  *         NULL, if it fails to retrieve
  */
-void *wlan_vdev_mlme_get_ext_hdl(struct wlan_objmgr_vdev *vdev);
+mlme_vdev_ext_t *wlan_vdev_mlme_get_ext_hdl(struct wlan_objmgr_vdev *vdev);
 
 /**
  * wlan_vdev_mlme_sm_deliver_evt() - Delivers event to VDEV MLME SM
diff --git a/umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mlme_api.c b/umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mlme_api.c
index 1d0629976c..fafc0bed56 100644
--- a/umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mlme_api.c
+++ b/umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mlme_api.c
@@ -46,7 +46,8 @@ struct vdev_mlme_obj *wlan_vdev_mlme_get_cmpt_obj(struct wlan_objmgr_vdev *vdev)
 
 qdf_export_symbol(wlan_vdev_mlme_get_cmpt_obj);
 
-void wlan_vdev_mlme_set_ext_hdl(struct wlan_objmgr_vdev *vdev, void *ext_hdl)
+void wlan_vdev_mlme_set_ext_hdl(struct wlan_objmgr_vdev *vdev,
+				mlme_vdev_ext_t *ext_hdl)
 {
 	struct vdev_mlme_obj *vdev_mlme;
 
@@ -62,7 +63,7 @@ void wlan_vdev_mlme_set_ext_hdl(struct wlan_objmgr_vdev *vdev, void *ext_hdl)
 
 qdf_export_symbol(wlan_vdev_mlme_set_ext_hdl);
 
-void *wlan_vdev_mlme_get_ext_hdl(struct wlan_objmgr_vdev *vdev)
+mlme_vdev_ext_t *wlan_vdev_mlme_get_ext_hdl(struct wlan_objmgr_vdev *vdev)
 {
 	struct vdev_mlme_obj *vdev_mlme;