diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 58c0716bcb72..8d487e13024f 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -4988,7 +4988,7 @@ void __hdd_wlan_exit(void)
  *
  * Return: void
  */
-void hdd_skip_acs_scan_timer_handler(void *data)
+static void hdd_skip_acs_scan_timer_handler(void *data)
 {
 	hdd_context_t *hdd_ctx = (hdd_context_t *) data;
 
diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c
index dfbc660fa07e..37b8e270ae64 100644
--- a/core/sap/src/sap_ch_select.c
+++ b/core/sap/src/sap_ch_select.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.
  *
@@ -81,6 +81,9 @@
 		acs_band = eCSR_DOT11_MODE_abg; \
 }
 
+#define GET_IE_LEN_IN_BSS_DESC(lenInBss) (lenInBss + sizeof(lenInBss) - \
+			((uintptr_t)OFFSET_OF(tSirBssDescription, ieFields)))
+
 #ifdef FEATURE_WLAN_CH_AVOID
 sapSafeChannelType safe_channels[NUM_CHANNELS] = {
 	{1, true},
@@ -186,7 +189,7 @@ sapAcsChannelInfo acs_ht40_channels24_g[] = {
  * Return: true: if channel was added or already present
  *   else false: if channel list was already full.
  */
-bool
+static bool
 sap_check_n_add_channel(ptSapContext sap_ctx,
 			uint8_t new_channel)
 {
@@ -283,7 +286,7 @@ sap_check_n_add_overlapped_chnls(ptSapContext sap_ctx, uint8_t primary_channel)
  *
  * Return: void
  */
-void sap_process_avoid_ie(tHalHandle hal,
+static void sap_process_avoid_ie(tHalHandle hal,
 			  ptSapContext sap_ctx,
 			  tScanResultHandle scan_result,
 			  tSapChSelSpectInfo *spect_info)
diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index a3b90b87ba43..17c30618b246 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -754,7 +754,7 @@ send_fail_resp:
  *
  * Return: none
  */
-void wma_find_mcc_ap(tp_wma_handle wma, uint8_t vdev_id, bool add)
+static void wma_find_mcc_ap(tp_wma_handle wma, uint8_t vdev_id, bool add)
 {
 	uint8_t i;
 	uint16_t prev_ch_freq = 0;
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index 826d6a691486..34f29509db8a 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -1529,8 +1529,8 @@ int wma_nan_rsp_event_handler(void *handle, uint8_t *event_buf,
 	return 0;
 }
 #else
-int wma_nan_rsp_event_handler(void *handle, uint8_t *event_buf,
-			      uint32_t len)
+static int wma_nan_rsp_event_handler(void *handle, uint8_t *event_buf,
+				     uint32_t len)
 {
 	return 0;
 }