diff --git a/wmi_unified_api.h b/wmi_unified_api.h
index a76b25a2d2..6e72fd0b06 100644
--- a/wmi_unified_api.h
+++ b/wmi_unified_api.h
@@ -787,7 +787,7 @@ QDF_STATUS wmi_extract_encrypt_decrypt_resp_params(void *wmi_hdl,
 #endif
 
 QDF_STATUS wmi_unified_p2p_go_set_beacon_ie_cmd(void *wmi_hdl,
-				    A_UINT32 vdev_id, uint8_t *p2p_ie);
+				    uint32_t vdev_id, uint8_t *p2p_ie);
 
 
 QDF_STATUS wmi_unified_set_gateway_params_cmd(void *wmi_hdl,
diff --git a/wmi_unified_param.h b/wmi_unified_param.h
index d40665f922..cd6c539c1c 100644
--- a/wmi_unified_param.h
+++ b/wmi_unified_param.h
@@ -3467,17 +3467,17 @@ struct hlp_params {
  * @action_flag: add/delete the entry
  */
 struct wmi_unified_pmk_cache {
-	A_UINT32            tlv_header;
-	A_UINT32            pmk_len;
-	A_UINT8             session_id;
-	A_UINT8             pmk[WMI_UNIFIED_MAX_PMK_LEN];
-	A_UINT32            pmkid_len;
-	A_UINT8             pmkid[WMI_UNIFIED_MAX_PMKID_LEN];
+	uint32_t            tlv_header;
+	uint32_t            pmk_len;
+	uint8_t             session_id;
+	uint8_t             pmk[WMI_UNIFIED_MAX_PMK_LEN];
+	uint32_t            pmkid_len;
+	uint8_t             pmkid[WMI_UNIFIED_MAX_PMKID_LEN];
 	wmi_host_mac_addr   bssid;
 	struct mac_ssid     ssid;
-	A_UINT32            cache_id;
-	A_UINT32            cat_flag;
-	A_UINT32            action_flag;
+	uint32_t            cache_id;
+	uint32_t            cat_flag;
+	uint32_t            action_flag;
 };
 
 
@@ -4688,7 +4688,7 @@ typedef struct {
 	/* VERSION_4 (4 wire coex) */
 	uint32_t coex_version;
 
-	/* No. of A_UINT32 elements in payload buffer. Will depend on the coex
+	/* No. of uint32_t elements in payload buffer. Will depend on the coex
 	 * version
 	 */
 	uint32_t length;
@@ -7745,7 +7745,7 @@ typedef struct {
 	uint32_t board_cal_version;
 	/* board_mcn_detail:
 	 * Provide a calibration message string for the host to display.
-	 * Note: on a big-endian host, the 4 bytes within each A_UINT32 portion
+	 * Note: on a big-endian host, the 4 bytes within each uint32_t portion
 	 * of a WMI message will be automatically byteswapped by the copy engine
 	 * as the messages are transferred between host and target, to convert
 	 * between the target's little-endianness and the host's big-endianness.
@@ -8097,7 +8097,7 @@ struct bcn_offload_control {
 struct wdsentry {
 	u_int8_t peer_mac[IEEE80211_ADDR_LEN];
 	u_int8_t wds_mac[IEEE80211_ADDR_LEN];
-	A_UINT32 flags;
+	uint32_t flags;
 };
 
 #define WMI_HOST_DBR_RING_ADDR_LO_S 0
diff --git a/wmi_unified_priv.h b/wmi_unified_priv.h
index 5a7d6bbe1b..92a6d67b8c 100644
--- a/wmi_unified_priv.h
+++ b/wmi_unified_priv.h
@@ -420,7 +420,7 @@ QDF_STATUS (*send_set_enable_disable_mcc_adaptive_scheduler_cmd)(
 		  uint32_t pdev_id);
 
 QDF_STATUS (*send_p2p_go_set_beacon_ie_cmd)(wmi_unified_t wmi_handle,
-				    A_UINT32 vdev_id, uint8_t *p2p_ie);
+				    uint32_t vdev_id, uint8_t *p2p_ie);
 
 QDF_STATUS (*send_probe_rsp_tmpl_send_cmd)(wmi_unified_t wmi_handle,
 			     uint8_t vdev_id,
@@ -537,7 +537,7 @@ QDF_STATUS (*send_process_ll_stats_get_cmd)
 
 
 QDF_STATUS (*send_congestion_cmd)(wmi_unified_t wmi_handle,
-			A_UINT8 vdev_id);
+			uint8_t vdev_id);
 
 QDF_STATUS (*send_snr_request_cmd)(wmi_unified_t wmi_handle);
 
@@ -1547,15 +1547,15 @@ QDF_STATUS (*send_invoke_neighbor_report_cmd)(wmi_unified_t wmi_handle,
 
 void (*wmi_pdev_id_conversion_enable)(wmi_unified_t wmi_handle);
 void (*send_time_stamp_sync_cmd)(wmi_unified_t wmi_handle);
-void (*wmi_free_allocated_event)(A_UINT32 cmd_event_id,
+void (*wmi_free_allocated_event)(uint32_t cmd_event_id,
 				void **wmi_cmd_struct_ptr);
 int (*wmi_check_and_pad_event)(void *os_handle, void *param_struc_ptr,
-				A_UINT32 param_buf_len,
-				A_UINT32 wmi_cmd_event_id,
+				uint32_t param_buf_len,
+				uint32_t wmi_cmd_event_id,
 				void **wmi_cmd_struct_ptr);
 int (*wmi_check_command_params)(void *os_handle, void *param_struc_ptr,
-				A_UINT32 param_buf_len,
-				A_UINT32 wmi_cmd_event_id);
+				uint32_t param_buf_len,
+				uint32_t wmi_cmd_event_id);
 QDF_STATUS (*send_bss_color_change_enable_cmd)(wmi_unified_t wmi_handle,
 					       uint32_t vdev_id,
 					       bool enable);