diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 201f180db137..08a8df7ae539 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -3100,7 +3100,7 @@ typedef struct {
 	uint8_t event_data[];
 } tSirNanEvent, *tpSirNanEvent;
 
-typedef struct sSirSmeRoamOffloadSynchInd {
+struct roam_offload_synch_ind {
 	uint16_t messageType;   /*eWNI_SME_ROAM_OFFLOAD_SYNCH_IND */
 	uint16_t length;
 	uint16_t beaconProbeRespOffset;
@@ -3136,7 +3136,7 @@ typedef struct sSirSmeRoamOffloadSynchInd {
 	struct qdf_mac_addr src_mac;
 	uint16_t hlp_data_len;
 	uint8_t hlp_data[FILS_MAX_HLP_DATA_LEN];
-} roam_offload_synch_ind;
+};
 
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 typedef struct sSirSmeRoamOffloadSynchCnf {
diff --git a/core/mac/src/pe/include/lim_api.h b/core/mac/src/pe/include/lim_api.h
index 524c3a9b5619..fe99201f4bd8 100644
--- a/core/mac/src/pe/include/lim_api.h
+++ b/core/mac/src/pe/include/lim_api.h
@@ -225,10 +225,10 @@ extern void lim_send_sme_tdls_del_sta_ind(struct mac_context *mac, tpDphHashNode
  *
  * Return: None
  */
-void lim_set_tdls_flags(roam_offload_synch_ind *roam_sync_ind_ptr,
+void lim_set_tdls_flags(struct roam_offload_synch_ind *roam_sync_ind_ptr,
 		   struct pe_session *ft_session_ptr);
 #else
-static inline void lim_set_tdls_flags(roam_offload_synch_ind *roam_sync_ind_ptr,
+static inline void lim_set_tdls_flags(struct roam_offload_synch_ind *roam_sync_ind_ptr,
 		   struct pe_session *ft_session_ptr)
 {
 }
@@ -261,11 +261,11 @@ tMgmtFrmDropReason lim_is_pkt_candidate_for_drop(struct mac_context *mac,
 						 uint32_t subType);
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 QDF_STATUS pe_roam_synch_callback(struct mac_context *mac_ctx,
-	struct sSirSmeRoamOffloadSynchInd *roam_sync_ind_ptr,
+	struct roam_offload_synch_ind *roam_sync_ind_ptr,
 	tpSirBssDescription  bss_desc_ptr, enum sir_roam_op_code reason);
 #else
 static inline QDF_STATUS pe_roam_synch_callback(struct mac_context *mac_ctx,
-	struct sSirSmeRoamOffloadSynchInd *roam_sync_ind_ptr,
+	struct roam_offload_synch_ind *roam_sync_ind_ptr,
 	tpSirBssDescription  bss_desc_ptr, enum sir_roam_op_code reason)
 {
 	return QDF_STATUS_E_NOSUPPORT;
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index 1e335565b6bf..54062ddfee15 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -1933,7 +1933,7 @@ static void sir_parse_bcn_fixed_fields(struct mac_context *mac_ctx,
 
 static QDF_STATUS
 lim_roam_fill_bss_descr(struct mac_context *mac,
-			roam_offload_synch_ind *roam_offload_synch_ind_ptr,
+			struct roam_offload_synch_ind *roam_offload_synch_ind_ptr,
 			tpSirBssDescription  bss_desc_ptr)
 {
 	uint32_t ie_len = 0;
@@ -2090,7 +2090,7 @@ lim_roam_fill_bss_descr(struct mac_context *mac,
  * Return: None
  */
 static void lim_copy_and_free_hlp_data_from_session(struct pe_session *session_ptr,
-				    roam_offload_synch_ind *roam_sync_ind_ptr)
+				    struct roam_offload_synch_ind *roam_sync_ind_ptr)
 {
 	if (session_ptr->hlp_data && session_ptr->hlp_data_len) {
 		cds_copy_hlp_info(&session_ptr->dst_mac,
@@ -2109,7 +2109,7 @@ static void lim_copy_and_free_hlp_data_from_session(struct pe_session *session_p
 #else
 static inline void lim_copy_and_free_hlp_data_from_session(
 					struct pe_session *session_ptr,
-					roam_offload_synch_ind
+					struct roam_offload_synch_ind
 					*roam_sync_ind_ptr)
 {}
 #endif
@@ -2128,7 +2128,7 @@ static inline void lim_copy_and_free_hlp_data_from_session(
  * Return: Success or Failure status
  */
 QDF_STATUS pe_roam_synch_callback(struct mac_context *mac_ctx,
-	roam_offload_synch_ind *roam_sync_ind_ptr,
+	struct roam_offload_synch_ind *roam_sync_ind_ptr,
 	tpSirBssDescription  bss_desc, enum sir_roam_op_code reason)
 {
 	struct pe_session *session_ptr;
diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c
index cac44fe874cd..6b01e6b34977 100644
--- a/core/mac/src/pe/lim/lim_process_tdls.c
+++ b/core/mac/src/pe/lim/lim_process_tdls.c
@@ -1074,7 +1074,7 @@ wma_tx_frame_with_tx_complete_send(struct mac_context *mac, void *pPacket,
 }
 #endif
 
-void lim_set_tdls_flags(roam_offload_synch_ind *roam_sync_ind_ptr,
+void lim_set_tdls_flags(struct roam_offload_synch_ind *roam_sync_ind_ptr,
 		   struct pe_session *ft_session_ptr)
 {
 	roam_sync_ind_ptr->join_rsp->tdls_prohibited =
diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h
index 3264e66525f3..40b16cc3e62b 100644
--- a/core/sme/inc/csr_internal.h
+++ b/core/sme/inc/csr_internal.h
@@ -666,7 +666,7 @@ struct csr_roam_session {
 	uint8_t psk_pmk[SIR_ROAM_SCAN_PSK_SIZE];
 	size_t pmk_len;
 	uint8_t RoamKeyMgmtOffloadEnabled;
-	roam_offload_synch_ind *roam_synch_data;
+	struct roam_offload_synch_ind *roam_synch_data;
 	struct pmkid_mode_bits pmkid_modes;
 #endif
 	tftSMEContext ftSmeContext;
@@ -1047,18 +1047,18 @@ csr_roam_update_add_ies(struct mac_context *mac,
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(
 		struct mac_context *mac,
-		struct sSirSmeRoamOffloadSynchInd *roam_synch_ind_ptr,
+		struct roam_offload_synch_ind *roam_synch_ind_ptr,
 		tpSirBssDescription  bss_desc_ptr);
 void csr_process_ho_fail_ind(struct mac_context *mac, void *pMsgBuf);
 #endif
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
 void csr_roaming_report_diag_event(struct mac_context *mac_ctx,
-		roam_offload_synch_ind *roam_synch_ind_ptr,
+		struct roam_offload_synch_ind *roam_synch_ind_ptr,
 		enum csr_diagwlan_status_eventreason reason);
 #else
 static inline void csr_roaming_report_diag_event(
 		struct mac_context *mac_ctx,
-		roam_offload_synch_ind *roam_synch_ind_ptr,
+		struct roam_offload_synch_ind *roam_synch_ind_ptr,
 		enum csr_diagwlan_status_eventreason reason)
 {}
 #endif
diff --git a/core/sme/inc/csr_neighbor_roam.h b/core/sme/inc/csr_neighbor_roam.h
index 45b649188821..4c81b2f899de 100644
--- a/core/sme/inc/csr_neighbor_roam.h
+++ b/core/sme/inc/csr_neighbor_roam.h
@@ -359,11 +359,11 @@ QDF_STATUS csr_roam_read_tsf(struct mac_context *mac, uint8_t *pTimestamp,
 #endif /* FEATURE_WLAN_ESE */
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 QDF_STATUS csr_roam_synch_callback(struct mac_context *mac,
-	roam_offload_synch_ind *roam_synch_data,
+	struct roam_offload_synch_ind *roam_synch_data,
 	tpSirBssDescription  bss_desc_ptr, enum sir_roam_op_code reason);
 #else
 static inline QDF_STATUS csr_roam_synch_callback(struct mac_context *mac,
-	roam_offload_synch_ind *roam_synch_data,
+	struct roam_offload_synch_ind *roam_synch_data,
 	tpSirBssDescription  bss_desc_ptr, enum sir_roam_op_code reason)
 {
 	return QDF_STATUS_E_NOSUPPORT;
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 68710c4ea171..47ec13dacbec 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -19941,7 +19941,7 @@ QDF_STATUS csr_roam_send_chan_sw_ie_request(struct mac_context *mac_ctx,
  * Return: None
  */
 void csr_roaming_report_diag_event(struct mac_context *mac_ctx,
-		roam_offload_synch_ind *roam_synch_ind_ptr,
+		struct roam_offload_synch_ind *roam_synch_ind_ptr,
 		enum csr_diagwlan_status_eventreason reason)
 {
 	WLAN_HOST_DIAG_EVENT_DEF(roam_connection,
@@ -20583,7 +20583,7 @@ void csr_roam_fill_tdls_info(struct mac_context *mac_ctx,
 
 #if defined(WLAN_FEATURE_FILS_SK) && defined(WLAN_FEATURE_ROAM_OFFLOAD)
 static void csr_copy_fils_join_rsp_roam_info(struct csr_roam_info *roam_info,
-				      roam_offload_synch_ind *roam_synch_data)
+				      struct roam_offload_synch_ind *roam_synch_data)
 {
 	struct fils_join_rsp_params *roam_fils_info;
 
@@ -20604,13 +20604,13 @@ static void csr_copy_fils_join_rsp_roam_info(struct csr_roam_info *roam_info,
 #else
 static inline
 void csr_copy_fils_join_rsp_roam_info(struct csr_roam_info *roam_info,
-				      roam_offload_synch_ind *roam_synch_data)
+				      struct roam_offload_synch_ind *roam_synch_data)
 {}
 #endif
 
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx,
-		roam_offload_synch_ind *roam_synch_data,
+		struct roam_offload_synch_ind *roam_synch_data,
 		tpSirBssDescription bss_desc, enum sir_roam_op_code reason)
 {
 	uint8_t session_id = roam_synch_data->roamedVdevId;
@@ -21015,7 +21015,7 @@ static QDF_STATUS csr_process_roam_sync_callback(struct mac_context *mac_ctx,
  * Return: Success or Failure.
  */
 QDF_STATUS csr_roam_synch_callback(struct mac_context *mac_ctx,
-		roam_offload_synch_ind *roam_synch_data,
+		struct roam_offload_synch_ind *roam_synch_data,
 		tpSirBssDescription  bss_desc, enum sir_roam_op_code reason)
 {
 	QDF_STATUS status;
diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c
index 5739db2969dc..acf40eba1356 100644
--- a/core/sme/src/csr/csr_api_scan.c
+++ b/core/sme/src/csr/csr_api_scan.c
@@ -1850,7 +1850,7 @@ void update_cckmtsf(uint32_t *timeStamp0, uint32_t *timeStamp1,
  */
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(struct mac_context *mac,
-				roam_offload_synch_ind *roam_sync_ind_ptr,
+				struct roam_offload_synch_ind *roam_sync_ind_ptr,
 				tpSirBssDescription  bss_desc_ptr)
 {
 	uint32_t length = 0;
diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h
index bd71abdd9608..ed023e245773 100644
--- a/core/wma/inc/wma.h
+++ b/core/wma/inc/wma.h
@@ -1202,11 +1202,11 @@ typedef struct {
 	qdf_mc_timer_t service_ready_ext_timer;
 
 	QDF_STATUS (*csr_roam_synch_cb)(struct mac_context *mac,
-		roam_offload_synch_ind *roam_synch_data,
+		struct roam_offload_synch_ind *roam_synch_data,
 		tpSirBssDescription  bss_desc_ptr,
 		enum sir_roam_op_code reason);
 	QDF_STATUS (*pe_roam_synch_cb)(struct mac_context *mac,
-		roam_offload_synch_ind *roam_synch_data,
+		struct roam_offload_synch_ind *roam_synch_data,
 		tpSirBssDescription  bss_desc_ptr,
 		enum sir_roam_op_code reason);
 	qdf_wake_lock_t wmi_cmd_rsp_wake_lock;
diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h
index fbe50c60b166..531687747d84 100644
--- a/core/wma/inc/wma_types.h
+++ b/core/wma/inc/wma_types.h
@@ -758,21 +758,21 @@ QDF_STATUS wma_de_register_mgmt_frm_client(void);
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 QDF_STATUS wma_register_roaming_callbacks(
 		QDF_STATUS (*csr_roam_synch_cb)(struct mac_context *mac,
-			roam_offload_synch_ind *roam_synch_data,
+			struct roam_offload_synch_ind *roam_synch_data,
 			tpSirBssDescription  bss_desc_ptr,
 			enum sir_roam_op_code reason),
 		QDF_STATUS (*pe_roam_synch_cb)(struct mac_context *mac,
-			roam_offload_synch_ind *roam_synch_data,
+			struct roam_offload_synch_ind *roam_synch_data,
 			tpSirBssDescription  bss_desc_ptr,
 			enum sir_roam_op_code reason));
 #else
 static inline QDF_STATUS wma_register_roaming_callbacks(
 		QDF_STATUS (*csr_roam_synch_cb)(struct mac_context *mac,
-			roam_offload_synch_ind *roam_synch_data,
+			struct roam_offload_synch_ind *roam_synch_data,
 			tpSirBssDescription  bss_desc_ptr,
 			enum sir_roam_op_code reason),
 		QDF_STATUS (*pe_roam_synch_cb)(struct mac_context *mac,
-			roam_offload_synch_ind *roam_synch_data,
+			struct roam_offload_synch_ind *roam_synch_data,
 			tpSirBssDescription  bss_desc_ptr,
 			enum sir_roam_op_code reason))
 {
diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c
index e8222c6cec7c..b7491227ca10 100644
--- a/core/wma/src/wma_mgmt.c
+++ b/core/wma/src/wma_mgmt.c
@@ -4365,11 +4365,11 @@ QDF_STATUS wma_de_register_mgmt_frm_client(void)
  */
 QDF_STATUS wma_register_roaming_callbacks(
 	QDF_STATUS (*csr_roam_synch_cb)(struct mac_context *mac,
-		roam_offload_synch_ind *roam_synch_data,
+		struct roam_offload_synch_ind *roam_synch_data,
 		tpSirBssDescription  bss_desc_ptr,
 		enum sir_roam_op_code reason),
 	QDF_STATUS (*pe_roam_synch_cb)(struct mac_context *mac,
-		roam_offload_synch_ind *roam_synch_data,
+		struct roam_offload_synch_ind *roam_synch_data,
 		tpSirBssDescription  bss_desc_ptr,
 		enum sir_roam_op_code reason))
 {
diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c
index c7b9f6f1f9ca..dbca6a418d60 100644
--- a/core/wma/src/wma_scan_roam.c
+++ b/core/wma/src/wma_scan_roam.c
@@ -2077,7 +2077,7 @@ static void wma_free_roam_synch_frame_ind(struct wma_txrx_node *iface)
  * Return: None
  */
 static void wma_fill_data_synch_frame_event(tp_wma_handle wma,
-				roam_offload_synch_ind *roam_synch_ind_ptr,
+				struct roam_offload_synch_ind *roam_synch_ind_ptr,
 				struct wma_txrx_node *iface)
 {
 	uint8_t *bcn_probersp_ptr;
@@ -2086,7 +2086,7 @@ static void wma_fill_data_synch_frame_event(tp_wma_handle wma,
 
 	/* Beacon/Probe Rsp data */
 	roam_synch_ind_ptr->beaconProbeRespOffset =
-		sizeof(roam_offload_synch_ind);
+		sizeof(struct roam_offload_synch_ind);
 	bcn_probersp_ptr = (uint8_t *) roam_synch_ind_ptr +
 		roam_synch_ind_ptr->beaconProbeRespOffset;
 	roam_synch_ind_ptr->beaconProbeRespLength =
@@ -2099,7 +2099,7 @@ static void wma_fill_data_synch_frame_event(tp_wma_handle wma,
 
 	/* ReAssoc Rsp data */
 	roam_synch_ind_ptr->reassocRespOffset =
-		sizeof(roam_offload_synch_ind) +
+		sizeof(struct roam_offload_synch_ind) +
 		roam_synch_ind_ptr->beaconProbeRespLength;
 	roam_synch_ind_ptr->reassocRespLength =
 		iface->roam_synch_frame_ind.reassoc_rsp_len;
@@ -2113,7 +2113,7 @@ static void wma_fill_data_synch_frame_event(tp_wma_handle wma,
 
 	/* ReAssoc Req data */
 	roam_synch_ind_ptr->reassoc_req_offset =
-		sizeof(roam_offload_synch_ind) +
+		sizeof(struct roam_offload_synch_ind) +
 		roam_synch_ind_ptr->beaconProbeRespLength +
 		roam_synch_ind_ptr->reassocRespLength;
 	roam_synch_ind_ptr->reassoc_req_length =
@@ -2142,7 +2142,7 @@ static void wma_fill_data_synch_frame_event(tp_wma_handle wma,
  * Return: None
  */
 static void wma_fill_data_synch_event(tp_wma_handle wma,
-				roam_offload_synch_ind *roam_synch_ind_ptr,
+				struct roam_offload_synch_ind *roam_synch_ind_ptr,
 				WMI_ROAM_SYNCH_EVENTID_param_tlvs *param_buf)
 {
 	uint8_t *bcn_probersp_ptr;
@@ -2154,7 +2154,7 @@ static void wma_fill_data_synch_event(tp_wma_handle wma,
 
 	/* Beacon/Probe Rsp data */
 	roam_synch_ind_ptr->beaconProbeRespOffset =
-		sizeof(roam_offload_synch_ind);
+		sizeof(struct roam_offload_synch_ind);
 	bcn_probersp_ptr = (uint8_t *) roam_synch_ind_ptr +
 		roam_synch_ind_ptr->beaconProbeRespOffset;
 	roam_synch_ind_ptr->beaconProbeRespLength =
@@ -2163,7 +2163,7 @@ static void wma_fill_data_synch_event(tp_wma_handle wma,
 		     roam_synch_ind_ptr->beaconProbeRespLength);
 	/* ReAssoc Rsp data */
 	roam_synch_ind_ptr->reassocRespOffset =
-		sizeof(roam_offload_synch_ind) +
+		sizeof(struct roam_offload_synch_ind) +
 		roam_synch_ind_ptr->beaconProbeRespLength;
 	roam_synch_ind_ptr->reassocRespLength = synch_event->reassoc_rsp_len;
 	reassoc_rsp_ptr = (uint8_t *) roam_synch_ind_ptr +
@@ -2174,7 +2174,7 @@ static void wma_fill_data_synch_event(tp_wma_handle wma,
 
 	/* ReAssoc Req data */
 	roam_synch_ind_ptr->reassoc_req_offset =
-		sizeof(roam_offload_synch_ind) +
+		sizeof(struct roam_offload_synch_ind) +
 		roam_synch_ind_ptr->beaconProbeRespLength +
 		roam_synch_ind_ptr->reassocRespLength;
 	roam_synch_ind_ptr->reassoc_req_length = synch_event->reassoc_req_len;
@@ -2198,7 +2198,7 @@ static void wma_fill_data_synch_event(tp_wma_handle wma,
  * Return: Success or Failure
  */
 static int wma_fill_roam_synch_buffer(tp_wma_handle wma,
-				roam_offload_synch_ind *roam_synch_ind_ptr,
+				struct roam_offload_synch_ind *roam_synch_ind_ptr,
 				WMI_ROAM_SYNCH_EVENTID_param_tlvs *param_buf)
 {
 	wmi_roam_synch_event_fixed_param *synch_event;
@@ -2332,7 +2332,7 @@ static int wma_fill_roam_synch_buffer(tp_wma_handle wma,
  * Return: None
  */
 static void wma_roam_update_vdev(tp_wma_handle wma,
-				 roam_offload_synch_ind *roam_synch_ind_ptr)
+				 struct roam_offload_synch_ind *roam_synch_ind_ptr)
 {
 	tDeleteBssParams *del_bss_params;
 	tDeleteStaParams *del_sta_params;
@@ -2401,7 +2401,7 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event,
 	WMI_ROAM_SYNCH_EVENTID_param_tlvs *param_buf = NULL;
 	wmi_roam_synch_event_fixed_param *synch_event = NULL;
 	tp_wma_handle wma = (tp_wma_handle) handle;
-	roam_offload_synch_ind *roam_synch_ind_ptr = NULL;
+	struct roam_offload_synch_ind *roam_synch_ind_ptr = NULL;
 	tpSirBssDescription  bss_desc_ptr = NULL;
 	uint8_t channel;
 	uint16_t ie_len = 0;
@@ -2500,7 +2500,7 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event,
 				      roam_synch_frame_ind.reassoc_rsp_len;
 
 		roam_synch_data_len = bcn_probe_rsp_len + reassoc_rsp_len +
-			reassoc_req_len + sizeof(roam_offload_synch_ind);
+			reassoc_req_len + sizeof(struct roam_offload_synch_ind);
 
 		WMA_LOGD("Updated synch payload: LEN bcn:%d, req:%d, rsp:%d",
 			bcn_probe_rsp_len,
@@ -2533,7 +2533,7 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event,
 			 sizeof(wmi_key_material) + sizeof(uint32_t)))
 			goto cleanup_label;
 
-		roam_synch_data_len += sizeof(roam_offload_synch_ind);
+		roam_synch_data_len += sizeof(struct roam_offload_synch_ind);
 	}
 
 	WMA_LOGD("synch payload: LEN bcn:%d, req:%d, rsp:%d",
@@ -4923,7 +4923,7 @@ int wma_roam_event_callback(WMA_HANDLE handle, uint8_t *event_buf,
 	tp_wma_handle wma_handle = (tp_wma_handle) handle;
 	WMI_ROAM_EVENTID_param_tlvs *param_buf;
 	wmi_roam_event_fixed_param *wmi_event;
-	struct sSirSmeRoamOffloadSynchInd *roam_synch_data;
+	struct roam_offload_synch_ind *roam_synch_data;
 	enum sir_roam_op_code op_code = {0};
 
 	param_buf = (WMI_ROAM_EVENTID_param_tlvs *) event_buf;