diff --git a/global_lmac_if/src/wlan_global_lmac_if.c b/global_lmac_if/src/wlan_global_lmac_if.c
index cb0b26d2b2..ab4149848d 100644
--- a/global_lmac_if/src/wlan_global_lmac_if.c
+++ b/global_lmac_if/src/wlan_global_lmac_if.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
  *
  *
  * Permission to use, copy, modify, and/or distribute this software for
@@ -18,6 +18,7 @@
  */
 
 #include "qdf_mem.h"
+#include "qdf_module.h"
 #include "wlan_lmac_if_def.h"
 #include "wlan_lmac_if_api.h"
 #include "wlan_global_lmac_if_api.h"
@@ -38,7 +39,7 @@ QDF_STATUS wlan_lmac_if_sptrl_set_rx_ops_register_cb(void (*handler)
 
 	return QDF_STATUS_SUCCESS;
 }
-EXPORT_SYMBOL(wlan_lmac_if_sptrl_set_rx_ops_register_cb);
+qdf_export_symbol(wlan_lmac_if_sptrl_set_rx_ops_register_cb);
 #endif /* WLAN_CONV_SPECTRAL_ENABLE */
 
 /*
@@ -136,7 +137,7 @@ QDF_STATUS wlan_global_lmac_if_open(struct wlan_objmgr_psoc *psoc)
 
 	return QDF_STATUS_SUCCESS;
 }
-EXPORT_SYMBOL(wlan_global_lmac_if_open);
+qdf_export_symbol(wlan_global_lmac_if_open);
 
 /**
  * wlan_global_lmac_if_close() - Close global lmac_if
@@ -153,7 +154,7 @@ QDF_STATUS wlan_global_lmac_if_close(struct wlan_objmgr_psoc *psoc)
 
 	return QDF_STATUS_SUCCESS;
 }
-EXPORT_SYMBOL(wlan_global_lmac_if_close);
+qdf_export_symbol(wlan_global_lmac_if_close);
 
 /**
  * wlan_global_lmac_if_set_txops_registration_cb() - tx
@@ -173,4 +174,4 @@ QDF_STATUS wlan_global_lmac_if_set_txops_registration_cb(WLAN_DEV_TYPE dev_type,
 
 	return QDF_STATUS_SUCCESS;
 }
-EXPORT_SYMBOL(wlan_global_lmac_if_set_txops_registration_cb);
+qdf_export_symbol(wlan_global_lmac_if_set_txops_registration_cb);
diff --git a/init_deinit/dispatcher/src/dispatcher_init_deinit.c b/init_deinit/dispatcher/src/dispatcher_init_deinit.c
index 852e46cb50..6eb06b6ba9 100644
--- a/init_deinit/dispatcher/src/dispatcher_init_deinit.c
+++ b/init_deinit/dispatcher/src/dispatcher_init_deinit.c
@@ -19,6 +19,7 @@
 #include <qdf_types.h>
 #include <qdf_trace.h>
 #include <qdf_threads.h>
+#include <qdf_module.h>
 #include <dispatcher_init_deinit.h>
 #include <scheduler_api.h>
 #include <wlan_scan_ucfg_api.h>
@@ -290,7 +291,7 @@ QDF_STATUS dispatcher_register_spectral_pdev_open_handler(
 
 	return QDF_STATUS_SUCCESS;
 }
-EXPORT_SYMBOL(dispatcher_register_spectral_pdev_open_handler);
+qdf_export_symbol(dispatcher_register_spectral_pdev_open_handler);
 
 static QDF_STATUS dispatcher_spectral_pdev_open(struct wlan_objmgr_pdev
 						  *pdev)
@@ -929,7 +930,7 @@ mgmt_txrx_init_fail:
 out:
 	return QDF_STATUS_E_FAILURE;
 }
-EXPORT_SYMBOL(dispatcher_init);
+qdf_export_symbol(dispatcher_init);
 
 QDF_STATUS dispatcher_deinit(void)
 {
@@ -979,7 +980,7 @@ QDF_STATUS dispatcher_deinit(void)
 
 	return QDF_STATUS_SUCCESS;
 }
-EXPORT_SYMBOL(dispatcher_deinit);
+qdf_export_symbol(dispatcher_deinit);
 
 QDF_STATUS dispatcher_enable(void)
 {
@@ -989,7 +990,7 @@ QDF_STATUS dispatcher_enable(void)
 
 	return status;
 }
-EXPORT_SYMBOL(dispatcher_enable);
+qdf_export_symbol(dispatcher_enable);
 
 QDF_STATUS dispatcher_disable(void)
 {
@@ -997,7 +998,7 @@ QDF_STATUS dispatcher_disable(void)
 
 	return QDF_STATUS_SUCCESS;
 }
-EXPORT_SYMBOL(dispatcher_disable);
+qdf_export_symbol(dispatcher_disable);
 
 QDF_STATUS dispatcher_psoc_open(struct wlan_objmgr_psoc *psoc)
 {
@@ -1055,7 +1056,7 @@ scan_psoc_open_fail:
 out:
 	return QDF_STATUS_E_FAILURE;
 }
-EXPORT_SYMBOL(dispatcher_psoc_open);
+qdf_export_symbol(dispatcher_psoc_open);
 
 QDF_STATUS dispatcher_psoc_close(struct wlan_objmgr_psoc *psoc)
 {
@@ -1081,7 +1082,7 @@ QDF_STATUS dispatcher_psoc_close(struct wlan_objmgr_psoc *psoc)
 
 	return QDF_STATUS_SUCCESS;
 }
-EXPORT_SYMBOL(dispatcher_psoc_close);
+qdf_export_symbol(dispatcher_psoc_close);
 
 QDF_STATUS dispatcher_psoc_enable(struct wlan_objmgr_psoc *psoc)
 {
@@ -1144,7 +1145,7 @@ p2p_psoc_enable_fail:
 out:
 	return QDF_STATUS_E_FAILURE;
 }
-EXPORT_SYMBOL(dispatcher_psoc_enable);
+qdf_export_symbol(dispatcher_psoc_enable);
 
 QDF_STATUS dispatcher_psoc_disable(struct wlan_objmgr_psoc *psoc)
 {
@@ -1173,7 +1174,7 @@ QDF_STATUS dispatcher_psoc_disable(struct wlan_objmgr_psoc *psoc)
 
 	return QDF_STATUS_SUCCESS;
 }
-EXPORT_SYMBOL(dispatcher_psoc_disable);
+qdf_export_symbol(dispatcher_psoc_disable);
 
 QDF_STATUS dispatcher_pdev_open(struct wlan_objmgr_pdev *pdev)
 {
@@ -1194,7 +1195,7 @@ spectral_pdev_open_fail:
 out:
 	return QDF_STATUS_E_FAILURE;
 }
-EXPORT_SYMBOL(dispatcher_pdev_open);
+qdf_export_symbol(dispatcher_pdev_open);
 
 QDF_STATUS dispatcher_pdev_close(struct wlan_objmgr_pdev *pdev)
 {
@@ -1206,4 +1207,4 @@ QDF_STATUS dispatcher_pdev_close(struct wlan_objmgr_pdev *pdev)
 
 	return QDF_STATUS_SUCCESS;
 }
-EXPORT_SYMBOL(dispatcher_pdev_close);
+qdf_export_symbol(dispatcher_pdev_close);
diff --git a/os_if/linux/spectral/src/os_if_spectral_netlink.c b/os_if/linux/spectral/src/os_if_spectral_netlink.c
index 8a6c3898fc..8e56141a18 100644
--- a/os_if/linux/spectral/src/os_if_spectral_netlink.c
+++ b/os_if/linux/spectral/src/os_if_spectral_netlink.c
@@ -22,6 +22,7 @@
 #include <spectral_defs_i.h>
 #include <wlan_nlink_srv.h>
 #include <wlan_nlink_common.h>
+#include <qdf_module.h>
 #ifdef CNSS_GENL
 #include <net/cnss_nl.h>
 #endif
@@ -462,7 +463,7 @@ os_if_spectral_netlink_init(struct wlan_objmgr_pdev *pdev)
 	if (sptrl_ctx->sptrlc_register_netlink_cb)
 		sptrl_ctx->sptrlc_register_netlink_cb(pdev, &nl_cb);
 }
-EXPORT_SYMBOL(os_if_spectral_netlink_init);
+qdf_export_symbol(os_if_spectral_netlink_init);
 
 void os_if_spectral_netlink_deinit(struct wlan_objmgr_pdev *pdev)
 {
@@ -485,4 +486,4 @@ void os_if_spectral_netlink_deinit(struct wlan_objmgr_pdev *pdev)
 
 	os_if_spectral_destroy_netlink(pdev);
 }
-EXPORT_SYMBOL(os_if_spectral_netlink_deinit);
+qdf_export_symbol(os_if_spectral_netlink_deinit);
diff --git a/utils/logging/src/wlan_roam_debug.c b/utils/logging/src/wlan_roam_debug.c
index 110827b82f..5032e25bb8 100644
--- a/utils/logging/src/wlan_roam_debug.c
+++ b/utils/logging/src/wlan_roam_debug.c
@@ -25,6 +25,7 @@
 #include <qdf_mem.h>
 #include <qdf_time.h>
 #include <qdf_trace.h>
+#include <qdf_module.h>
 #include <wlan_cmn.h>
 #include "wlan_roam_debug.h"
 
@@ -94,7 +95,7 @@ void wlan_roam_debug_log(uint8_t vdev_id, uint8_t op,
 	rec->arg1 = arg1;
 	rec->arg2 = arg2;
 }
-EXPORT_SYMBOL(wlan_roam_debug_log);
+qdf_export_symbol(wlan_roam_debug_log);
 
 /**
  * wlan_roam_debug_string() - convert operation value to printable string
@@ -203,7 +204,7 @@ void wlan_roam_debug_dump_table(void)
 			  dbg_rec->arg1, dbg_rec->arg2);
 	} while (i != current_index);
 }
-EXPORT_SYMBOL(global_wlan_roam_debug_table);
+qdf_export_symbol(global_wlan_roam_debug_table);