diff --git a/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c b/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c
index 7f9802418a2a..8bead4d58f6c 100644
--- a/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c
+++ b/target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c
@@ -25,6 +25,7 @@
 #include <target_if_vdev_mgr_rx_ops.h>
 #include <target_if_vdev_mgr_tx_ops.h>
 #include <wlan_vdev_mgr_tgt_if_rx_defs.h>
+#include <wlan_vdev_mgr_tgt_if_tx_defs.h>
 #include <wmi_unified_param.h>
 #include <wlan_mlme_dbg.h>
 #include <target_if.h>
@@ -77,7 +78,7 @@ void target_if_vdev_mgr_rsp_timer_mgmt_cb(void *arg)
 		    qdf_atomic_test_bit(RESTART_RESPONSE_BIT,
 					&vdev_rsp->rsp_status)) {
 			start_rsp.vdev_id = wlan_vdev_get_id(vdev);
-			start_rsp.status = WMI_HOST_VDEV_START_TIMEOUT;
+			start_rsp.status = WLAN_MLME_HOST_VDEV_START_TIMEOUT;
 			if (qdf_atomic_test_bit(START_RESPONSE_BIT,
 						&vdev_rsp->rsp_status))
 				start_rsp.resp_type =
diff --git a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_defs.h b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_defs.h
index 9ce33ed2c039..a697090c6615 100644
--- a/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_defs.h
+++ b/umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_defs.h
@@ -61,6 +61,39 @@ enum mlme_bcn_tx_rate_code {
 	MLME_BCN_TX_RATE_CODE_54_M = 0x04,
 };
 
+/**
+ * enum wlan_mlme_host_sta_ps_param_uapsd - STA UPASD params
+ */
+enum wlan_mlme_host_sta_ps_param_uapsd {
+	WLAN_MLME_HOST_STA_PS_UAPSD_AC0_DELIVERY_EN = (1 << 0),
+	WLAN_MLME_HOST_STA_PS_UAPSD_AC0_TRIGGER_EN  = (1 << 1),
+	WLAN_MLME_HOST_STA_PS_UAPSD_AC1_DELIVERY_EN = (1 << 2),
+	WLAN_MLME_HOST_STA_PS_UAPSD_AC1_TRIGGER_EN  = (1 << 3),
+	WLAN_MLME_HOST_STA_PS_UAPSD_AC2_DELIVERY_EN = (1 << 4),
+	WLAN_MLME_HOST_STA_PS_UAPSD_AC2_TRIGGER_EN  = (1 << 5),
+	WLAN_MLME_HOST_STA_PS_UAPSD_AC3_DELIVERY_EN = (1 << 6),
+	WLAN_MLME_HOST_STA_PS_UAPSD_AC3_TRIGGER_EN  = (1 << 7),
+};
+
+/**
+ * enum wlan_mlme_host_vdev_start_status - vdev start status code
+ */
+enum wlan_mlme_host_vdev_start_status {
+	WLAN_MLME_HOST_VDEV_START_OK = 0,
+	WLAN_MLME_HOST_VDEV_START_CHAN_INVALID,
+	WLAN_MLME_HOST_VDEV_START_CHAN_BLOCKED,
+	WLAN_MLME_HOST_VDEV_START_CHAN_DFS_VIOLATION,
+	WLAN_MLME_HOST_VDEV_START_TIMEOUT,
+};
+
+/**
+ * enum wlan_mlme_host_start_event_param - start/restart resp event
+ */
+enum wlan_mlme_host_start_event_param {
+	WLAN_MLME_HOST_VDEV_START_RESP_EVENT = 0,
+	WLAN_MLME_HOST_VDEV_RESTART_RESP_EVENT,
+};
+
 /**
  * struct sta_ps_params - sta ps cmd parameter
  * @vdev_id: vdev id
diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h
index 835f730a6fd1..daf37a880ecf 100644
--- a/wmi/inc/wmi_unified_param.h
+++ b/wmi/inc/wmi_unified_param.h
@@ -461,6 +461,7 @@ typedef enum {
 	WMI_HOST_MODE_MAX = 24
 } WMI_HOST_WLAN_PHY_MODE;
 
+#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE
 typedef enum {
 	WMI_HOST_VDEV_START_OK = 0,
 	WMI_HOST_VDEV_START_CHAN_INVALID,
@@ -468,6 +469,7 @@ typedef enum {
 	WMI_HOST_VDEV_START_CHAN_DFS_VIOLATION,
 	WMI_HOST_VDEV_START_TIMEOUT,
 } WMI_HOST_VDEV_START_STATUS;
+#endif
 
 /*
  * Needs to be removed and use channel_param based
@@ -5502,6 +5504,7 @@ typedef struct {
 	u_int8_t dest_mac[QDF_MAC_ADDR_SIZE];
 	uint32_t vdev_id;
 } wds_addr_event_t;
+
 /**
  * Enum replicated for host abstraction with FW
  */
@@ -6290,6 +6293,7 @@ enum wmi_host_ap_ps_peer_param {
 #define WMI_HOST_RXERR_MIC	0x10 /* Michael MIC decrypt error */
 #define WMI_HOST_RXERR_KEY_CACHE_MISS 0x20 /* No/incorrect key matter in h/w */
 
+#ifndef CMN_VDEV_MGR_TGT_IF_ENABLE
 enum wmi_host_sta_ps_param_uapsd {
 	WMI_HOST_STA_PS_UAPSD_AC0_DELIVERY_EN = (1 << 0),
 	WMI_HOST_STA_PS_UAPSD_AC0_TRIGGER_EN  = (1 << 1),
@@ -6300,6 +6304,7 @@ enum wmi_host_sta_ps_param_uapsd {
 	WMI_HOST_STA_PS_UAPSD_AC3_DELIVERY_EN = (1 << 6),
 	WMI_HOST_STA_PS_UAPSD_AC3_TRIGGER_EN  = (1 << 7),
 };
+#endif
 
 enum wmi_host_sta_ps_param_rx_wake_policy {
 	/* Wake up when ever there is an  RX activity on the VDEV. In this mode