diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h
index 95ea34738c30a4d0411477a7f3072ba7d59c8fd7..e9498979212d21cdd4b5799edf9a10492110d49e 100644
--- a/system/bta/include/bta_api.h
+++ b/system/bta/include/bta_api.h
@@ -731,7 +731,6 @@ typedef void(tBTA_DM_ENCRYPT_CBACK)(const RawAddress& bd_addr,
 #define BTA_DM_BLE_SEC_NO_MITM BTM_BLE_SEC_ENCRYPT_NO_MITM
 #define BTA_DM_BLE_SEC_MITM BTM_BLE_SEC_ENCRYPT_MITM
 
-typedef tBTM_BLE_TX_TIME_MS tBTA_DM_BLE_TX_TIME_MS;
 typedef tBTM_BLE_RX_TIME_MS tBTA_DM_BLE_RX_TIME_MS;
 typedef tBTM_BLE_IDLE_TIME_MS tBTA_DM_BLE_IDLE_TIME_MS;
 
@@ -751,7 +750,7 @@ typedef uint8_t tBTA_DM_BLE_ADV_INFO_PRESENT;
 typedef uint8_t tBTA_DM_BLE_RSSI_VALUE;
 typedef uint16_t tBTA_DM_BLE_ADV_INFO_TIMESTAMP;
 
-typedef void(tBTA_BLE_ENERGY_INFO_CBACK)(tBTA_DM_BLE_TX_TIME_MS tx_time,
+typedef void(tBTA_BLE_ENERGY_INFO_CBACK)(tBTM_BLE_TX_TIME_MS tx_time,
                                          tBTA_DM_BLE_RX_TIME_MS rx_time,
                                          tBTA_DM_BLE_IDLE_TIME_MS idle_time,
                                          tBTM_BLE_ENERGY_USED energy_used,
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index fb26123b401b1cc8ca528ae00456449bfdbe9b35..5353758e947e7e493d8a46e67df92d9b0d349220 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -2166,7 +2166,7 @@ static void bte_dm_remote_service_record_evt(tBTA_DM_SEARCH_EVT event,
  * Returns          void
  *
  ******************************************************************************/
-static void bta_energy_info_cb(tBTA_DM_BLE_TX_TIME_MS tx_time,
+static void bta_energy_info_cb(tBTM_BLE_TX_TIME_MS tx_time,
                                tBTA_DM_BLE_RX_TIME_MS rx_time,
                                tBTA_DM_BLE_IDLE_TIME_MS idle_time,
                                tBTM_BLE_ENERGY_USED energy_used,