diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index eb035fc1e4a4..e367fe9c395d 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -478,7 +478,7 @@ void lim_ft_prepare_add_bss_req(tpAniSirGlobal pMac,
 }
 #endif
 
-#ifdef WLAN_FEATURE_ROAM_OFFLOAD
+#if defined(WLAN_FEATURE_ROAM_OFFLOAD)
 /**
  * lim_fill_dot11mode() - to fill 802.11 mode in FT session
  * @mac_ctx: pointer to mac ctx
@@ -505,7 +505,7 @@ static void lim_fill_dot11mode(tpAniSirGlobal mac_ctx,
 		pftSessionEntry->dot11mode = self_dot11_mode;
 	}
 }
-#else
+#elif defined(WLAN_FEATURE_HOST_ROAM)
 /**
  * lim_fill_dot11mode() - to fill 802.11 mode in FT session
  * @mac_ctx: pointer to mac ctx
diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h
index 6d73c2c3ca0a..18501e231f13 100644
--- a/core/sme/inc/csr_api.h
+++ b/core/sme/inc/csr_api.h
@@ -91,9 +91,7 @@ typedef enum {
 	eCSR_ENCRYPT_TYPE_WPI,
 #endif  /* FEATURE_WLAN_WAPI */
 	eCSR_ENCRYPT_TYPE_KRK,
-#ifdef WLAN_FEATURE_ROAM_OFFLOAD
 	eCSR_ENCRYPT_TYPE_BTK,
-#endif
 #ifdef WLAN_FEATURE_11W
 	/* 11w BIP */
 	eCSR_ENCRYPT_TYPE_AES_CMAC,
diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h
index c82cb453331f..d390ceac4cc0 100644
--- a/core/sme/inc/sme_api.h
+++ b/core/sme/inc/sme_api.h
@@ -1551,6 +1551,8 @@ QDF_STATUS sme_get_beacon_frm(tHalHandle hal, tCsrRoamProfile *profile,
 			    const tSirMacAddr bssid,
 			    uint8_t **frame_buf, uint32_t *frame_len,
 			    int *channel);
+
+#ifdef WLAN_FEATURE_ROAM_OFFLOAD
 /**
  * sme_fast_reassoc() - invokes FAST REASSOC command
  * @hal: handle returned by mac_open
@@ -1565,7 +1567,7 @@ QDF_STATUS sme_get_beacon_frm(tHalHandle hal, tCsrRoamProfile *profile,
 QDF_STATUS sme_fast_reassoc(tHalHandle hal, tCsrRoamProfile *profile,
 			    const tSirMacAddr bssid, int channel,
 			    uint8_t vdev_id, const tSirMacAddr connected_bssid);
-
+#endif
 /**
  * sme_congestion_register_callback(): registers congestion callback
  * @hal: handler for HAL
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 999afbb08b6f..d8d2cde60d7a 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -15117,6 +15117,7 @@ free_scan_flter:
 	return status;
 }
 
+#ifdef WLAN_FEATURE_ROAM_OFFLOAD
 QDF_STATUS sme_fast_reassoc(tHalHandle hal, tCsrRoamProfile *profile,
 			    const tSirMacAddr bssid, int channel,
 			    uint8_t vdev_id, const tSirMacAddr connected_bssid)
@@ -15183,6 +15184,7 @@ QDF_STATUS sme_fast_reassoc(tHalHandle hal, tCsrRoamProfile *profile,
 
 	return status;
 }
+#endif
 
 QDF_STATUS sme_set_del_pmkid_cache(tHalHandle hal, uint8_t session_id,
 				   tPmkidCacheInfo *pmk_cache_info,
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 122bdb7503bc..155c250a87dd 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -1900,6 +1900,8 @@ QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac,
 	return status;
 }
 
+
+#if defined(WLAN_FEATURE_HOST_ROAM) || defined(WLAN_FEATURE_ROAM_OFFLOAD)
 /**
  * csr_fetch_ch_lst_from_received_list() - fetch channel list from received list
  * and update req msg
@@ -1975,6 +1977,7 @@ csr_fetch_ch_lst_from_received_list(tpAniSirGlobal mac_ctx,
 	req_buf->ConnectedNetwork.ChannelCount = num_channels;
 	req_buf->ChannelCacheType = CHANNEL_LIST_DYNAMIC_UPDATE;
 }
+#endif
 
 /**
  * csr_set_cckm_ie() - set CCKM IE
diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index 3568d0c30e0f..26ee4b3f7b8c 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -5161,7 +5161,8 @@ static void wma_wait_tx_complete(tp_wma_handle wma,
 	}
 }
 #else
-static void wma_wait_tx_complete(tp_wma_handle wma)
+static void wma_wait_tx_complete(tp_wma_handle wma,
+				 uint32_t session_id)
 {
 }
 #endif