diff --git a/wmi_unified_api.h b/wmi_unified_api.h
index 6c33ac65e8..94a39ccef1 100644
--- a/wmi_unified_api.h
+++ b/wmi_unified_api.h
@@ -55,6 +55,9 @@
 #ifdef WLAN_FEATURE_NAN_CONVERGENCE
 #include "nan_public_structs.h"
 #endif
+#ifdef WLAN_SUPPORT_GREEN_AP
+#include "wlan_green_ap_api.h"
+#endif
 
 typedef qdf_nbuf_t wmi_buf_t;
 #define wmi_buf_data(_buf) qdf_nbuf_data(_buf)
@@ -421,7 +424,7 @@ QDF_STATUS wmi_unified_stats_request_send(void *wmi_hdl,
 				struct stats_request_params *param);
 
 QDF_STATUS wmi_unified_green_ap_ps_send(void *wmi_hdl,
-						uint32_t value, uint8_t mac_id);
+					uint32_t value, uint8_t pdev_id);
 
 #ifdef FEATURE_WLAN_D0WOW
 QDF_STATUS wmi_unified_d0wow_enable_send(void *wmi_hdl,
@@ -757,10 +760,11 @@ QDF_STATUS wmi_unified_process_dhcp_ind(void *wmi_hdl,
 
 QDF_STATUS wmi_unified_get_link_speed_cmd(void *wmi_hdl,
 					wmi_mac_addr peer_macaddr);
+#endif
 
+#ifdef WLAN_SUPPORT_GREEN_AP
 QDF_STATUS wmi_unified_egap_conf_params_cmd(void *wmi_hdl,
-		wmi_ap_ps_egap_param_cmd_fixed_param *egap_params);
-
+		struct wlan_green_ap_egap_params *egap_params);
 #endif
 
 QDF_STATUS wmi_unified_fw_profiling_data_cmd(void *wmi_hdl,
diff --git a/wmi_unified_param.h b/wmi_unified_param.h
index e33570d3e3..c8b5431d9c 100644
--- a/wmi_unified_param.h
+++ b/wmi_unified_param.h
@@ -910,14 +910,6 @@ struct bss_chan_info_request_params {
 	uint32_t param;
 };
 
-/**
- * struct green_ap_ps_params - green ap ps cmd parameter
- * @value: parameter value
- */
-struct green_ap_ps_params {
-	uint32_t value;
-};
-
 /**
  * struct wow_cmd_params - wow cmd parameter
  * @enable: wow enable or disable flag
diff --git a/wmi_unified_priv.h b/wmi_unified_priv.h
index 6a0081dd0d..834eab3c46 100644
--- a/wmi_unified_priv.h
+++ b/wmi_unified_priv.h
@@ -49,6 +49,9 @@
 #include <wlan_dfs_public_struct.h>
 #endif
 #include <qdf_threads.h>
+#ifdef WLAN_SUPPORT_GREEN_AP
+#include "wlan_green_ap_api.h"
+#endif
 
 #ifdef WLAN_FEATURE_NAN_CONVERGENCE
 #include "nan_public_structs.h"
@@ -231,8 +234,10 @@ QDF_STATUS (*send_vdev_up_cmd)(wmi_unified_t wmi,
 QDF_STATUS (*send_peer_create_cmd)(wmi_unified_t wmi,
 					struct peer_create_params *param);
 
+#ifdef WLAN_SUPPORT_GREEN_AP
 QDF_STATUS (*send_green_ap_ps_cmd)(wmi_unified_t wmi_handle,
-						uint32_t value, uint8_t mac_id);
+				   uint32_t value, uint8_t pdev_id);
+#endif
 
 QDF_STATUS
 (*send_pdev_utf_cmd)(wmi_unified_t wmi_handle,
@@ -604,9 +609,6 @@ QDF_STATUS (*send_process_dhcp_ind_cmd)(wmi_unified_t wmi_handle,
 QDF_STATUS (*send_get_link_speed_cmd)(wmi_unified_t wmi_handle,
 			wmi_mac_addr peer_macaddr);
 
-QDF_STATUS (*send_egap_conf_params_cmd)(wmi_unified_t wmi_handle,
-				     wmi_ap_ps_egap_param_cmd_fixed_param *egap_params);
-
 QDF_STATUS (*send_bcn_buf_ll_cmd)(wmi_unified_t wmi_handle,
 			wmi_bcn_send_from_host_cmd_fixed_param * param);
 
@@ -622,6 +624,11 @@ QDF_STATUS (*send_pktlog_wmi_send_cmd)(wmi_unified_t wmi_handle,
 				   WMI_CMD_ID cmd_id, uint8_t user_triggered);
 #endif
 
+#ifdef WLAN_SUPPORT_GREEN_AP
+QDF_STATUS (*send_egap_conf_params_cmd)(wmi_unified_t wmi_handle,
+			struct wlan_green_ap_egap_params *egap_params);
+#endif
+
 QDF_STATUS (*send_fw_profiling_cmd)(wmi_unified_t wmi_handle,
 			uint32_t cmd, uint32_t value1, uint32_t value2);