diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h
index a1d99dc044..721fdb78fa 100644
--- a/wmi/inc/wmi_unified_api.h
+++ b/wmi/inc/wmi_unified_api.h
@@ -349,6 +349,17 @@ QDF_STATUS wmi_unified_wow_enable_send(void *wmi_hdl,
 				struct wow_cmd_params *param,
 				uint8_t mac_id);
 
+QDF_STATUS wmi_unified_wow_wakeup_send(void *wmi_hdl);
+
+QDF_STATUS wmi_unified_wow_add_wakeup_event_send(void *wmi_hdl,
+		struct wow_add_wakeup_params *param);
+
+QDF_STATUS wmi_unified_wow_add_wakeup_pattern_send(void *wmi_hdl,
+		struct wow_add_wakeup_pattern_params *param);
+
+QDF_STATUS wmi_unified_wow_remove_wakeup_pattern_send(void *wmi_hdl,
+		struct wow_remove_wakeup_pattern_params *param);
+
 #ifndef CONFIG_MCL
 QDF_STATUS wmi_unified_packet_log_enable_send(void *wmi_hdl,
 				WMI_HOST_PKTLOG_EVENT PKTLOG_EVENT);
@@ -1186,6 +1197,9 @@ QDF_STATUS wmi_extract_peer_sta_kickout_ev(void *wmi_hdl, void *evt_buf,
 QDF_STATUS wmi_extract_peer_ratecode_list_ev(void *wmi_hdl, void *evt_buf,
 		uint8_t *peer_mac, wmi_sa_rate_cap *rate_cap);
 
+QDF_STATUS wmi_extract_bcnflt_stats(void *wmi_hdl, void *evt_buf,
+		 uint32_t index, wmi_host_bcnflt_stats *bcnflt_stats);
+
 QDF_STATUS wmi_extract_rtt_hdr(void *wmi_hdl, void *evt_buf,
 		wmi_host_rtt_event_hdr *ev);
 
@@ -1196,6 +1210,9 @@ QDF_STATUS wmi_extract_rtt_ev(void *wmi_hdl, void *evt_buf,
 QDF_STATUS wmi_extract_rtt_error_report_ev(void *wmi_hdl, void *evt_buf,
 		wmi_host_rtt_error_report_event *ev);
 
+QDF_STATUS wmi_extract_chan_stats(void *wmi_hdl, void *evt_buf,
+		uint32_t index, wmi_host_chan_stats *chan_stats);
+
 QDF_STATUS wmi_extract_thermal_stats(void *wmi_hdl, void *evt_buf,
 		uint32_t *temp, uint32_t *level);
 
diff --git a/wmi/src/wmi_tlv_helper.c b/wmi/src/wmi_tlv_helper.c
index 6acb64415a..1246152010 100644
--- a/wmi/src/wmi_tlv_helper.c
+++ b/wmi/src/wmi_tlv_helper.c
@@ -108,6 +108,7 @@ wmitlv_set_static_param_tlv_buf(void *param_tlv_buf,
  *
  * Return: 0 if success. Return >=1 if failure.
  */
+static
 A_UINT32 wmitlv_get_attributes(A_UINT32 is_cmd_id, A_UINT32 cmd_event_id,
 			       A_UINT32 curr_tlv_order,
 			       wmitlv_attributes_struc *tlv_attr_ptr)
@@ -1136,7 +1137,7 @@ wmi_versions_are_compatible(wmi_abi_version *vers1, wmi_abi_version *vers2)
  *
  * Return: 0 if success. Return < 0 if failure.
  */
-int
+static int
 wmi_versions_can_downgrade(int num_whitelist,
 			   wmi_whitelist_version_info *version_whitelist_table,
 			   wmi_abi_version *my_vers,
diff --git a/wmi/src/wmi_unified.c b/wmi/src/wmi_unified.c
index b9766b4e73..1756ca66f9 100644
--- a/wmi/src/wmi_unified.c
+++ b/wmi/src/wmi_unified.c
@@ -95,7 +95,7 @@ typedef PREPACK struct {
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0))
 /* TODO Cleanup this backported function */
-int qcacld_bp_seq_printf(struct seq_file *m, const char *f, ...)
+static int qcacld_bp_seq_printf(struct seq_file *m, const char *f, ...)
 {
 	va_list args;
 
@@ -1862,8 +1862,8 @@ QDF_STATUS wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf,
  *
  * Return: event handler's index
  */
-int wmi_unified_get_event_handler_ix(wmi_unified_t wmi_handle,
-				     uint32_t event_id)
+static int wmi_unified_get_event_handler_ix(wmi_unified_t wmi_handle,
+					    uint32_t event_id)
 {
 	uint32_t idx = 0;
 	int32_t invalid_idx = -1;
@@ -2043,7 +2043,7 @@ static void wmi_process_fw_event_worker_thread_ctx
  *
  * Return: none
  */
-void wmi_control_rx(void *ctx, HTC_PACKET *htc_packet)
+static void wmi_control_rx(void *ctx, HTC_PACKET *htc_packet)
 {
 	struct wmi_unified *wmi_handle = (struct wmi_unified *)ctx;
 	wmi_buf_t evt_buf;
@@ -2182,7 +2182,7 @@ end:
  *
  * Return: none
  */
-void wmi_rx_event_work(struct work_struct *work)
+static void wmi_rx_event_work(struct work_struct *work)
 {
 	struct wmi_unified *wmi = container_of(work, struct wmi_unified,
 					rx_event_work);
@@ -2364,7 +2364,7 @@ wmi_unified_remove_work(struct wmi_unified *wmi_handle)
  *
  * @Return: none.
  */
-void wmi_htc_tx_complete(void *ctx, HTC_PACKET *htc_pkt)
+static void wmi_htc_tx_complete(void *ctx, HTC_PACKET *htc_pkt)
 {
 	struct wmi_unified *wmi_handle = (struct wmi_unified *)ctx;
 	wmi_buf_t wmi_cmd_buf = GET_HTC_PACKET_NET_BUF_CONTEXT(htc_pkt);
diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c
index 46aa8a24fc..7f4537046e 100644
--- a/wmi/src/wmi_unified_tlv.c
+++ b/wmi/src/wmi_unified_tlv.c
@@ -729,6 +729,7 @@ QDF_STATUS send_peer_create_cmd_tlv(wmi_unified_t wmi,
  *
  * Return: 0 for success or error code
  */
+static
 QDF_STATUS send_peer_rx_reorder_queue_setup_cmd_tlv(wmi_unified_t wmi,
 		struct rx_reorder_queue_setup_params *param)
 {
@@ -774,6 +775,7 @@ QDF_STATUS send_peer_rx_reorder_queue_setup_cmd_tlv(wmi_unified_t wmi,
  *
  * Return: 0 for success or error code
  */
+static
 QDF_STATUS send_peer_rx_reorder_queue_remove_cmd_tlv(wmi_unified_t wmi,
 		struct rx_reorder_queue_remove_params *param)
 {
@@ -4124,6 +4126,7 @@ QDF_STATUS send_setup_install_key_cmd_tlv(wmi_unified_t wmi_handle,
  *
  * Return: QDF_STATUS_SUCCESS for success or error code
  */
+static
 QDF_STATUS send_encrypt_decrypt_send_cmd_tlv(wmi_unified_t wmi_handle,
 		struct encrypt_decrypt_req_params *encrypt_decrypt_params)
 {
@@ -5009,6 +5012,7 @@ QDF_STATUS send_roam_scan_offload_rssi_thresh_cmd_tlv(wmi_unified_t wmi_handle,
  *
  * Return: QDF_STATUS_SUCCESS on success and QDF failure reason code for failure
  */
+static
 QDF_STATUS send_adapt_dwelltime_params_cmd_tlv(wmi_unified_t wmi_handle,
 		struct wmi_adaptive_dwelltime_params *dwelltime_params)
 {
@@ -5750,6 +5754,7 @@ QDF_STATUS send_stop_extscan_cmd_tlv(wmi_unified_t wmi_handle,
  *
  * Return: CDF Status.
  */
+static
 QDF_STATUS wmi_get_buf_extscan_start_cmd(wmi_unified_t wmi_handle,
 			 struct wifi_scan_cmd_req_params *pstart,
 			 wmi_buf_t *buf, int *buf_len)
@@ -9555,7 +9560,7 @@ QDF_STATUS send_process_set_ie_info_cmd_tlv(wmi_unified_t wmi_handle,
 	return ret;
 }
 
-
+static
 void wmi_copy_resource_config(wmi_resource_config *resource_cfg,
 				target_resource_config *tgt_res_cfg)
 {
@@ -10276,6 +10281,7 @@ QDF_STATUS send_pdev_set_hw_mode_cmd_tlv(wmi_unified_t wmi_handle,
  *
  * Return: QDF_STATUS. 0 on success.
  */
+static
 QDF_STATUS send_pdev_set_dual_mac_config_cmd_tlv(wmi_unified_t wmi_handle,
 		struct wmi_dual_mac_config *msg)
 {
@@ -10732,6 +10738,7 @@ QDF_STATUS send_process_roam_synch_complete_cmd_tlv(wmi_unified_t wmi_handle,
  *
  * Return: CDF STATUS
  */
+static
 QDF_STATUS send_fw_test_cmd_tlv(wmi_unified_t wmi_handle,
 			       struct set_fwtest_params *wmi_fwtest)
 {
@@ -11353,8 +11360,8 @@ QDF_STATUS send_get_buf_extscan_hotlist_cmd_tlv(wmi_unified_t wmi_handle,
  *
  * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error
  */
-QDF_STATUS send_power_dbg_cmd_tlv(wmi_unified_t wmi_handle,
-				struct wmi_power_dbg_params *param)
+static QDF_STATUS send_power_dbg_cmd_tlv(wmi_unified_t wmi_handle,
+					 struct wmi_power_dbg_params *param)
 {
 	wmi_buf_t buf = NULL;
 	QDF_STATUS status;
@@ -11526,6 +11533,7 @@ static QDF_STATUS init_cmd_send_tlv(wmi_unified_t wmi_handle,
  * Return: None
  */
 #ifndef CONFIG_MCL
+static
 void save_service_bitmap_tlv(wmi_unified_t wmi_handle, void *evt_buf)
 {
 	WMI_SERVICE_READY_EVENTID_param_tlvs *param_buf;
@@ -11536,6 +11544,7 @@ void save_service_bitmap_tlv(wmi_unified_t wmi_handle, void *evt_buf)
 			(WMI_SERVICE_BM_SIZE * sizeof(uint32_t)));
 }
 #else
+static
 void save_service_bitmap_tlv(wmi_unified_t wmi_handle, void *evt_buf)
 {
 	return;