diff --git a/wmi_unified_api.h b/wmi_unified_api.h
index 38683acd17..a1f75e302f 100644
--- a/wmi_unified_api.h
+++ b/wmi_unified_api.h
@@ -58,6 +58,10 @@
 #include "wmi_unified_twt_api.h"
 #endif
 
+#ifdef FEATURE_WLAN_EXTSCAN
+#include "wmi_unified_extscan_api.h"
+#endif
+
 #ifdef IPA_OFFLOAD
 #include "wlan_ipa_public_struct.h"
 #endif
@@ -804,12 +808,6 @@ QDF_STATUS wmi_unified_set_rssi_monitoring_cmd(void *wmi_hdl,
 QDF_STATUS wmi_unified_scan_probe_setoui_cmd(void *wmi_hdl,
 			  struct scan_mac_oui *psetoui);
 
-QDF_STATUS wmi_unified_reset_passpoint_network_list_cmd(void *wmi_hdl,
-					struct wifi_passpoint_req_param *req);
-
-QDF_STATUS wmi_unified_set_passpoint_network_list_cmd(void *wmi_hdl,
-					struct wifi_passpoint_req_param *req);
-
 #ifdef CONFIG_MCL
 QDF_STATUS wmi_unified_roam_scan_offload_mode_cmd(void *wmi_hdl,
 				wmi_start_scan_cmd_fixed_param *scan_cmd_fp,
@@ -835,38 +833,11 @@ QDF_STATUS wmi_unified_roam_scan_offload_rssi_thresh_cmd(void *wmi_hdl,
 QDF_STATUS wmi_unified_roam_scan_filter_cmd(void *wmi_hdl,
 				struct roam_scan_filter_params *roam_req);
 
-QDF_STATUS wmi_unified_set_epno_network_list_cmd(void *wmi_hdl,
-		struct wifi_enhanched_pno_params *req);
-
 #ifdef IPA_OFFLOAD
 QDF_STATUS  wmi_unified_ipa_offload_control_cmd(void *wmi_hdl,
 		struct ipa_uc_offload_control_params *ipa_offload);
 #endif
 
-QDF_STATUS wmi_unified_extscan_get_capabilities_cmd(void *wmi_hdl,
-			  struct extscan_capabilities_params *pgetcapab);
-
-QDF_STATUS wmi_unified_extscan_get_cached_results_cmd(void *wmi_hdl,
-			  struct extscan_cached_result_params *pcached_results);
-
-
-QDF_STATUS wmi_unified_extscan_stop_change_monitor_cmd(void *wmi_hdl,
-			  struct extscan_capabilities_reset_params *reset_req);
-
-
-QDF_STATUS wmi_unified_extscan_start_change_monitor_cmd(void *wmi_hdl,
-				   struct extscan_set_sig_changereq_params *
-					   psigchange);
-
-QDF_STATUS wmi_unified_extscan_stop_hotlist_monitor_cmd(void *wmi_hdl,
-		  struct extscan_bssid_hotlist_reset_params *photlist_reset);
-
-QDF_STATUS wmi_unified_stop_extscan_cmd(void *wmi_hdl,
-			  struct extscan_stop_req_params *pstopcmd);
-
-QDF_STATUS wmi_unified_start_extscan_cmd(void *wmi_hdl,
-			  struct wifi_scan_cmd_req_params *pstart);
-
 QDF_STATUS wmi_unified_plm_stop_cmd(void *wmi_hdl,
 			  const struct plm_req_params *plm);
 
@@ -1125,10 +1096,6 @@ QDF_STATUS wmi_unified_roam_scan_offload_rssi_change_cmd(void *wmi_hdl,
 QDF_STATUS wmi_unified_set_per_roam_config(void *wmi_hdl,
 		struct wmi_per_roam_config_req *req_buf);
 
-QDF_STATUS wmi_unified_get_buf_extscan_hotlist_cmd(void *wmi_hdl,
-				   struct ext_scan_setbssi_hotlist_params *
-				   photlist, int *buf_len);
-
 /**
  * wmi_unified_set_active_bpf_mode_cmd() - config active BPF mode in FW
  * @wmi_hdl: the WMI handle
diff --git a/wmi_unified_extscan_api.h b/wmi_unified_extscan_api.h
new file mode 100644
index 0000000000..0d91164819
--- /dev/null
+++ b/wmi_unified_extscan_api.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for
+ * any purpose with or without fee is hereby granted, provided that the
+ * above copyright notice and this permission notice appear in all
+ * copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _WMI_UNIFIED_EXTSCAN_API_H_
+#define _WMI_UNIFIED_EXTSCAN_API_H_
+
+QDF_STATUS wmi_unified_reset_passpoint_network_list_cmd(void *wmi_hdl,
+					struct wifi_passpoint_req_param *req);
+
+QDF_STATUS wmi_unified_set_passpoint_network_list_cmd(void *wmi_hdl,
+					struct wifi_passpoint_req_param *req);
+
+QDF_STATUS wmi_unified_set_epno_network_list_cmd(void *wmi_hdl,
+		struct wifi_enhanched_pno_params *req);
+
+QDF_STATUS wmi_unified_extscan_get_capabilities_cmd(void *wmi_hdl,
+			  struct extscan_capabilities_params *pgetcapab);
+
+QDF_STATUS wmi_unified_extscan_get_cached_results_cmd(void *wmi_hdl,
+			  struct extscan_cached_result_params *pcached_results);
+
+QDF_STATUS wmi_unified_extscan_stop_change_monitor_cmd(void *wmi_hdl,
+			  struct extscan_capabilities_reset_params *reset_req);
+
+QDF_STATUS wmi_unified_extscan_start_change_monitor_cmd(void *wmi_hdl,
+				   struct extscan_set_sig_changereq_params *
+					   psigchange);
+
+QDF_STATUS wmi_unified_extscan_stop_hotlist_monitor_cmd(void *wmi_hdl,
+		  struct extscan_bssid_hotlist_reset_params *photlist_reset);
+
+QDF_STATUS wmi_unified_stop_extscan_cmd(void *wmi_hdl,
+			  struct extscan_stop_req_params *pstopcmd);
+
+QDF_STATUS wmi_unified_start_extscan_cmd(void *wmi_hdl,
+			  struct wifi_scan_cmd_req_params *pstart);
+
+QDF_STATUS wmi_unified_get_buf_extscan_hotlist_cmd(void *wmi_hdl,
+				   struct ext_scan_setbssi_hotlist_params *
+				   photlist, int *buf_len);
+
+#endif /* _WMI_UNIFIED_EXTSCAN_API_H_ */
diff --git a/wmi_unified_priv.h b/wmi_unified_priv.h
index 80c7f164aa..beb04f63fa 100644
--- a/wmi_unified_priv.h
+++ b/wmi_unified_priv.h
@@ -1753,6 +1753,14 @@ void wmi_tlv_attach(wmi_unified_t wmi_handle);
 #endif
 void wmi_non_tlv_attach(wmi_unified_t wmi_handle);
 
+#ifdef FEATURE_WLAN_EXTSCAN
+void wmi_extscan_attach_tlv(struct wmi_unified *wmi_handle);
+#else
+static inline void wmi_extscan_attach_tlv(struct wmi_unified *wmi_handle)
+{
+}
+#endif
+
 /**
  * wmi_align() - provides word aligned parameter
  * @param: parameter to be aligned