diff --git a/wmi_unified_dfs_api.c b/wmi_unified_dfs_api.c
index 534ffd496d..fd1769f081 100644
--- a/wmi_unified_dfs_api.c
+++ b/wmi_unified_dfs_api.c
@@ -22,6 +22,7 @@
  */
 
 #include <qdf_status.h>
+#include <qdf_module.h>
 #include <wmi_unified_api.h>
 #include <wmi_unified_priv.h>
 #include <wlan_dfs_utils_api.h>
@@ -40,7 +41,7 @@ QDF_STATUS wmi_extract_dfs_cac_complete_event(void *wmi_hdl,
 
 	return QDF_STATUS_E_FAILURE;
 }
-EXPORT_SYMBOL(wmi_extract_dfs_cac_complete_event);
+qdf_export_symbol(wmi_extract_dfs_cac_complete_event);
 
 QDF_STATUS wmi_extract_dfs_radar_detection_event(void *wmi_hdl,
 		uint8_t *evt_buf,
@@ -71,4 +72,4 @@ QDF_STATUS wmi_extract_wlan_radar_event_info(void *wmi_hdl,
 	return QDF_STATUS_E_FAILURE;
 }
 #endif
-EXPORT_SYMBOL(wmi_extract_dfs_radar_detection_event);
+qdf_export_symbol(wmi_extract_dfs_radar_detection_event);
diff --git a/wmi_unified_non_tlv.c b/wmi_unified_non_tlv.c
index 3e127bee45..093857e03f 100644
--- a/wmi_unified_non_tlv.c
+++ b/wmi_unified_non_tlv.c
@@ -28,6 +28,7 @@
 #include "wmi_unified_api.h"
 #include "wmi_unified_priv.h"
 #include "target_type.h"
+#include <qdf_module.h>
 
 #if defined(WMI_NON_TLV_SUPPORT) || defined(WMI_TLV_AND_NON_TLV_SUPPORT)
 #include "wmi.h"
@@ -9347,7 +9348,7 @@ void wmi_non_tlv_attach(struct wmi_unified *wmi_handle)
 	qdf_print("%s: Not supported\n", __func__);
 #endif
 }
-EXPORT_SYMBOL(wmi_non_tlv_attach);
+qdf_export_symbol(wmi_non_tlv_attach);
 
 /**
  * wmi_non_tlv_init() - Initialize WMI NON TLV module by registering Non TLV
diff --git a/wmi_unified_reg_api.c b/wmi_unified_reg_api.c
index a779307208..fba7a8f168 100644
--- a/wmi_unified_reg_api.c
+++ b/wmi_unified_reg_api.c
@@ -22,6 +22,7 @@
  */
 
 #include <qdf_status.h>
+#include <qdf_module.h>
 #include <wmi_unified_api.h>
 #include <wmi_unified_priv.h>
 #include <wmi_unified_reg_api.h>
@@ -41,7 +42,7 @@ QDF_STATUS wmi_extract_reg_chan_list_update_event(void *wmi_hdl,
 
 	return QDF_STATUS_E_FAILURE;
 }
-EXPORT_SYMBOL(wmi_extract_reg_chan_list_update_event);
+qdf_export_symbol(wmi_extract_reg_chan_list_update_event);
 
 /*
  * wmi_unified_send_start_11d_scan_cmd() - start 11d scan
@@ -59,7 +60,7 @@ QDF_STATUS wmi_unified_send_start_11d_scan_cmd(wmi_unified_t wmi_handle,
 
 	return QDF_STATUS_E_FAILURE;
 }
-EXPORT_SYMBOL(wmi_unified_send_start_11d_scan_cmd);
+qdf_export_symbol(wmi_unified_send_start_11d_scan_cmd);
 
 /*
  * wmi_unified_send_stop_11d_scan_cmd() - stop 11d scan
@@ -77,7 +78,7 @@ QDF_STATUS wmi_unified_send_stop_11d_scan_cmd(wmi_unified_t wmi_handle,
 
 	return QDF_STATUS_E_FAILURE;
 }
-EXPORT_SYMBOL(wmi_unified_send_stop_11d_scan_cmd);
+qdf_export_symbol(wmi_unified_send_stop_11d_scan_cmd);
 
 QDF_STATUS wmi_extract_reg_11d_new_cc_event(void *wmi_hdl,
 		uint8_t *evt_buf,
@@ -92,7 +93,7 @@ QDF_STATUS wmi_extract_reg_11d_new_cc_event(void *wmi_hdl,
 
 	return QDF_STATUS_E_FAILURE;
 }
-EXPORT_SYMBOL(wmi_extract_reg_11d_new_cc_event);
+qdf_export_symbol(wmi_extract_reg_11d_new_cc_event);
 
 QDF_STATUS wmi_unified_set_user_country_code_cmd_send(void *wmi_hdl,
 		uint8_t pdev_id, struct cc_regdmn_s *rd)
@@ -105,7 +106,7 @@ QDF_STATUS wmi_unified_set_user_country_code_cmd_send(void *wmi_hdl,
 
 	return QDF_STATUS_E_FAILURE;
 }
-EXPORT_SYMBOL(wmi_unified_set_user_country_code_cmd_send);
+qdf_export_symbol(wmi_unified_set_user_country_code_cmd_send);
 
 QDF_STATUS wmi_extract_reg_ch_avoid_event(void *wmi_hdl,
 		uint8_t *evt_buf,
@@ -120,4 +121,4 @@ QDF_STATUS wmi_extract_reg_ch_avoid_event(void *wmi_hdl,
 
 	return QDF_STATUS_E_FAILURE;
 }
-EXPORT_SYMBOL(wmi_extract_reg_ch_avoid_event);
+qdf_export_symbol(wmi_extract_reg_ch_avoid_event);
diff --git a/wmi_unified_tlv.c b/wmi_unified_tlv.c
index 2f4b9df5cf..7972dac6d4 100644
--- a/wmi_unified_tlv.c
+++ b/wmi_unified_tlv.c
@@ -30,6 +30,7 @@
 #include "wmi_version.h"
 #include "wmi_unified_priv.h"
 #include "wmi_version_whitelist.h"
+#include <qdf_module.h>
 #include <wlan_defs.h>
 #include <htc_services.h>
 
@@ -23792,7 +23793,7 @@ void wmi_tlv_attach(wmi_unified_t wmi_handle)
 	populate_tlv_service(wmi_handle->services);
 	populate_target_defines_tlv(wmi_handle);
 }
-EXPORT_SYMBOL(wmi_tlv_attach);
+qdf_export_symbol(wmi_tlv_attach);
 
 /**
  * wmi_tlv_init() - Initialize WMI TLV module by registering TLV attach routine