diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 35b7534ef8..6172ba80a6 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -20337,7 +20337,8 @@ csr_cm_fill_rso_channel_list(struct mac_context *mac_ctx,
 		  rso_chan_info->chan_count, ch_cache_str);
 }
 
-#if defined(WLAN_SAE_SINGLE_PMK) && defined(WLAN_FEATURE_ROAM_OFFLOAD)
+#ifdef WLAN_FEATURE_ROAM_OFFLOAD
+#ifdef WLAN_SAE_SINGLE_PMK
 static bool
 csr_cm_fill_rso_sae_single_pmk_info(struct mac_context *mac_ctx,
 				    struct wlan_rso_11i_params *rso_11i_info,
@@ -20383,7 +20384,8 @@ csr_cm_fill_rso_sae_single_pmk_info(struct mac_context *mac_ctx,
 {
 	return false;
 }
-#endif /* WLAN_SAE_SINGLE_PMK && WLAN_FEATURE_ROAM_OFFLOAD */
+#endif
+#endif
 
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 #define RSN_CAPS_SHIFT 16
diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c
index a677c5463a..d2021f8581 100644
--- a/core/wma/src/wma_scan_roam.c
+++ b/core/wma/src/wma_scan_roam.c
@@ -343,8 +343,8 @@ static void wma_handle_disconnect_reason(tp_wma_handle wma_handle,
 		     (void *)del_sta_ctx, 0);
 }
 
-#ifdef WLAN_FEATURE_ROAM_OFFLOAD
 #ifndef ROAM_OFFLOAD_V1
+#ifdef WLAN_FEATURE_ROAM_OFFLOAD
 /**
  * wma_roam_scan_offload_set_params() - Set roam scan offload params
  * @wma_handle: pointer to wma context
@@ -408,8 +408,16 @@ static void wma_roam_scan_offload_set_params(
 		 params->roam_offload_params.roam_preauth_no_ack_timeout,
 		 params->is_sae_same_pmk);
 }
+#else
+static inline void
+wma_roam_scan_offload_set_params(tp_wma_handle wma_handle,
+				 struct roam_offload_scan_params *params,
+				 struct roam_offload_scan_req *roam_req)
+{}
+#endif
 #endif
 
+#ifdef WLAN_FEATURE_ROAM_OFFLOAD
 int wma_roam_vdev_disconnect_event_handler(void *handle, uint8_t *event,
 					   uint32_t len)
 {
@@ -452,12 +460,6 @@ int wma_roam_vdev_disconnect_event_handler(void *handle, uint8_t *event,
 
 	return 0;
 }
-#else
-static inline void
-wma_roam_scan_offload_set_params(tp_wma_handle wma_handle,
-				 struct roam_offload_scan_params *params,
-				 struct roam_offload_scan_req *roam_req)
-{}
 #endif
 
 #ifndef ROAM_OFFLOAD_V1