diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h
index ded5c967409d..5fe8d6bfe45f 100644
--- a/core/cds/inc/cds_api.h
+++ b/core/cds/inc/cds_api.h
@@ -43,7 +43,6 @@
 #include <qdf_event.h>
 #include <qdf_lock.h>
 #include <cds_reg_service.h>
-#include <cds_mq.h>
 #include <cds_packet.h>
 #include <cds_sched.h>
 #include <qdf_threads.h>
diff --git a/core/cds/inc/cds_mq.h b/core/cds/inc/cds_mq.h
index 5fd956399949..f6049b5a45bd 100644
--- a/core/cds/inc/cds_mq.h
+++ b/core/cds/inc/cds_mq.h
@@ -60,6 +60,5 @@
    \sa
    --------------------------------------------------------------------------*/
 
-QDF_STATUS cds_send_mb_message_to_mac(void *pBuf);
 
 #endif /* if !defined __CDS_MQ_H */
diff --git a/core/cds/src/cds_mq.c b/core/cds/src/cds_mq.c
index 985f1a6f81b2..04546b10e9ae 100644
--- a/core/cds/src/cds_mq.c
+++ b/core/cds/src/cds_mq.c
@@ -44,38 +44,3 @@
 
 /* Function declarations and documenation */
 
-tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, void *pMb);
-
-/**
- * cds_send_mb_message_to_mac() - post a message to a message queue
- * @pBuf: Pointer to buffer allocated by caller
- *
- * Return: qdf status
- */
-QDF_STATUS cds_send_mb_message_to_mac(void *pBuf)
-{
-	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
-	tSirRetStatus sirStatus;
-	v_CONTEXT_t cds_context;
-	void *hHal;
-
-	cds_context = cds_get_global_context();
-	if (NULL == cds_context) {
-		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
-			  "%s: invalid cds_context", __func__);
-	} else {
-		hHal = cds_get_context(QDF_MODULE_ID_SME);
-		if (NULL == hHal) {
-			QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
-				  "%s: invalid hHal", __func__);
-		} else {
-			sirStatus = u_mac_post_ctrl_msg(hHal, pBuf);
-			if (eSIR_SUCCESS == sirStatus)
-				qdf_ret_status = QDF_STATUS_SUCCESS;
-		}
-	}
-
-	qdf_mem_free(pBuf);
-
-	return qdf_ret_status;
-}
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 1a868894a785..7a82424178f9 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -6884,4 +6884,13 @@ struct wow_pulse_mode {
 	uint16_t                   wow_pulse_interval_low;
 };
 
+
+/**
+ * cds_send_mb_message_to_mac(): post message to umac
+ * @msg: opaque message pointer
+ *
+ * Return: QDF status
+ */
+QDF_STATUS cds_send_mb_message_to_mac(void *msg);
+
 #endif /* __SIR_API_H */
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index 91337d817fb9..3e8a332876df 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -2393,3 +2393,4 @@ QDF_STATUS lim_update_ext_cap_ie(tpAniSirGlobal mac_ctx,
 	(*local_ie_len) += DOT11F_IE_EXTCAP_MAX_LEN;
 	return QDF_STATUS_SUCCESS;
 }
+
diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c
index e8c5aa87fc94..fa4067a885c0 100644
--- a/core/sme/src/common/sme_ft_api.c
+++ b/core/sme/src/common/sme_ft_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -28,6 +28,7 @@
 #include <sms_debug.h>
 #include <csr_inside_api.h>
 #include <csr_neighbor_roam.h>
+#include <sir_api.h>
 
 /*--------------------------------------------------------------------------
    Initialize the FT context.
diff --git a/core/sme/src/csr/csr_roam_preauth.c b/core/sme/src/csr/csr_roam_preauth.c
index e6171cbc9d2f..7b89345bae8b 100644
--- a/core/sme/src/csr/csr_roam_preauth.c
+++ b/core/sme/src/csr/csr_roam_preauth.c
@@ -36,6 +36,7 @@
 #include "csr_neighbor_roam.h"
 #include "mac_trace.h"
 #include "cds_concurrency.h"
+#include "sir_api.h"
 
 static void csr_reinit_preauth_cmd(tpAniSirGlobal pMac, tSmeCmd *pCommand);
 static QDF_STATUS csr_neighbor_roam_add_preauth_fail(tpAniSirGlobal mac_ctx,
diff --git a/core/wma/src/wlan_qct_wma_legacy.c b/core/wma/src/wlan_qct_wma_legacy.c
index 14344f834b29..906c49ce5000 100644
--- a/core/wma/src/wlan_qct_wma_legacy.c
+++ b/core/wma/src/wlan_qct_wma_legacy.c
@@ -156,3 +156,29 @@ tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb)
 
 } /* u_mac_post_ctrl_msg() */
 
+/**
+ * cds_send_mb_message_to_mac() - post a message to a message queue
+ * @pBuf: Pointer to buffer allocated by caller
+ *
+ * Return: qdf status
+ */
+QDF_STATUS cds_send_mb_message_to_mac(void *pBuf)
+{
+	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
+	tSirRetStatus sirStatus;
+	void *hHal;
+
+	hHal = cds_get_context(QDF_MODULE_ID_SME);
+	if (NULL == hHal) {
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
+			  "%s: invalid hHal", __func__);
+	} else {
+		sirStatus = u_mac_post_ctrl_msg(hHal, pBuf);
+		if (eSIR_SUCCESS == sirStatus)
+			qdf_ret_status = QDF_STATUS_SUCCESS;
+	}
+
+	qdf_mem_free(pBuf);
+
+	return qdf_ret_status;
+}