system/bta: Apply clang-tidy fixes

Bug: 374984156
Test: m libbt-bta-tidy
Test: m com.android.btservices
Flag: EXEMPT, no logical change
Change-Id: I8bbe181731b5cc69f6a9de5dfd2d9ef332ecde8d

77 files changed, 761 insertions, 136 deletions

diff --git a/.clang-tidy b/.clang-tidy
index 9dc029bd56..a11ef26d94 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -9,10 +9,12 @@ CheckOptions:
         sys/endian.h|\
         sys/ioctl.h|\
         arpa/inet.h|\
+        linux/time.h|\
         linux/if.h|\
         linux/sockios.h|\
         netinet/in.h|\
         osi/include/compat.h|\
         android_bluetooth_sysprop.h|\
         hfp.sysprop.h|\
+        enums.pb.h|\
         __chrono/duration.h)"
diff --git a/system/bta/ag/bta_ag_act.cc b/system/bta/ag/bta_ag_act.cc
index 32b19fc970..11a9de4c48 100644
--- a/system/bta/ag/bta_ag_act.cc
+++ b/system/bta/ag/bta_ag_act.cc
@@ -28,14 +28,21 @@
 #include <cstdint>
 #include <cstring>
 
+#include "ag/bta_ag_at.h"
 #include "bta/ag/bta_ag_int.h"
 #include "bta/include/bta_dm_api.h"
 #include "bta/include/bta_hfp_api.h"
+#include "bta_ag_api.h"
 #include "bta_ag_swb_aptx.h"
-#include "internal_include/bt_trace.h"
+#include "bta_api.h"
+#include "bta_sys.h"
+#include "btm_api_types.h"
+#include "device/include/device_iot_conf_defs.h"
+#include "osi/include/alarm.h"
+#include "sdp_status.h"
+#include "types/bt_transport.h"
 
 #ifdef __ANDROID__
-#include "bta/le_audio/devices.h"
 #endif
 
 #include "btif/include/btif_config.h"
diff --git a/system/bta/ag/bta_ag_api.cc b/system/bta/ag/bta_ag_api.cc
index 6213846985..76c69dee57 100644
--- a/system/bta/ag/bta_ag_api.cc
+++ b/system/bta/ag/bta_ag_api.cc
@@ -32,9 +32,13 @@
 
 #include <cstdint>
 #include <cstring>
+#include <string>
 #include <vector>
 
 #include "bta/ag/bta_ag_int.h"
+#include "bta_api.h"
+#include "bta_api_data_types.h"
+#include "bta_sys.h"
 #include "stack/include/main_thread.h"
 #include "types/raw_address.h"
 
diff --git a/system/bta/ag/bta_ag_at.cc b/system/bta/ag/bta_ag_at.cc
index 8b1e3c6792..4f556c1f5a 100644
--- a/system/bta/ag/bta_ag_at.cc
+++ b/system/bta/ag/bta_ag_at.cc
@@ -30,10 +30,10 @@
 
 #include <cstdint>
 #include <cstdlib>
+#include <cstring>
 
 #include "bta/ag/bta_ag_int.h"
 #include "bta/include/utl.h"
-#include "internal_include/bt_target.h"
 #include "osi/include/allocator.h"
 
 using namespace bluetooth;
diff --git a/system/bta/ag/bta_ag_cfg.cc b/system/bta/ag/bta_ag_cfg.cc
index 6d803327a5..5863070dd1 100644
--- a/system/bta/ag/bta_ag_cfg.cc
+++ b/system/bta/ag/bta_ag_cfg.cc
@@ -25,8 +25,8 @@
 
 #include "bta/ag/bta_ag_int.h"
 #include "bta/include/bta_ag_api.h"
+#include "btm_api_types.h"
 #include "device/include/esco_parameters.h"
-#include "internal_include/bt_target.h"
 
 /* Set the CIND to match HFP 1.5 */
 #define BTA_AG_CIND_INFO                                                       \
diff --git a/system/bta/ag/bta_ag_cmd.cc b/system/bta/ag/bta_ag_cmd.cc
index 458608021e..f5a09ec681 100644
--- a/system/bta/ag/bta_ag_cmd.cc
+++ b/system/bta/ag/bta_ag_cmd.cc
@@ -19,9 +19,12 @@
 #define LOG_TAG "bta_ag_cmd"
 
 #include <bluetooth/log.h>
-#include <com_android_bluetooth_flags.h>
+#include <string.h>
 
+#include <cctype>
 #include <cstdint>
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
 
 #include "bta/ag/bta_ag_at.h"
@@ -30,16 +33,19 @@
 #include "bta/include/bta_hfp_api.h"
 #include "bta/include/utl.h"
 #include "bta_ag_swb_aptx.h"
+#include "bta_sys.h"
+#include "btm_api_types.h"
+#include "hardware/bt_hf.h"
+#include "osi/include/alarm.h"
 
 #ifdef __ANDROID__
 #include "bta_le_audio_api.h"
+#include "os/system_properties.h"
 #endif
 
 #include "bta/include/bta_hfp_api.h"
 #include "device/include/interop.h"
 #include "internal_include/bt_target.h"
-#include "internal_include/bt_trace.h"
-#include "os/system_properties.h"
 #include "osi/include/compat.h"
 #include "stack/btm/btm_sco_hfp_hal.h"
 #include "stack/include/port_api.h"
diff --git a/system/bta/ag/bta_ag_main.cc b/system/bta/ag/bta_ag_main.cc
index e8eb51cd68..a1143a55ff 100644
--- a/system/bta/ag/bta_ag_main.cc
+++ b/system/bta/ag/bta_ag_main.cc
@@ -23,13 +23,17 @@
  ******************************************************************************/
 
 #include <bluetooth/log.h>
-#include <com_android_bluetooth_flags.h>
 
+#include <cstdint>
 #include <string>
 #include <vector>
 
 #include "bta/ag/bta_ag_int.h"
 #include "bta/include/bta_hfp_api.h"
+#include "bta_ag_api.h"
+#include "bta_api.h"
+#include "bta_sys.h"
+#include "btm_api_types.h"
 #include "internal_include/bt_target.h"
 #include "macros.h"
 #include "osi/include/alarm.h"
diff --git a/system/bta/ag/bta_ag_rfc.cc b/system/bta/ag/bta_ag_rfc.cc
index b3661aa4d3..46b26b1a97 100644
--- a/system/bta/ag/bta_ag_rfc.cc
+++ b/system/bta/ag/bta_ag_rfc.cc
@@ -26,9 +26,12 @@
 #include <base/functional/bind.h>
 #include <bluetooth/log.h>
 
+#include <cstdint>
+
 #include "bta/ag/bta_ag_int.h"
 #include "bta/include/bta_sec_api.h"
-#include "internal_include/bt_trace.h"
+#include "bta_api.h"
+#include "os/logging/log_adapter.h"
 #include "stack/include/main_thread.h"
 #include "stack/include/port_api.h"
 #include "types/raw_address.h"
diff --git a/system/bta/ag/bta_ag_sco.cc b/system/bta/ag/bta_ag_sco.cc
index dd14e86779..1c62678576 100644
--- a/system/bta/ag/bta_ag_sco.cc
+++ b/system/bta/ag/bta_ag_sco.cc
@@ -26,15 +26,28 @@
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
 
+#include <cstddef>
 #include <cstdint>
+#include <memory>
+#include <unordered_map>
 
 #include "audio_hal_interface/hfp_client_interface.h"
 #include "bta/ag/bta_ag_int.h"
 #include "bta/include/bta_ag_swb_aptx.h"
+#include "bta_ag_api.h"
+#include "bta_sys.h"
+#include "btm_api_types.h"
 #include "btm_status.h"
+#include "device/include/esco_parameters.h"
+#include "hardware/bt_hf.h"
 #include "hci/controller_interface.h"
+#include "hci/hci_packets.h"
+#include "hci_error_code.h"
+#include "hcidefs.h"
+#include "internal/btm_api.h"
 #include "internal_include/bt_target.h"
 #include "main/shim/entry.h"
+#include "osi/include/alarm.h"
 #include "osi/include/properties.h"
 #include "stack/btm/btm_int_types.h"
 #include "stack/btm/btm_sco.h"
diff --git a/system/bta/ag/bta_ag_sdp.cc b/system/bta/ag/bta_ag_sdp.cc
index 3d0420b77b..f7f28db8b3 100644
--- a/system/bta/ag/bta_ag_sdp.cc
+++ b/system/bta/ag/bta_ag_sdp.cc
@@ -27,21 +27,33 @@
 #include <base/location.h>
 #include <bluetooth/log.h>
 
+#include <cstdint>
+#include <cstring>
+
 #include "bta/ag/bta_ag_int.h"
 #include "bta/include/bta_hfp_api.h"
 #include "bta/include/bta_rfcomm_scn.h"
+#include "bta_ag_api.h"
+#include "bta_api.h"
+#include "bta_sys.h"
 #include "btif/include/btif_config.h"
+#include "btm_api_types.h"
 #include "device/include/interop.h"
 #include "device/include/interop_config.h"
 #include "internal_include/bt_target.h"
 #include "osi/include/allocator.h"
+#include "sdp_callback.h"
+#include "sdp_status.h"
+#include "sdpdefs.h"
 #include "stack/btm/btm_sco_hfp_hal.h"
 #include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/main_thread.h"
 #include "stack/include/sdp_api.h"
+#include "stack/sdp/sdp_discovery_db.h"
 #include "storage/config_keys.h"
 #include "types/bluetooth/uuid.h"
+#include "types/raw_address.h"
 
 using namespace bluetooth::legacy::stack::sdp;
 using namespace bluetooth;
diff --git a/system/bta/ag/bta_ag_swb_aptx.cc b/system/bta/ag/bta_ag_swb_aptx.cc
index c0fbee8031..dad277a679 100644
--- a/system/bta/ag/bta_ag_swb_aptx.cc
+++ b/system/bta/ag/bta_ag_swb_aptx.cc
@@ -18,14 +18,22 @@
 
 #include <android_bluetooth_sysprop.h>
 #include <bluetooth/log.h>
-#include <com_android_bluetooth_flags.h>
 #include <string.h>
-#include <unistd.h>
+
+#include <cctype>
+#include <cstdint>
+#include <cstdlib>
+#include <string>
 
 #include "bta/ag/bta_ag_int.h"
+#include "bta_ag_api.h"
 #include "common/strings.h"
+#include "hardware/bluetooth.h"
+#include "hardware/bt_hf.h"
+#include "osi/include/alarm.h"
 #include "stack/btm/btm_sco_hfp_hal.h"
 #include "stack/include/btm_api_types.h"
+#include "types/raw_address.h"
 
 using namespace bluetooth;
 
diff --git a/system/bta/ar/bta_ar.cc b/system/bta/ar/bta_ar.cc
index bb365be9e1..8f41416ead 100644
--- a/system/bta/ar/bta_ar.cc
+++ b/system/bta/ar/bta_ar.cc
@@ -25,12 +25,19 @@
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
 
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
+#include <memory>
 
+#include "avdt_api.h"
+#include "avrc_defs.h"
+#include "avrcp_sdp_records.h"
 #include "bta/ar/bta_ar_int.h"
 #include "bta/include/bta_ar_api.h"
 #include "bta/sys/bta_sys.h"
 #include "profile/avrcp/avrcp_sdp_service.h"
+#include "sdpdefs.h"
 #include "stack/include/avct_api.h"
 #include "stack/include/avrc_api.h"
 #include "stack/include/bt_types.h"
diff --git a/system/bta/av/bta_av_aact.cc b/system/bta/av/bta_av_aact.cc
index 4479296dd5..0099c3313f 100644
--- a/system/bta/av/bta_av_aact.cc
+++ b/system/bta/av/bta_av_aact.cc
@@ -34,19 +34,39 @@
 #include <cstring>
 #include <vector>
 
+#include "a2dp_api.h"
+#include "a2dp_codec_api.h"
+#include "a2dp_constants.h"
+#include "a2dp_sbc_constants.h"
+#include "audio_hal_interface/a2dp_encoding.h"
+#include "avdt_api.h"
+#include "avrc_api.h"
+#include "avrc_defs.h"
+#include "bt_name.h"
 #include "bta/av/bta_av_int.h"
-#include "bta/include/bta_ar_api.h"
 #include "bta/include/bta_av_co.h"
+#include "bta_av_api.h"
+#include "bta_sys.h"
 #include "btif/avrcp/avrcp_service.h"
 #include "btif/include/btif_av.h"
 #include "btif/include/btif_av_co.h"
 #include "btif/include/btif_config.h"
 #include "btif/include/btif_storage.h"
+#include "btm_api_types.h"
+#include "common/message_loop_thread.h"
+#include "device/include/device_iot_conf_defs.h"
 #include "device/include/device_iot_config.h"
 #include "device/include/interop.h"
+#include "hardware/bt_av.h"
+#include "hci_error_code.h"
+#include "hcidefs.h"
 #include "internal_include/bt_target.h"
+#include "l2cap_types.h"
+#include "osi/include/alarm.h"
 #include "osi/include/allocator.h"
+#include "osi/include/list.h"
 #include "osi/include/properties.h"
+#include "sdpdefs.h"
 #include "stack/include/a2dp_ext.h"
 #include "stack/include/a2dp_sbc.h"
 #include "stack/include/acl_api.h"
@@ -58,6 +78,7 @@
 #include "stack/include/btm_status.h"
 #include "stack/include/l2cap_interface.h"
 #include "storage/config_keys.h"
+#include "types/bt_transport.h"
 #include "types/hci_role.h"
 #include "types/raw_address.h"
 
diff --git a/system/bta/av/bta_av_act.cc b/system/bta/av/bta_av_act.cc
index 5a59222a33..1512f30ab2 100644
--- a/system/bta/av/bta_av_act.cc
+++ b/system/bta/av/bta_av_act.cc
@@ -27,20 +27,34 @@
 
 #include <bluetooth/log.h>
 
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
 
+#include "avct_api.h"
+#include "avdt_api.h"
+#include "avrc_api.h"
+#include "avrc_defs.h"
+#include "bt_dev_class.h"
 #include "bta/av/bta_av_int.h"
 #include "bta/include/bta_ar_api.h"
 #include "bta/include/utl.h"
+#include "bta_av_api.h"
+#include "bta_sys.h"
 #include "btif/avrcp/avrcp_service.h"
 #include "btif/include/btif_av.h"
+#include "common/bind.h"
+#include "device/include/device_iot_conf_defs.h"
 #include "device/include/device_iot_config.h"
 #include "device/include/interop.h"
 #include "internal_include/bt_target.h"
+#include "l2cap_types.h"
+#include "osi/include/alarm.h"
 #include "osi/include/allocator.h"
+#include "osi/include/list.h"
 #include "osi/include/osi.h"  // UINT_TO_PTR PTR_TO_UINT
 #include "osi/include/properties.h"
-#include "stack/include/acl_api.h"
+#include "sdpdefs.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
@@ -48,6 +62,7 @@
 #include "stack/include/l2cap_interface.h"
 #include "stack/include/sdp_api.h"
 #include "stack/include/sdp_status.h"
+#include "stack/sdp/sdp_discovery_db.h"
 #include "types/raw_address.h"
 
 using namespace bluetooth::legacy::stack::sdp;
diff --git a/system/bta/av/bta_av_api.cc b/system/bta/av/bta_av_api.cc
index 0d3b26a086..cf38a4c456 100644
--- a/system/bta/av/bta_av_api.cc
+++ b/system/bta/av/bta_av_api.cc
@@ -26,12 +26,21 @@
 
 #define LOG_TAG "bluetooth-a2dp"
 
+#include "bta_av_api.h"
+
 #include <bluetooth/log.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+
+#include "avdt_api.h"
+#include "avrc_defs.h"
 #include "bta/av/bta_av_int.h"
+#include "bta_api.h"
+#include "bta_sys.h"
 #include "btif/include/btif_av.h"
 #include "internal_include/bt_target.h"
-#include "internal_include/bt_trace.h"
 #include "osi/include/allocator.h"
 #include "osi/include/compat.h"
 #include "stack/include/bt_hdr.h"
diff --git a/system/bta/av/bta_av_cfg.cc b/system/bta/av/bta_av_cfg.cc
index f420ddba5b..735d818429 100644
--- a/system/bta/av/bta_av_cfg.cc
+++ b/system/bta/av/bta_av_cfg.cc
@@ -23,13 +23,12 @@
  *
  ******************************************************************************/
 
-#include <bluetooth/log.h>
-
+#include <cstddef>
 #include <cstdint>
 
+#include "avrc_defs.h"
 #include "bta/av/bta_av_int.h"
 #include "bta/include/bta_av_api.h"
-#include "internal_include/bt_target.h"
 #include "stack/include/avrc_api.h"
 
 #ifndef BTA_AV_RC_COMP_ID
diff --git a/system/bta/av/bta_av_ci.cc b/system/bta/av/bta_av_ci.cc
index 7a83c8570a..a28c614178 100644
--- a/system/bta/av/bta_av_ci.cc
+++ b/system/bta/av/bta_av_ci.cc
@@ -29,7 +29,12 @@
 
 #include <bluetooth/log.h>
 
+#include <cstdint>
+
+#include "a2dp_constants.h"
 #include "bta/av/bta_av_int.h"
+#include "bta_av_api.h"
+#include "bta_sys.h"
 #include "osi/include/allocator.h"
 #include "stack/include/bt_hdr.h"
 
diff --git a/system/bta/av/bta_av_main.cc b/system/bta/av/bta_av_main.cc
index a992882a08..42b60daa2d 100644
--- a/system/bta/av/bta_av_main.cc
+++ b/system/bta/av/bta_av_main.cc
@@ -26,21 +26,37 @@
 
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
+#include <stdio.h>
 
+#include <chrono>
+#include <cstddef>
 #include <cstdint>
-
+#include <cstring>
+
+#include "a2dp_api.h"
+#include "a2dp_codec_api.h"
+#include "a2dp_constants.h"
+#include "avct_api.h"
+#include "avdt_api.h"
+#include "avrc_api.h"
+#include "avrc_defs.h"
+#include "bt_dev_class.h"
 #include "bta/av/bta_av_int.h"
 #include "bta/include/bta_ar_api.h"
 #include "bta/include/bta_av_co.h"
 #include "bta/include/utl.h"
 #include "bta/sys/bta_sys.h"
+#include "bta_av_api.h"
 #include "btif/avrcp/avrcp_service.h"
 #include "btif/include/btif_av.h"
 #include "btif/include/btif_av_co.h"
 #include "btif/include/btif_config.h"
+#include "hardware/bt_av.h"
 #include "internal_include/bt_target.h"
+#include "os/logging/log_adapter.h"
+#include "osi/include/alarm.h"
 #include "osi/include/allocator.h"
-#include "stack/include/acl_api.h"
+#include "osi/include/list.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/btm_client_interface.h"
diff --git a/system/bta/av/bta_av_ssm.cc b/system/bta/av/bta_av_ssm.cc
index 37df2021a2..77b0819915 100644
--- a/system/bta/av/bta_av_ssm.cc
+++ b/system/bta/av/bta_av_ssm.cc
@@ -26,8 +26,11 @@
 
 #include <bluetooth/log.h>
 
+#include <cstddef>
+#include <cstdint>
+
 #include "bta/av/bta_av_int.h"
-#include "internal_include/bt_target.h"
+#include "bta_av_api.h"
 
 using namespace bluetooth;
 
diff --git a/system/bta/csis/csis_client.cc b/system/bta/csis/csis_client.cc
index 92ff4c71a3..d87dbb681a 100644
--- a/system/bta/csis/csis_client.cc
+++ b/system/bta/csis/csis_client.cc
@@ -21,10 +21,21 @@
 #include <bluetooth/log.h>
 #include <hardware/bt_csis.h>
 #include <hardware/bt_gatt_types.h>
+#include <stdio.h>
 
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <limits>
 #include <list>
+#include <map>
+#include <memory>
 #include <mutex>
+#include <sstream>
 #include <string>
+#include <type_traits>
+#include <utility>
 #include <vector>
 
 #include "advertise_data_parser.h"
@@ -33,16 +44,21 @@
 #include "bta_gatt_api.h"
 #include "bta_gatt_queue.h"
 #include "bta_groups.h"
-#include "bta_le_audio_uuids.h"
 #include "bta_sec_api.h"
 #include "btif/include/btif_storage.h"
+#include "btm_ble_api_types.h"
+#include "btm_sec_api_types.h"
 #include "crypto_toolbox/crypto_toolbox.h"
 #include "csis_types.h"
 #include "gap_api.h"
+#include "gatt/database.h"
 #include "gatt_api.h"
+#include "gattdefs.h"
 #include "internal_include/bt_target.h"
 #include "internal_include/bt_trace.h"
 #include "main/shim/le_scanning_manager.h"
+#include "neighbor_inquiry.h"
+#include "os/logging/log_adapter.h"
 #include "osi/include/osi.h"
 #include "osi/include/stack_power_telemetry.h"
 #include "stack/btm/btm_sec.h"
@@ -51,6 +67,9 @@
 #include "stack/include/btm_ble_sec_api.h"
 #include "stack/include/btm_client_interface.h"
 #include "stack/include/btm_status.h"
+#include "types/bluetooth/uuid.h"
+#include "types/bt_transport.h"
+#include "types/raw_address.h"
 
 using base::Closure;
 using bluetooth::Uuid;
diff --git a/system/bta/gmap/gmap_client.cc b/system/bta/gmap/gmap_client.cc
index a27602d1f1..0589b6a759 100644
--- a/system/bta/gmap/gmap_client.cc
+++ b/system/bta/gmap/gmap_client.cc
@@ -21,22 +21,17 @@
 #include <base/strings/string_number_conversions.h>
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
-#include <hardware/bt_gatt_types.h>
+#include <stdio.h>
 
 #include <bitset>
-#include <string>
-#include <vector>
+#include <cstdint>
+#include <sstream>
 
-#include "bta_gatt_api.h"
 #include "bta_gatt_queue.h"
-#include "bta_le_audio_uuids.h"
-#include "gap_api.h"
-#include "gatt_api.h"
-#include "internal_include/bt_trace.h"
 #include "osi/include/properties.h"
 #include "stack/include/bt_types.h"
+#include "types/raw_address.h"
 
-using bluetooth::Uuid;
 using namespace bluetooth;
 using bluetooth::le_audio::GmapClient;
 bool GmapClient::is_offloader_support_gmap_ = false;
diff --git a/system/bta/gmap/gmap_server.cc b/system/bta/gmap/gmap_server.cc
index 6d5ca2cd47..407e50147b 100644
--- a/system/bta/gmap/gmap_server.cc
+++ b/system/bta/gmap/gmap_server.cc
@@ -21,27 +21,23 @@
 #include <base/strings/string_number_conversions.h>
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
-#include <hardware/bt_gatt_types.h>
+#include <stdio.h>
 
 #include <bitset>
-#include <string>
+#include <cstdint>
+#include <sstream>
+#include <unordered_map>
 #include <vector>
 
 #include "bta/le_audio/le_audio_types.h"
 #include "bta_gatt_api.h"
 #include "bta_gatt_queue.h"
-#include "bta_le_audio_uuids.h"
-#include "btm_sec.h"
-#include "gap_api.h"
 #include "gatt_api.h"
-#include "gd/hci/uuid.h"
-#include "gd/os/rand.h"
+#include "hardware/bt_common_types.h"
 #include "include/hardware/bt_gmap.h"
-#include "internal_include/bt_trace.h"
-#include "os/logging/log_adapter.h"
 #include "osi/include/properties.h"
-#include "stack/include/bt_types.h"
-#include "stack/include/btm_ble_addr.h"
+#include "types/bluetooth/uuid.h"
+#include "types/bt_transport.h"
 
 using bluetooth::Uuid;
 using namespace bluetooth;
diff --git a/system/bta/groups/groups.cc b/system/bta/groups/groups.cc
index e9e0875df6..42b271537a 100644
--- a/system/bta/groups/groups.cc
+++ b/system/bta/groups/groups.cc
@@ -16,13 +16,22 @@
  */
 
 #include <bluetooth/log.h>
+#include <stdio.h>
 
 #include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
 #include <functional>
 #include <limits>
+#include <list>
 #include <map>
 #include <mutex>
+#include <ostream>
+#include <sstream>
 #include <unordered_set>
+#include <utility>
+#include <vector>
 
 #include "bta_groups.h"
 #include "btif/include/btif_profile_storage.h"
diff --git a/system/bta/has/has_client.cc b/system/bta/has/has_client.cc
index 915472dd85..1c74e1f258 100644
--- a/system/bta/has/has_client.cc
+++ b/system/bta/has/has_client.cc
@@ -22,11 +22,20 @@
 #include <com_android_bluetooth_flags.h>
 #include <hardware/bt_gatt_types.h>
 #include <hardware/bt_has.h>
+#include <stdio.h>
 
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <list>
 #include <map>
 #include <mutex>
+#include <optional>
+#include <sstream>
 #include <string>
+#include <utility>
+#include <variant>
 #include <vector>
 
 #include "bta_csis_api.h"
@@ -34,21 +43,30 @@
 #include "bta_gatt_queue.h"
 #include "bta_has_api.h"
 #include "bta_le_audio_uuids.h"
+#include "btm_ble_api_types.h"
 #include "btm_sec.h"
+#include "btm_sec_api_types.h"
+#include "btm_status.h"
 #include "gap_api.h"
+#include "gatt/database.h"
 #include "gatt_api.h"
+#include "gattdefs.h"
+#include "has_ctp.h"
+#include "has_journal.h"
+#include "has_preset.h"
 #include "has_types.h"
-#include "internal_include/bt_trace.h"
+#include "osi/include/alarm.h"
 #include "osi/include/properties.h"
 #include "stack/include/bt_types.h"
+#include "types/bluetooth/uuid.h"
+#include "types/bt_transport.h"
+#include "types/raw_address.h"
 
 using base::Closure;
 using bluetooth::Uuid;
 using bluetooth::csis::CsisClient;
 using bluetooth::has::ConnectionState;
 using bluetooth::has::ErrorCode;
-using bluetooth::has::kFeatureBitPresetSynchronizationSupported;
-using bluetooth::has::kHasPresetIndexInvalid;
 using bluetooth::has::PresetInfo;
 using bluetooth::has::PresetInfoReason;
 using bluetooth::le_audio::has::HasClient;
@@ -59,8 +77,6 @@ using bluetooth::le_audio::has::HasDevice;
 using bluetooth::le_audio::has::HasGattOpContext;
 using bluetooth::le_audio::has::HasJournalRecord;
 using bluetooth::le_audio::has::HasPreset;
-using bluetooth::le_audio::has::kControlPointMandatoryOpcodesBitmask;
-using bluetooth::le_audio::has::kControlPointSynchronizedOpcodesBitmask;
 using bluetooth::le_audio::has::kUuidActivePresetIndex;
 using bluetooth::le_audio::has::kUuidHearingAccessService;
 using bluetooth::le_audio::has::kUuidHearingAidFeatures;
diff --git a/system/bta/has/has_ctp.cc b/system/bta/has/has_ctp.cc
index c39bef152a..e9b45ca845 100644
--- a/system/bta/has/has_ctp.cc
+++ b/system/bta/has/has_ctp.cc
@@ -19,8 +19,18 @@
 
 #include <bluetooth/log.h>
 
+#include <cstdint>
+#include <cstring>
+#include <optional>
+#include <ostream>
+#include <type_traits>
+#include <variant>
+#include <vector>
+
+#include "has_preset.h"
 #include "os/logging/log_adapter.h"
 #include "stack/include/bt_types.h"
+#include "types/raw_address.h"
 
 using namespace bluetooth;
 
diff --git a/system/bta/has/has_journal.cc b/system/bta/has/has_journal.cc
index 8940348fcb..2059608976 100644
--- a/system/bta/has/has_journal.cc
+++ b/system/bta/has/has_journal.cc
@@ -17,6 +17,12 @@
 
 #include "has_journal.h"
 
+#include <cstdint>
+#include <cstdio>
+#include <ctime>
+#include <ostream>
+
+#include "has_ctp.h"
 #include "internal_include/bt_trace.h"
 
 namespace bluetooth::le_audio {
diff --git a/system/bta/has/has_preset.cc b/system/bta/has/has_preset.cc
index 610437e040..1d8e314179 100644
--- a/system/bta/has/has_preset.cc
+++ b/system/bta/has/has_preset.cc
@@ -19,6 +19,12 @@
 
 #include <bluetooth/log.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <optional>
+#include <ostream>
+#include <vector>
+
 #include "stack/include/bt_types.h"
 
 using namespace bluetooth;
diff --git a/system/bta/has/has_types.cc b/system/bta/has/has_types.cc
index a77d3610c9..913bd56773 100644
--- a/system/bta/has/has_types.cc
+++ b/system/bta/has/has_types.cc
@@ -17,6 +17,8 @@
 
 #include "has_types.h"
 
+#include <ostream>
+
 namespace bluetooth::le_audio {
 namespace has {
 
diff --git a/system/bta/hd/bta_hd_act.cc b/system/bta/hd/bta_hd_act.cc
index 566d845a9b..daba90fd46 100644
--- a/system/bta/hd/bta_hd_act.cc
+++ b/system/bta/hd/bta_hd_act.cc
@@ -24,8 +24,13 @@
  ******************************************************************************/
 #include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
 
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
 
+#include "bta_hd_api.h"
+#include "bta_sys.h"
+#include "hiddefs.h"
 #include "internal_include/bt_target.h"
 #if defined(BTA_HD_INCLUDED) && (BTA_HD_INCLUDED == TRUE)
 
diff --git a/system/bta/hd/bta_hd_api.cc b/system/bta/hd/bta_hd_api.cc
index 3f5d3827a2..aa424815c5 100644
--- a/system/bta/hd/bta_hd_api.cc
+++ b/system/bta/hd/bta_hd_api.cc
@@ -25,6 +25,13 @@
 
 #define LOG_TAG "bluetooth"
 
+#include "bta_hd_api.h"
+
+#include <cstdint>
+#include <cstring>
+
+#include "bta_sys.h"
+
 // BTA_HD_INCLUDED
 #include "internal_include/bt_target.h"
 #if defined(BTA_HD_INCLUDED) && (BTA_HD_INCLUDED == TRUE)
diff --git a/system/bta/hearing_aid/hearing_aid.cc b/system/bta/hearing_aid/hearing_aid.cc
index cb5974793d..9838ebd5f9 100644
--- a/system/bta/hearing_aid/hearing_aid.cc
+++ b/system/bta/hearing_aid/hearing_aid.cc
@@ -23,25 +23,50 @@
 #include <base/strings/string_number_conversions.h>  // HexEncode
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
 
+#include <algorithm>
 #include <chrono>
+#include <cstddef>
 #include <cstdint>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
+#include <deque>
+#include <functional>
+#include <list>
+#include <memory>
 #include <mutex>
+#include <ostream>
+#include <sstream>
+#include <utility>
 #include <vector>
 
 #include "audio/asrc/asrc_resampler.h"
 #include "bta/include/bta_gatt_api.h"
 #include "bta/include/bta_gatt_queue.h"
 #include "bta/include/bta_hearing_aid_api.h"
+#include "btm_api_types.h"
+#include "btm_ble_api_types.h"
 #include "btm_iso_api.h"
+#include "btm_sec_api_types.h"
 #include "embdrv/g722/g722_enc_dec.h"
-#include "hal/link_clocker.h"
+#include "gap_api.h"
+#include "gatt/database.h"
+#include "gatt_api.h"
+#include "gattdefs.h"
 #include "hardware/bt_gatt_types.h"
+#include "hardware/bt_hearing_aid.h"
 #include "hci/controller_interface.h"
 #include "internal_include/bt_trace.h"
+#include "l2cap_types.h"
 #include "main/shim/entry.h"
+#include "os/logging/log_adapter.h"
 #include "osi/include/allocator.h"
 #include "osi/include/properties.h"
+#include "profiles_api.h"
 #include "stack/btm/btm_sec.h"
 #include "stack/include/acl_api_types.h"  // tBTM_RSSI_RESULT
 #include "stack/include/bt_hdr.h"
diff --git a/system/bta/hearing_aid/hearing_aid_audio_source.cc b/system/bta/hearing_aid/hearing_aid_audio_source.cc
index ccc6708079..6ea05e7d06 100644
--- a/system/bta/hearing_aid/hearing_aid_audio_source.cc
+++ b/system/bta/hearing_aid/hearing_aid_audio_source.cc
@@ -18,22 +18,28 @@
 
 #include <base/files/file_util.h>
 #include <bluetooth/log.h>
+#include <stdio.h>
 
+#include <chrono>
+#include <cstddef>
 #include <cstdint>
 #include <memory>
+#include <ostream>
 #include <sstream>
 #include <vector>
 
 #include "audio_hal_interface/hearing_aid_software_encoding.h"
 #include "audio_hearing_aid_hw/include/audio_hearing_aid_hw.h"
 #include "bta/include/bta_hearing_aid_api.h"
+#include "common/message_loop_thread.h"
 #include "common/repeating_timer.h"
 #include "common/time_util.h"
+#include "hardware/bluetooth.h"
+#include "hardware/bt_av.h"
 #include "osi/include/wakelock.h"
 #include "stack/include/main_thread.h"
 #include "udrv/include/uipc.h"
 
-using base::FilePath;
 using namespace bluetooth;
 
 namespace fmt {
diff --git a/system/bta/hf_client/bta_hf_client_act.cc b/system/bta/hf_client/bta_hf_client_act.cc
index 31daf28b4e..d047bca8f9 100644
--- a/system/bta/hf_client/bta_hf_client_act.cc
+++ b/system/bta/hf_client/bta_hf_client_act.cc
@@ -26,8 +26,16 @@
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+
 #include "bta/hf_client/bta_hf_client_int.h"
 #include "bta/include/bta_dm_api.h"
+#include "bta_hf_client_api.h"
+#include "bta_sys.h"
+#include "btm_api_types.h"
+#include "osi/include/alarm.h"
 #include "stack/include/l2cap_interface.h"
 #include "stack/include/port_api.h"
 #include "stack/include/sdp_status.h"
diff --git a/system/bta/hf_client/bta_hf_client_api.cc b/system/bta/hf_client/bta_hf_client_api.cc
index 93da47501c..65c4fcedb0 100644
--- a/system/bta/hf_client/bta_hf_client_api.cc
+++ b/system/bta/hf_client/bta_hf_client_api.cc
@@ -33,7 +33,8 @@
 
 #include "bta/hf_client/bta_hf_client_int.h"
 #include "bta/sys/bta_sys.h"
-#include "internal_include/bt_trace.h"
+#include "bta_api_data_types.h"
+#include "hardware/bluetooth.h"
 #include "osi/include/allocator.h"
 #include "osi/include/compat.h"
 #include "stack/include/bt_hdr.h"
diff --git a/system/bta/hf_client/bta_hf_client_at.cc b/system/bta/hf_client/bta_hf_client_at.cc
index 883d0f0955..f002fbf223 100644
--- a/system/bta/hf_client/bta_hf_client_at.cc
+++ b/system/bta/hf_client/bta_hf_client_at.cc
@@ -21,11 +21,23 @@
 
 #include <bluetooth/log.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
+#include <string>
+
 #include "bta/hf_client/bta_hf_client_int.h"
-#include "internal_include/bt_trace.h"
+#include "bta_hf_client_api.h"
+#include "bta_hfp_api.h"
+#include "bta_sys.h"
+#include "btm_api_types.h"
+#include "os/logging/log_adapter.h"
+#include "osi/include/alarm.h"
 #include "osi/include/allocator.h"
 #include "osi/include/compat.h"
 #include "osi/include/properties.h"
+#include "power_mode.h"
 #include "stack/include/acl_api.h"
 #include "stack/include/port_api.h"
 
diff --git a/system/bta/hf_client/bta_hf_client_main.cc b/system/bta/hf_client/bta_hf_client_main.cc
index 5317c06487..98528eee6c 100644
--- a/system/bta/hf_client/bta_hf_client_main.cc
+++ b/system/bta/hf_client/bta_hf_client_main.cc
@@ -18,13 +18,21 @@
  ******************************************************************************/
 
 #include <bluetooth/log.h>
+#include <stdio.h>
 
 #include <cstdint>
 #include <cstdio>
+#include <cstring>
 
+#include "bt_dev_class.h"
 #include "bta/hf_client/bta_hf_client_int.h"
 #include "bta/include/utl.h"
+#include "bta_api_data_types.h"
+#include "bta_hf_client_api.h"
+#include "bta_sys.h"
+#include "btm_api_types.h"
 #include "internal_include/bt_target.h"
+#include "osi/include/alarm.h"
 #include "osi/include/allocator.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/btm_client_interface.h"
diff --git a/system/bta/hf_client/bta_hf_client_rfc.cc b/system/bta/hf_client/bta_hf_client_rfc.cc
index 48c6d49c80..42e8a3c96c 100644
--- a/system/bta/hf_client/bta_hf_client_rfc.cc
+++ b/system/bta/hf_client/bta_hf_client_rfc.cc
@@ -26,10 +26,12 @@
 
 #include <bluetooth/log.h>
 
+#include <cstddef>
 #include <cstdint>
 
 #include "bta/hf_client/bta_hf_client_int.h"
 #include "bta/include/bta_sec_api.h"
+#include "bta_sys.h"
 #include "osi/include/allocator.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/port_api.h"
diff --git a/system/bta/hf_client/bta_hf_client_sco.cc b/system/bta/hf_client/bta_hf_client_sco.cc
index aa3f47f453..970d88fc05 100644
--- a/system/bta/hf_client/bta_hf_client_sco.cc
+++ b/system/bta/hf_client/bta_hf_client_sco.cc
@@ -19,9 +19,16 @@
 
 #include <bluetooth/log.h>
 
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
 
 #include "bta/hf_client/bta_hf_client_int.h"
+#include "bta_hf_client_api.h"
+#include "bta_sys.h"
+#include "btm_api_types.h"
+#include "device/include/esco_parameters.h"
+#include "hci_error_code.h"
 #include "osi/include/allocator.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/btm_client_interface.h"
diff --git a/system/bta/hf_client/bta_hf_client_sdp.cc b/system/bta/hf_client/bta_hf_client_sdp.cc
index d967b40ff6..81721799f4 100644
--- a/system/bta/hf_client/bta_hf_client_sdp.cc
+++ b/system/bta/hf_client/bta_hf_client_sdp.cc
@@ -26,19 +26,26 @@
 
 #include <bluetooth/log.h>
 
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
 
 #include "bta/hf_client/bta_hf_client_int.h"
 #include "bta/include/bta_hf_client_api.h"
 #include "bta/include/bta_rfcomm_scn.h"
 #include "bta/sys/bta_sys.h"
+#include "bta_hfp_api.h"
+#include "common/bind.h"
 #include "internal_include/bt_target.h"
 #include "osi/include/allocator.h"
+#include "sdp_status.h"
 #include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/sdp_api.h"
 #include "stack/include/sdpdefs.h"
+#include "stack/sdp/sdp_discovery_db.h"
 #include "types/bluetooth/uuid.h"
+#include "types/raw_address.h"
 
 using bluetooth::Uuid;
 using namespace bluetooth::legacy::stack::sdp;
diff --git a/system/bta/hh/bta_hh_act.cc b/system/bta/hh/bta_hh_act.cc
index e32500a4ed..116e572518 100644
--- a/system/bta/hh/bta_hh_act.cc
+++ b/system/bta/hh/bta_hh_act.cc
@@ -27,20 +27,29 @@
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
 
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
 #include <string>
 
 #include "bta/hh/bta_hh_int.h"
 #include "bta/include/bta_hh_api.h"
 #include "bta/include/bta_hh_co.h"
 #include "bta/sys/bta_sys.h"
+#include "bta_api.h"
+#include "bta_gatt_api.h"
 #include "osi/include/allocator.h"
+#include "sdp_device_id.h"
+#include "sdp_status.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/btm_client_interface.h"
 #include "stack/include/btm_log_history.h"
 #include "stack/include/hiddefs.h"
 #include "stack/include/hidh_api.h"
 #include "stack/include/sdp_api.h"
+#include "stack/sdp/sdp_discovery_db.h"
+#include "types/ble_address_with_type.h"
+#include "types/bt_transport.h"
 #include "types/raw_address.h"
 
 using namespace bluetooth::legacy::stack::sdp;
diff --git a/system/bta/hh/bta_hh_api.cc b/system/bta/hh/bta_hh_api.cc
index 413eeb9b6d..e11593bd6a 100644
--- a/system/bta/hh/bta_hh_api.cc
+++ b/system/bta/hh/bta_hh_api.cc
@@ -24,16 +24,22 @@
 
 #define LOG_TAG "bt_bta_hh"
 
+#include "bta_hh_api.h"
+
 #include <bluetooth/log.h>
 
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
 
 #include "bta/hh/bta_hh_int.h"
 #include "bta/sys/bta_sys.h"
+#include "hiddefs.h"
 #include "osi/include/allocator.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/main_thread.h"
-#include "types/raw_address.h"
+#include "types/ble_address_with_type.h"
+#include "types/bluetooth/uuid.h"
 
 using namespace bluetooth;
 
diff --git a/system/bta/hh/bta_hh_headtracker.cc b/system/bta/hh/bta_hh_headtracker.cc
index e52dd122a0..39f8c3011c 100644
--- a/system/bta/hh/bta_hh_headtracker.cc
+++ b/system/bta/hh/bta_hh_headtracker.cc
@@ -19,11 +19,17 @@
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
 
+#include <cstdint>
+
 #include "bta/hh/bta_hh_int.h"
+#include "bta_hh_api.h"
 #include "btif/include/btif_storage.h"
-#include "stack/include/bt_types.h"
-#include "stack/include/bt_uuid16.h"
+#include "gatt/database.h"
+#include "gatt_api.h"
+#include "gattdefs.h"
+#include "hardware/bluetooth.h"
 #include "types/bluetooth/uuid.h"
+#include "types/raw_address.h"
 
 using bluetooth::Uuid;
 using namespace bluetooth;
diff --git a/system/bta/hh/bta_hh_le.cc b/system/bta/hh/bta_hh_le.cc
index 37f1a63cb7..dab8a1d738 100644
--- a/system/bta/hh/bta_hh_le.cc
+++ b/system/bta/hh/bta_hh_le.cc
@@ -22,15 +22,30 @@
 #include <base/functional/callback.h>
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
+#include <string.h>
 
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
+#include <list>
+#include <utility>
 #include <vector>
 
 #include "bta/hh/bta_hh_int.h"
 #include "bta/include/bta_gatt_queue.h"
 #include "bta/include/bta_hh_co.h"
 #include "bta/include/bta_le_audio_api.h"
+#include "bta_api.h"
+#include "bta_gatt_api.h"
+#include "bta_hh_api.h"
+#include "btm_ble_api_types.h"
+#include "btm_sec_api_types.h"
 #include "device/include/interop.h"
+#include "gatt/database.h"
+#include "gatt_api.h"
+#include "gattdefs.h"
+#include "hardware/bt_gatt_types.h"
+#include "hiddefs.h"
 #include "osi/include/allocator.h"
 #include "osi/include/osi.h"    // ARRAY_SIZE
 #include "stack/btm/btm_sec.h"  // BTM_
@@ -43,7 +58,9 @@
 #include "stack/include/l2cap_interface.h"
 #include "stack/include/main_thread.h"
 #include "stack/include/srvc_api.h"  // tDIS_VALUE
+#include "types/ble_address_with_type.h"
 #include "types/bluetooth/uuid.h"
+#include "types/bt_transport.h"
 #include "types/raw_address.h"
 
 using bluetooth::Uuid;
diff --git a/system/bta/hh/bta_hh_main.cc b/system/bta/hh/bta_hh_main.cc
index 1601663573..7c15be0ac7 100644
--- a/system/bta/hh/bta_hh_main.cc
+++ b/system/bta/hh/bta_hh_main.cc
@@ -25,11 +25,12 @@
 #define LOG_TAG "bt_bta_hh"
 
 #include <bluetooth/log.h>
-#include <string.h>  // memset
 
 #include <cstdint>
 
 #include "bta/hh/bta_hh_int.h"
+#include "bta_hh_api.h"
+#include "hiddefs.h"
 #include "main/shim/dumpsys.h"
 #include "osi/include/allocator.h"
 #include "stack/include/bt_hdr.h"
diff --git a/system/bta/hh/bta_hh_utils.cc b/system/bta/hh/bta_hh_utils.cc
index b5b86cf94d..b61957fda9 100644
--- a/system/bta/hh/bta_hh_utils.cc
+++ b/system/bta/hh/bta_hh_utils.cc
@@ -20,16 +20,22 @@
 #include <bluetooth/log.h>
 #include <string.h>  // memset
 
+#include <cstdint>
 #include <cstring>
 
+#include "bt_name.h"
 #include "bta/hh/bta_hh_int.h"
+#include "bta_hh_api.h"
 #include "btif/include/btif_storage.h"
 #include "device/include/interop.h"
+#include "hiddefs.h"
 #include "internal_include/bt_target.h"
 #include "osi/include/allocator.h"
 #include "stack/include/btm_client_interface.h"
 #include "stack/include/btm_status.h"
 #include "stack/include/sdp_api.h"
+#include "types/ble_address_with_type.h"
+#include "types/bt_transport.h"
 #include "types/raw_address.h"
 
 using namespace bluetooth::legacy::stack::sdp;
diff --git a/system/bta/le_audio/audio_hal_client/audio_sink_hal_client.cc b/system/bta/le_audio/audio_hal_client/audio_sink_hal_client.cc
index 2f86a94e5b..435c0867a3 100644
--- a/system/bta/le_audio/audio_hal_client/audio_sink_hal_client.cc
+++ b/system/bta/le_audio/audio_hal_client/audio_sink_hal_client.cc
@@ -20,11 +20,19 @@
 
 #include <bluetooth/log.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <utility>
+#include <vector>
+
 #include "audio_hal_client.h"
 #include "audio_hal_interface/le_audio_software.h"
 #include "bta/le_audio/codec_manager.h"
-#include "common/time_util.h"
-#include "osi/include/wakelock.h"
+#include "bta_le_audio_api.h"
+#include "hardware/bluetooth.h"
+#include "le_audio/le_audio_types.h"
 #include "stack/include/main_thread.h"
 
 namespace bluetooth::le_audio {
diff --git a/system/bta/le_audio/audio_hal_client/audio_source_hal_client.cc b/system/bta/le_audio/audio_hal_client/audio_source_hal_client.cc
index bd7c8bea85..475044af90 100644
--- a/system/bta/le_audio/audio_hal_client/audio_source_hal_client.cc
+++ b/system/bta/le_audio/audio_hal_client/audio_source_hal_client.cc
@@ -20,16 +20,31 @@
 
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
-
+#include <stdio.h>
+
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <mutex>
 #include <optional>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "audio/asrc/asrc_resampler.h"
 #include "audio_hal_client.h"
 #include "audio_hal_interface/le_audio_software.h"
 #include "bta/le_audio/codec_manager.h"
+#include "common/message_loop_thread.h"
 #include "common/repeating_timer.h"
 #include "common/time_util.h"
-#include "gd/hal/link_clocker.h"
+#include "hardware/bluetooth.h"
+#include "le_audio/broadcaster/broadcaster_types.h"
+#include "le_audio/le_audio_types.h"
 #include "osi/include/wakelock.h"
 #include "stack/include/main_thread.h"
 
diff --git a/system/bta/le_audio/broadcaster/broadcast_configuration_provider.cc b/system/bta/le_audio/broadcaster/broadcast_configuration_provider.cc
index 03e0e4ad4f..c695a65cdd 100644
--- a/system/bta/le_audio/broadcaster/broadcast_configuration_provider.cc
+++ b/system/bta/le_audio/broadcaster/broadcast_configuration_provider.cc
@@ -16,7 +16,14 @@
 
 #include "broadcast_configuration_provider.h"
 
+#include <cstdint>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "internal_include/stack_config.h"
+#include "le_audio/broadcaster/broadcaster_types.h"
+#include "le_audio/le_audio_types.h"
 
 namespace bluetooth::le_audio {
 namespace broadcaster {
diff --git a/system/bta/le_audio/broadcaster/broadcaster.cc b/system/bta/le_audio/broadcaster/broadcaster.cc
index 782e5826f9..a61230ed5d 100644
--- a/system/bta/le_audio/broadcaster/broadcaster.cc
+++ b/system/bta/le_audio/broadcaster/broadcaster.cc
@@ -18,10 +18,22 @@
 #include <base/functional/bind.h>
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
-#include <lc3.h>
-
+#include <stdio.h>
+
+#include <algorithm>
+#include <cstdint>
+#include <cstring>
+#include <functional>
+#include <map>
+#include <memory>
 #include <mutex>
+#include <optional>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
 
+#include "bt_octets.h"
 #include "bta/include/bta_le_audio_broadcaster_api.h"
 #include "bta/le_audio/broadcaster/state_machine.h"
 #include "bta/le_audio/codec_interface.h"
@@ -30,9 +42,16 @@
 #include "bta/le_audio/le_audio_utils.h"
 #include "bta/le_audio/metrics_collector.h"
 #include "bta_le_audio_api.h"
+#include "btm_iso_api_types.h"
 #include "common/strings.h"
+#include "hardware/ble_advertiser.h"
+#include "hardware/bt_le_audio.h"
 #include "hci/controller_interface.h"
+#include "hcidefs.h"
+#include "hcimsgs.h"
 #include "internal_include/stack_config.h"
+#include "le_audio/audio_hal_client/audio_hal_client.h"
+#include "le_audio/broadcaster/broadcaster_types.h"
 #include "main/shim/entry.h"
 #include "osi/include/alarm.h"
 #include "osi/include/properties.h"
@@ -40,6 +59,12 @@
 #include "stack/include/btm_api_types.h"
 #include "stack/include/btm_iso_api.h"
 
+#ifdef TARGET_FLOSS
+#include <audio_hal_interface/audio_linux.h>
+#else
+#include <hardware/audio.h>
+#endif  // TARGET_FLOSS
+
 using bluetooth::common::ToString;
 using bluetooth::hci::IsoManager;
 using bluetooth::hci::iso_manager::big_create_cmpl_evt;
@@ -51,19 +76,16 @@ using bluetooth::le_audio::BroadcastId;
 using bluetooth::le_audio::CodecManager;
 using bluetooth::le_audio::ContentControlIdKeeper;
 using bluetooth::le_audio::DsaMode;
-using bluetooth::le_audio::LeAudioCodecConfiguration;
 using bluetooth::le_audio::LeAudioSourceAudioHalClient;
 using bluetooth::le_audio::PublicBroadcastAnnouncementData;
 using bluetooth::le_audio::broadcaster::BigConfig;
 using bluetooth::le_audio::broadcaster::BroadcastConfiguration;
-using bluetooth::le_audio::broadcaster::BroadcastQosConfig;
 using bluetooth::le_audio::broadcaster::BroadcastStateMachine;
 using bluetooth::le_audio::broadcaster::BroadcastStateMachineConfig;
 using bluetooth::le_audio::broadcaster::BroadcastSubgroupCodecConfig;
 using bluetooth::le_audio::broadcaster::IBroadcastStateMachineCallbacks;
 using bluetooth::le_audio::types::AudioContexts;
 using bluetooth::le_audio::types::CodecLocation;
-using bluetooth::le_audio::types::kLeAudioCodingFormatLC3;
 using bluetooth::le_audio::types::LeAudioContextType;
 using bluetooth::le_audio::types::LeAudioLtvMap;
 using bluetooth::le_audio::utils::GetAudioContextsFromSourceMetadata;
diff --git a/system/bta/le_audio/broadcaster/broadcaster_types.cc b/system/bta/le_audio/broadcaster/broadcaster_types.cc
index de55101fc2..8ffa309537 100644
--- a/system/bta/le_audio/broadcaster/broadcaster_types.cc
+++ b/system/bta/le_audio/broadcaster/broadcaster_types.cc
@@ -19,20 +19,24 @@
 
 #include <base/strings/string_number_conversions.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <map>
+#include <ostream>
+#include <string>
 #include <vector>
 
 #include "bta/le_audio/audio_hal_client/audio_hal_client.h"
-#include "bta_le_audio_broadcaster_api.h"
 #include "btm_ble_api_types.h"
-#include "internal_include/stack_config.h"
-#include "osi/include/properties.h"
+#include "hardware/bt_le_audio.h"
+#include "le_audio/le_audio_types.h"
 #include "stack/include/bt_types.h"
 
 using bluetooth::le_audio::BasicAudioAnnouncementBisConfig;
 using bluetooth::le_audio::BasicAudioAnnouncementCodecConfig;
 using bluetooth::le_audio::BasicAudioAnnouncementData;
 using bluetooth::le_audio::BasicAudioAnnouncementSubgroup;
-using bluetooth::le_audio::types::LeAudioContextType;
 
 namespace bluetooth::le_audio {
 namespace broadcaster {
diff --git a/system/bta/le_audio/broadcaster/state_machine.cc b/system/bta/le_audio/broadcaster/state_machine.cc
index d81011b655..da03674a86 100644
--- a/system/bta/le_audio/broadcaster/state_machine.cc
+++ b/system/bta/le_audio/broadcaster/state_machine.cc
@@ -20,27 +20,38 @@
 #include <bind_helpers.h>
 #include <bluetooth/log.h>
 
+#include <algorithm>
+#include <array>
+#include <cstdint>
 #include <functional>
 #include <iostream>
+#include <iterator>
+#include <memory>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "base/functional/bind.h"
 #include "base/functional/callback.h"
 #include "bta/le_audio/broadcaster/broadcaster_types.h"
-#include "bta/le_audio/codec_manager.h"
 #include "bta/le_audio/le_audio_types.h"
+#include "btm_api_types.h"
+#include "btm_iso_api_types.h"
 #include "common/strings.h"
+#include "hardware/ble_advertiser.h"
+#include "hardware/bt_le_audio.h"
 #include "hci/le_advertising_manager.h"
-#include "osi/include/properties.h"
+#include "hcidefs.h"
+#include "main/shim/le_advertising_manager.h"
 #include "stack/include/btm_iso_api.h"
+#include "types/raw_address.h"
 
 using bluetooth::common::ToString;
 using bluetooth::hci::IsoManager;
 using bluetooth::hci::iso_manager::big_create_cmpl_evt;
 using bluetooth::hci::iso_manager::big_terminate_cmpl_evt;
 
-using bluetooth::le_audio::CodecManager;
-using bluetooth::le_audio::types::CodecLocation;
-
 using namespace bluetooth::le_audio::broadcaster;
 using namespace bluetooth;
 
diff --git a/system/bta/le_audio/client.cc b/system/bta/le_audio/client.cc
index b0e465afff..c7b81de0dc 100644
--- a/system/bta/le_audio/client.cc
+++ b/system/bta/le_audio/client.cc
@@ -19,24 +19,43 @@
 #include <base/strings/string_number_conversions.h>
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
-#include <lc3.h>
-
+#include <stdio.h>
+
+#include <algorithm>
+#include <bitset>
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
 #include <deque>
+#include <functional>
+#include <list>
 #include <map>
+#include <memory>
 #include <mutex>
 #include <optional>
+#include <ostream>
+#include <sstream>
+#include <tuple>
+#include <utility>
+#include <vector>
 
 #include "audio_hal_client/audio_hal_client.h"
 #include "audio_hal_interface/le_audio_software.h"
 #include "bt_types.h"
 #include "bta/csis/csis_types.h"
+#include "bta_csis_api.h"
 #include "bta_gatt_api.h"
 #include "bta_gatt_queue.h"
 #include "bta_groups.h"
 #include "bta_le_audio_api.h"
 #include "bta_le_audio_broadcaster_api.h"
 #include "btif/include/btif_profile_storage.h"
+#include "btm_api_types.h"
+#include "btm_ble_api_types.h"
 #include "btm_iso_api.h"
+#include "btm_iso_api_types.h"
+#include "btm_sec_api_types.h"
 #include "client_parser.h"
 #include "codec_interface.h"
 #include "codec_manager.h"
@@ -44,23 +63,29 @@
 #include "common/time_util.h"
 #include "content_control_id_keeper.h"
 #include "devices.h"
+#include "gatt/database.h"
 #include "gatt_api.h"
+#include "gattdefs.h"
 #include "gmap_client.h"
 #include "gmap_server.h"
+#include "hardware/bt_le_audio.h"
 #include "hci/controller_interface.h"
+#include "hci_error_code.h"
 #include "include/hardware/bt_gmap.h"
+#include "internal_include/bt_trace.h"
 #include "internal_include/stack_config.h"
 #include "le_audio/device_groups.h"
+#include "le_audio/le_audio_log_history.h"
 #include "le_audio_health_status.h"
 #include "le_audio_set_configuration_provider.h"
 #include "le_audio_types.h"
 #include "le_audio_utils.h"
 #include "main/shim/entry.h"
 #include "metrics_collector.h"
+#include "osi/include/alarm.h"
 #include "osi/include/osi.h"
 #include "osi/include/properties.h"
 #include "stack/btm/btm_sec.h"
-#include "stack/include/acl_api.h"
 #include "stack/include/bt_types.h"
 #include "stack/include/btm_client_interface.h"
 #include "stack/include/btm_status.h"
@@ -68,6 +93,15 @@
 #include "stack/include/main_thread.h"
 #include "state_machine.h"
 #include "storage_helper.h"
+#include "types/bluetooth/uuid.h"
+#include "types/bt_transport.h"
+#include "types/raw_address.h"
+
+#ifdef TARGET_FLOSS
+#include <audio_hal_interface/audio_linux.h>
+#else
+#include <hardware/audio.h>
+#endif  // TARGET_FLOSS
 
 // TODO(b/369381361) Enfore -Wmissing-prototypes
 #pragma GCC diagnostic ignored "-Wmissing-prototypes"
@@ -75,7 +109,6 @@
 using base::Closure;
 using bluetooth::Uuid;
 using bluetooth::common::ToString;
-using bluetooth::gmap::RolesBitMask;
 using bluetooth::groups::DeviceGroups;
 using bluetooth::groups::DeviceGroupsCallbacks;
 using bluetooth::hci::IsoManager;
@@ -88,7 +121,6 @@ using bluetooth::le_audio::ContentControlIdKeeper;
 using bluetooth::le_audio::DeviceConnectState;
 using bluetooth::le_audio::DsaMode;
 using bluetooth::le_audio::DsaModes;
-using bluetooth::le_audio::GmapCharacteristic;
 using bluetooth::le_audio::GmapClient;
 using bluetooth::le_audio::GmapServer;
 using bluetooth::le_audio::GroupNodeStatus;
@@ -115,7 +147,6 @@ using bluetooth::le_audio::types::AudioLocations;
 using bluetooth::le_audio::types::BidirectionalPair;
 using bluetooth::le_audio::types::DataPathState;
 using bluetooth::le_audio::types::hdl_pair;
-using bluetooth::le_audio::types::kDefaultScanDurationS;
 using bluetooth::le_audio::types::kLeAudioContextAllRemoteSource;
 using bluetooth::le_audio::types::kLeAudioContextAllTypesArray;
 using bluetooth::le_audio::types::LeAudioContextType;
diff --git a/system/bta/le_audio/client_parser.cc b/system/bta/le_audio/client_parser.cc
index 9de6734bc7..36a9eebe42 100644
--- a/system/bta/le_audio/client_parser.cc
+++ b/system/bta/le_audio/client_parser.cc
@@ -23,14 +23,18 @@
 
 #include <base/strings/string_number_conversions.h>
 #include <bluetooth/log.h>
-#include <endian.h>
-#include <hardware/bt_common_types.h>
 #include <hardware/bt_gatt_types.h>
 
+#include <bitset>
+#include <cstddef>
+#include <cstdint>
 #include <map>
 #include <numeric>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
 
-#include "internal_include/bt_trace.h"
 #include "le_audio_types.h"
 #include "le_audio_utils.h"
 #include "stack/include/bt_types.h"
diff --git a/system/bta/le_audio/codec_interface.cc b/system/bta/le_audio/codec_interface.cc
index 0342e45c74..e3112747b8 100644
--- a/system/bta/le_audio/codec_interface.cc
+++ b/system/bta/le_audio/codec_interface.cc
@@ -21,10 +21,16 @@
 #include <bluetooth/log.h>
 #include <lc3.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
 #include <memory>
 #include <optional>
 #include <vector>
 
+#include "audio_hal_client/audio_hal_client.h"
+#include "le_audio/le_audio_types.h"
+
 namespace bluetooth::le_audio {
 
 struct CodecInterface::Impl {
diff --git a/system/bta/le_audio/codec_manager.cc b/system/bta/le_audio/codec_manager.cc
index 117c3a2cec..eb0efb545f 100644
--- a/system/bta/le_audio/codec_manager.cc
+++ b/system/bta/le_audio/codec_manager.cc
@@ -19,14 +19,29 @@
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
 
+#include <algorithm>
 #include <bitset>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <ostream>
 #include <sstream>
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+#include <utility>
 #include <vector>
 
 #include "audio_hal_client/audio_hal_client.h"
+#include "audio_hal_interface/le_audio_software.h"
 #include "broadcaster/broadcast_configuration_provider.h"
 #include "broadcaster/broadcaster_types.h"
+#include "bta_le_audio_api.h"
+#include "btm_iso_api_types.h"
+#include "hardware/bt_le_audio.h"
 #include "hci/controller_interface.h"
+#include "hci/hci_packets.h"
 #include "le_audio/le_audio_types.h"
 #include "le_audio_set_configuration_provider.h"
 #include "le_audio_utils.h"
@@ -42,7 +57,6 @@ using bluetooth::le_audio::CodecManager;
 using bluetooth::le_audio::types::CodecLocation;
 using bluetooth::legacy::hci::GetInterface;
 
-using bluetooth::le_audio::AudioSetConfigurationProvider;
 using bluetooth::le_audio::btle_audio_codec_config_t;
 using bluetooth::le_audio::btle_audio_codec_index_t;
 using bluetooth::le_audio::set_configurations::AseConfiguration;
diff --git a/system/bta/le_audio/content_control_id_keeper.cc b/system/bta/le_audio/content_control_id_keeper.cc
index f4ca933f06..399397f1a8 100644
--- a/system/bta/le_audio/content_control_id_keeper.cc
+++ b/system/bta/le_audio/content_control_id_keeper.cc
@@ -19,8 +19,10 @@
 #include <bluetooth/log.h>
 
 #include <algorithm>
-#include <bitset>
+#include <cstdint>
 #include <map>
+#include <memory>
+#include <vector>
 
 #include "common/strings.h"
 #include "le_audio_types.h"
diff --git a/system/bta/le_audio/device_groups.cc b/system/bta/le_audio/device_groups.cc
index 7712f6d410..bc48823507 100644
--- a/system/bta/le_audio/device_groups.cc
+++ b/system/bta/le_audio/device_groups.cc
@@ -19,15 +19,33 @@
 #include "device_groups.h"
 
 #include <bluetooth/log.h>
-
+#include <stdio.h>
+
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <iterator>
+#include <memory>
 #include <optional>
+#include <sstream>
+#include <utility>
+#include <vector>
 
+#include "audio_hal_client/audio_hal_client.h"
 #include "bta/include/bta_gatt_api.h"
 #include "bta_csis_api.h"
+#include "bta_groups.h"
 #include "btif/include/btif_profile_storage.h"
+#include "btm_ble_api_types.h"
 #include "btm_iso_api.h"
+#include "btm_iso_api_types.h"
+#include "com_android_bluetooth_flags.h"
 #include "common/strings.h"
+#include "gatt_api.h"
+#include "hardware/bt_le_audio.h"
 #include "hci/controller_interface.h"
+#include "hci_error_code.h"
 #include "internal_include/bt_trace.h"
 #include "le_audio/codec_manager.h"
 #include "le_audio/devices.h"
@@ -35,7 +53,9 @@
 #include "le_audio_utils.h"
 #include "main/shim/entry.h"
 #include "metrics_collector.h"
+#include "os/logging/log_adapter.h"
 #include "stack/include/btm_client_interface.h"
+#include "types/bt_transport.h"
 
 // TODO(b/369381361) Enfore -Wmissing-prototypes
 #pragma GCC diagnostic ignored "-Wmissing-prototypes"
@@ -51,7 +71,6 @@ using types::CisState;
 using types::CisType;
 using types::DataPathState;
 using types::LeAudioContextType;
-using types::LeAudioCoreCodecConfig;
 
 /* LeAudioDeviceGroup Class methods implementation */
 void LeAudioDeviceGroup::AddNode(const std::shared_ptr<LeAudioDevice>& leAudioDevice) {
diff --git a/system/bta/le_audio/devices.cc b/system/bta/le_audio/devices.cc
index 87fdd19a05..b5e9dee372 100644
--- a/system/bta/le_audio/devices.cc
+++ b/system/bta/le_audio/devices.cc
@@ -20,20 +20,45 @@
 #include <base/strings/string_number_conversions.h>
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
+#include <stdio.h>
+
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <iomanip>
+#include <ios>
+#include <iterator>
+#include <memory>
+#include <optional>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <vector>
 
 #include "acl_api.h"
+#include "bta_gatt_api.h"
 #include "bta_gatt_queue.h"
 #include "btif/include/btif_storage.h"
+#include "btm_ble_api_types.h"
+#include "btm_iso_api_types.h"
 #include "common/strings.h"
+#include "gatt_api.h"
+#include "hardware/bluetooth.h"
 #include "hci/controller_interface.h"
+#include "hci_error_code.h"
+#include "hcidefs.h"
 #include "internal_include/bt_trace.h"
 #include "le_audio/codec_manager.h"
 #include "le_audio/le_audio_types.h"
 #include "le_audio_log_history.h"
 #include "le_audio_utils.h"
 #include "main/shim/entry.h"
+#include "os/logging/log_adapter.h"
+#include "osi/include/alarm.h"
 #include "osi/include/properties.h"
 #include "stack/include/btm_client_interface.h"
+#include "types/bt_transport.h"
+#include "types/raw_address.h"
 
 // TODO(b/369381361) Enfore -Wmissing-prototypes
 #pragma GCC diagnostic ignored "-Wmissing-prototypes"
@@ -41,7 +66,6 @@
 using bluetooth::hci::kIsoCigPhy1M;
 using bluetooth::hci::kIsoCigPhy2M;
 using bluetooth::le_audio::DeviceConnectState;
-using bluetooth::le_audio::set_configurations::CodecConfigSetting;
 using bluetooth::le_audio::types::ase;
 using bluetooth::le_audio::types::AseState;
 using bluetooth::le_audio::types::AudioContexts;
@@ -50,7 +74,6 @@ using bluetooth::le_audio::types::BidirectionalPair;
 using bluetooth::le_audio::types::CisState;
 using bluetooth::le_audio::types::DataPathState;
 using bluetooth::le_audio::types::LeAudioContextType;
-using bluetooth::le_audio::types::LeAudioCoreCodecConfig;
 
 namespace bluetooth::le_audio {
 std::ostream& operator<<(std::ostream& os, const DeviceConnectState& state) {
diff --git a/system/bta/le_audio/le_audio_health_status.cc b/system/bta/le_audio/le_audio_health_status.cc
index 5a2c2feb92..6b811e1174 100644
--- a/system/bta/le_audio/le_audio_health_status.cc
+++ b/system/bta/le_audio/le_audio_health_status.cc
@@ -17,13 +17,22 @@
 #include "le_audio_health_status.h"
 
 #include <bluetooth/log.h>
+#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
+#include <stdio.h>
 
+#include <algorithm>
+#include <sstream>
+#include <utility>
 #include <vector>
 
 #include "bta/include/bta_groups.h"
 #include "common/strings.h"
+#include "device_groups.h"
+#include "devices.h"
+#include "hardware/bt_le_audio.h"
 #include "main/shim/metrics_api.h"
-#include "osi/include/properties.h"
+#include "os/logging/log_adapter.h"
+#include "types/raw_address.h"
 
 using bluetooth::common::ToString;
 using bluetooth::groups::kGroupUnknown;
diff --git a/system/bta/le_audio/le_audio_log_history.cc b/system/bta/le_audio/le_audio_log_history.cc
index 22fd939994..a53e4944ea 100644
--- a/system/bta/le_audio/le_audio_log_history.cc
+++ b/system/bta/le_audio/le_audio_log_history.cc
@@ -18,16 +18,18 @@
 
 #include <bluetooth/log.h>
 
-#include <cstdint>
+#include <cstddef>
+#include <cstdio>
+#include <ctime>
 #include <memory>
 #include <string>
+#include <vector>
 
 #include "common/circular_buffer.h"
 #include "common/strings.h"
 #include "main/shim/dumpsys.h"
 #include "os/logging/log_adapter.h"
-#include "osi/include/osi.h"
-#include "osi/include/properties.h"
+#include "types/raw_address.h"
 
 using namespace bluetooth;
 
diff --git a/system/bta/le_audio/le_audio_set_configuration_provider_json.cc b/system/bta/le_audio/le_audio_set_configuration_provider_json.cc
index 3b8643152d..8e22ddb3ff 100644
--- a/system/bta/le_audio/le_audio_set_configuration_provider_json.cc
+++ b/system/bta/le_audio/le_audio_set_configuration_provider_json.cc
@@ -16,27 +16,34 @@
  */
 
 #include <bluetooth/log.h>
+#include <stdio.h>
 
+#include <algorithm>
+#include <cstdint>
+#include <map>
+#include <memory>
 #include <mutex>
+#include <sstream>
 #include <string>
 #include <string_view>
+#include <utility>
+#include <vector>
 
 #include "audio_hal_client/audio_hal_client.h"
 #include "audio_set_configurations_generated.h"
 #include "audio_set_scenarios_generated.h"
 #include "btm_iso_api_types.h"
+#include "flatbuffers/buffer.h"
 #include "flatbuffers/idl.h"
 #include "flatbuffers/util.h"
+#include "flatbuffers/vector.h"
 #include "le_audio/le_audio_types.h"
 #include "le_audio_set_configuration_provider.h"
-#include "osi/include/osi.h"
-#include "osi/include/properties.h"
 
 using bluetooth::le_audio::set_configurations::AseConfiguration;
 using bluetooth::le_audio::set_configurations::AudioSetConfiguration;
 using bluetooth::le_audio::set_configurations::AudioSetConfigurations;
 using bluetooth::le_audio::set_configurations::CodecConfigSetting;
-using bluetooth::le_audio::set_configurations::LeAudioCodecIdLc3;
 using bluetooth::le_audio::set_configurations::QosConfigSetting;
 using bluetooth::le_audio::types::LeAudioContextType;
 
@@ -103,21 +110,14 @@ struct AudioSetConfigurationProviderJson {
           ::bluetooth::le_audio::types::LeAudioContextType context_type) {
     switch (context_type) {
       case types::LeAudioContextType::ALERTS:
-        FALLTHROUGH_INTENDED;
       case types::LeAudioContextType::INSTRUCTIONAL:
-        FALLTHROUGH_INTENDED;
       case types::LeAudioContextType::NOTIFICATIONS:
-        FALLTHROUGH_INTENDED;
       case types::LeAudioContextType::EMERGENCYALARM:
-        FALLTHROUGH_INTENDED;
       case types::LeAudioContextType::UNSPECIFIED:
-        FALLTHROUGH_INTENDED;
       case types::LeAudioContextType::SOUNDEFFECTS:
-        FALLTHROUGH_INTENDED;
       case types::LeAudioContextType::MEDIA:
         return "Media";
       case types::LeAudioContextType::RINGTONE:
-        FALLTHROUGH_INTENDED;
       case types::LeAudioContextType::CONVERSATIONAL:
         return "Conversational";
       case types::LeAudioContextType::LIVE:
diff --git a/system/bta/le_audio/le_audio_types.cc b/system/bta/le_audio/le_audio_types.cc
index 632a986626..b164649c50 100644
--- a/system/bta/le_audio/le_audio_types.cc
+++ b/system/bta/le_audio/le_audio_types.cc
@@ -25,8 +25,25 @@
 #include <base/strings/string_number_conversions.h>
 #include <bluetooth/log.h>
 
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <iomanip>
+#include <iterator>
+#include <map>
+#include <memory>
+#include <optional>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
 #include "audio_hal_client/audio_hal_client.h"
 #include "common/strings.h"
+#include "hardware/bt_le_audio.h"
 #include "internal_include/bt_trace.h"
 #include "le_audio_utils.h"
 #include "stack/include/bt_types.h"
@@ -40,10 +57,7 @@ using types::LeAudioContextType;
 
 namespace set_configurations {
 using set_configurations::CodecConfigSetting;
-using types::CodecLocation;
 using types::kLeAudioCodingFormatLC3;
-using types::kLeAudioDirectionSink;
-using types::kLeAudioDirectionSource;
 using types::LeAudioCoreCodecConfig;
 
 void get_cis_count(LeAudioContextType context_type, uint8_t expected_remote_direction,
diff --git a/system/bta/le_audio/le_audio_utils.cc b/system/bta/le_audio/le_audio_utils.cc
index 8a1bb6cbfc..14b123c6d4 100644
--- a/system/bta/le_audio/le_audio_utils.cc
+++ b/system/bta/le_audio/le_audio_utils.cc
@@ -18,7 +18,16 @@
 
 #include <bluetooth/log.h>
 
+#include <cstdint>
+#include <sstream>
+#include <string>
+#include <type_traits>
+#include <vector>
+
+#include "audio_hal_client/audio_hal_client.h"
 #include "common/strings.h"
+#include "hardware/bt_le_audio.h"
+#include "le_audio/codec_manager.h"
 #include "le_audio_types.h"
 
 using bluetooth::common::ToString;
diff --git a/system/bta/le_audio/metrics_collector.cc b/system/bta/le_audio/metrics_collector.cc
index 74bd85f192..a4fb4a353d 100644
--- a/system/bta/le_audio/metrics_collector.cc
+++ b/system/bta/le_audio/metrics_collector.cc
@@ -18,10 +18,17 @@
 
 #include <bluetooth/log.h>
 
+#include <chrono>
+#include <cstdint>
+#include <cstdlib>
 #include <memory>
+#include <unordered_map>
 #include <vector>
 
 #include "common/metrics.h"
+#include "hardware/bt_le_audio.h"
+#include "le_audio_types.h"
+#include "types/raw_address.h"
 
 namespace bluetooth::le_audio {
 
diff --git a/system/bta/le_audio/state_machine.cc b/system/bta/le_audio/state_machine.cc
index b548a1fc2e..1f01b3b763 100644
--- a/system/bta/le_audio/state_machine.cc
+++ b/system/bta/le_audio/state_machine.cc
@@ -23,21 +23,44 @@
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
 
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "bta_gatt_queue.h"
 #include "btm_iso_api.h"
+#include "btm_iso_api_types.h"
 #include "client_parser.h"
-#include "codec_manager.h"
 #include "common/strings.h"
+#include "device_groups.h"
 #include "devices.h"
+#include "gatt_api.h"
+#include "hardware/bt_le_audio.h"
 #include "hci/hci_packets.h"
+#include "hci_error_code.h"
+#include "hcimsgs.h"
 #include "internal_include/bt_trace.h"
 #include "le_audio_health_status.h"
 #include "le_audio_log_history.h"
 #include "le_audio_types.h"
+#include "os/logging/log_adapter.h"
 #include "osi/include/alarm.h"
 #include "osi/include/osi.h"
 #include "osi/include/properties.h"
 #include "stack/include/btm_client_interface.h"
+#include "types/bt_transport.h"
+#include "types/raw_address.h"
+
+#ifdef TARGET_FLOSS
+#include <audio_hal_interface/audio_linux.h>
+#else
+#include <hardware/audio.h>
+#endif  // TARGET_FLOSS
 
 // clang-format off
 /* ASCS state machine 1.0
@@ -92,7 +115,6 @@
 
 using bluetooth::common::ToString;
 using bluetooth::hci::IsoManager;
-using bluetooth::le_audio::CodecManager;
 using bluetooth::le_audio::GroupStreamStatus;
 using bluetooth::le_audio::LeAudioDevice;
 using bluetooth::le_audio::LeAudioDeviceGroup;
@@ -108,10 +130,8 @@ using bluetooth::le_audio::types::AudioContexts;
 using bluetooth::le_audio::types::BidirectionalPair;
 using bluetooth::le_audio::types::CigState;
 using bluetooth::le_audio::types::CisState;
-using bluetooth::le_audio::types::CodecLocation;
 using bluetooth::le_audio::types::DataPathState;
 using bluetooth::le_audio::types::LeAudioContextType;
-using bluetooth::le_audio::types::LeAudioCoreCodecConfig;
 
 namespace {
 
@@ -222,7 +242,8 @@ public:
         ReleaseCisIds(group);
 
         /* If configuration is needed */
-        FALLTHROUGH_INTENDED;
+        [[fallthrough]];
+
       case AseState::BTA_LE_AUDIO_ASE_STATE_IDLE:
         if (!group->Configure(context_type, metadata_context_types, ccid_lists)) {
           log::error("failed to set ASE configuration");
@@ -2243,7 +2264,8 @@ private:
                 ToString(AseState::BTA_LE_AUDIO_ASE_STATE_CODEC_CONFIGURED),
                 ToString(AseState::BTA_LE_AUDIO_ASE_STATE_QOS_CONFIGURED));
         group->PrintDebugState();
-        FMT_FALLTHROUGH;
+        [[fallthrough]];
+
       case AseState::BTA_LE_AUDIO_ASE_STATE_CODEC_CONFIGURED: {
         SetAseState(leAudioDevice, ase, AseState::BTA_LE_AUDIO_ASE_STATE_QOS_CONFIGURED);
 
diff --git a/system/bta/le_audio/storage_helper.cc b/system/bta/le_audio/storage_helper.cc
index 916c8249b1..159580d456 100644
--- a/system/bta/le_audio/storage_helper.cc
+++ b/system/bta/le_audio/storage_helper.cc
@@ -20,8 +20,15 @@
 
 #include <bluetooth/log.h>
 
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <limits>
+#include <tuple>
+#include <vector>
+
 #include "client_parser.h"
-#include "common/strings.h"
+#include "devices.h"
 #include "le_audio_types.h"
 #include "stack/include/bt_types.h"
 
diff --git a/system/bta/pan/bta_pan_act.cc b/system/bta/pan/bta_pan_act.cc
index 2ecc793111..05a369db46 100644
--- a/system/bta/pan/bta_pan_act.cc
+++ b/system/bta/pan/bta_pan_act.cc
@@ -26,10 +26,16 @@
 
 #include <bluetooth/log.h>
 
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
+#include <string>
 
 #include "bta/include/bta_pan_co.h"
 #include "bta/pan/bta_pan_int.h"
+#include "bta_api.h"
+#include "bta_pan_api.h"
+#include "bta_sys.h"
 #include "internal_include/bt_target.h"  // PAN_INCLUDED
 #include "osi/include/allocator.h"
 #include "osi/include/fixed_queue.h"
diff --git a/system/bta/pan/bta_pan_api.cc b/system/bta/pan/bta_pan_api.cc
index 5d75ac19ef..4fb2c04fcb 100644
--- a/system/bta/pan/bta_pan_api.cc
+++ b/system/bta/pan/bta_pan_api.cc
@@ -23,11 +23,15 @@
  *
  ******************************************************************************/
 
+#include "bta_pan_api.h"
+
 #include <cstdint>
 #include <cstring>
+#include <string>
 
 #include "bta/pan/bta_pan_int.h"
-#include "internal_include/bt_target.h"
+#include "bta_api.h"
+#include "bta_sys.h"
 #include "osi/include/allocator.h"
 #include "osi/include/compat.h"
 #include "stack/include/bt_hdr.h"
diff --git a/system/bta/pan/bta_pan_ci.cc b/system/bta/pan/bta_pan_ci.cc
index a00ef5ba10..f4537b0d5b 100644
--- a/system/bta/pan/bta_pan_ci.cc
+++ b/system/bta/pan/bta_pan_ci.cc
@@ -24,9 +24,11 @@
 
 #include "bta/include/bta_pan_ci.h"
 
+#include <cstddef>
+#include <cstdint>
+
 #include "bta/pan/bta_pan_int.h"
-#include "internal_include/bt_target.h"
-#include "osi/include/allocator.h"
+#include "osi/include/fixed_queue.h"
 #include "stack/include/bt_hdr.h"
 #include "types/raw_address.h"
 
diff --git a/system/bta/pan/bta_pan_main.cc b/system/bta/pan/bta_pan_main.cc
index 249b3c01cb..501e785fd6 100644
--- a/system/bta/pan/bta_pan_main.cc
+++ b/system/bta/pan/bta_pan_main.cc
@@ -23,10 +23,13 @@
  ******************************************************************************/
 #include <bluetooth/log.h>
 
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
 
 #include "bta/pan/bta_pan_int.h"
-#include "internal_include/bt_target.h"
+#include "bta_pan_api.h"
+#include "osi/include/fixed_queue.h"
 #include "stack/include/bt_hdr.h"
 
 using namespace bluetooth;
diff --git a/system/bta/ras/ras_client.cc b/system/bta/ras/ras_client.cc
index 6e0f6eb905..94990ceee9 100644
--- a/system/bta/ras/ras_client.cc
+++ b/system/bta/ras/ras_client.cc
@@ -17,16 +17,34 @@
 #include <base/functional/bind.h>
 #include <base/functional/callback.h>
 
+#include <algorithm>
+#include <cstdint>
+#include <list>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include "bluetooth/log.h"
 #include "bta/include/bta_gatt_api.h"
 #include "bta/include/bta_ras_api.h"
 #include "bta/ras/ras_types.h"
+#include "btm_ble_api_types.h"
+#include "gatt/database.h"
+#include "gatt_api.h"
+#include "gattdefs.h"
 #include "gd/hci/controller_interface.h"
 #include "main/shim/entry.h"
-#include "os/logging/log_adapter.h"
+#include "osi/include/alarm.h"
 #include "stack/include/bt_types.h"
 #include "stack/include/btm_ble_addr.h"
 #include "stack/include/gap_api.h"
 #include "stack/include/main_thread.h"
+#include "types/ble_address_with_type.h"
+#include "types/bluetooth/uuid.h"
+#include "types/bt_transport.h"
+#include "types/raw_address.h"
 
 using namespace bluetooth;
 using namespace ::ras;
diff --git a/system/bta/ras/ras_server.cc b/system/bta/ras/ras_server.cc
index 0ecf5ef104..006c1bce5d 100644
--- a/system/bta/ras/ras_server.cc
+++ b/system/bta/ras/ras_server.cc
@@ -18,19 +18,29 @@
 #include <base/functional/callback.h>
 #include <bluetooth/log.h>
 
+#include <algorithm>
+#include <cstdint>
+#include <cstring>
+#include <mutex>
 #include <unordered_map>
+#include <vector>
 
 #include "bta/include/bta_gatt_api.h"
 #include "bta/include/bta_ras_api.h"
 #include "bta/ras/ras_types.h"
+#include "btm_ble_api_types.h"
+#include "gatt_api.h"
 #include "gd/hci/controller_interface.h"
-#include "gd/hci/uuid.h"
 #include "gd/os/rand.h"
+#include "hardware/bt_common_types.h"
 #include "main/shim/entry.h"
-#include "os/logging/log_adapter.h"
 #include "stack/include/bt_types.h"
 #include "stack/include/btm_ble_addr.h"
 #include "stack/include/main_thread.h"
+#include "types/ble_address_with_type.h"
+#include "types/bluetooth/uuid.h"
+#include "types/bt_transport.h"
+#include "types/raw_address.h"
 
 using namespace bluetooth;
 using namespace ::ras;
diff --git a/system/bta/ras/ras_utils.cc b/system/bta/ras/ras_utils.cc
index 2a9b3b9c88..541149423d 100644
--- a/system/bta/ras/ras_utils.cc
+++ b/system/bta/ras/ras_utils.cc
@@ -16,14 +16,12 @@
 
 #include <base/functional/bind.h>
 
-#include <unordered_map>
+#include <cstdint>
+#include <cstring>
+#include <string>
 
-#include "bta/include/bta_gatt_api.h"
-#include "bta/include/bta_ras_api.h"
+#include "bluetooth/log.h"
 #include "bta/ras/ras_types.h"
-#include "stack/include/bt_types.h"
-#include "stack/include/btm_ble_addr.h"
-#include "stack/include/gap_api.h"
 #include "types/bluetooth/uuid.h"
 
 using namespace bluetooth;
diff --git a/system/bta/vc/device.cc b/system/bta/vc/device.cc
index 1510e99a51..d1d9611a23 100644
--- a/system/bta/vc/device.cc
+++ b/system/bta/vc/device.cc
@@ -18,18 +18,29 @@
 #include <bluetooth/log.h>
 #include <com_android_bluetooth_flags.h>
 
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <list>
 #include <map>
+#include <string>
+#include <utility>
 #include <vector>
 
 #include "bta/include/bta_gatt_api.h"
 #include "bta/include/bta_gatt_queue.h"
 #include "bta/vc/devices.h"
-#include "internal_include/bt_trace.h"
-#include "os/logging/log_adapter.h"
+#include "btm_ble_api_types.h"
+#include "btm_sec_api_types.h"
+#include "btm_status.h"
+#include "gatt/database.h"
+#include "gattdefs.h"
 #include "stack/btm/btm_sec.h"
 #include "stack/include/bt_types.h"
 #include "stack/include/gatt_api.h"
 #include "types/bluetooth/uuid.h"
+#include "types/bt_transport.h"
+#include "vc/types.h"
 
 using bluetooth::vc::internal::VolumeControlDevice;
 
diff --git a/system/bta/vc/vc.cc b/system/bta/vc/vc.cc
index e18d630a80..cf9fee3387 100644
--- a/system/bta/vc/vc.cc
+++ b/system/bta/vc/vc.cc
@@ -22,9 +22,15 @@
 #include <bluetooth/log.h>
 #include <hardware/bt_gatt_types.h>
 #include <hardware/bt_vc.h>
+#include <stdio.h>
 
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <list>
 #include <mutex>
 #include <string>
+#include <variant>
 #include <vector>
 
 #include "bta/include/bta_csis_api.h"
@@ -33,16 +39,21 @@
 #include "bta/include/bta_vc_api.h"
 #include "bta/le_audio/le_audio_types.h"
 #include "bta/vc/devices.h"
-#include "internal_include/bt_trace.h"
+#include "bta_groups.h"
+#include "btm_ble_api_types.h"
+#include "gatt/database.h"
+#include "gatt_api.h"
+#include "osi/include/alarm.h"
 #include "osi/include/osi.h"
 #include "stack/btm/btm_sec.h"
 #include "stack/include/bt_types.h"
 #include "stack/include/btm_status.h"
 #include "types/bluetooth/uuid.h"
+#include "types/bt_transport.h"
 #include "types/raw_address.h"
+#include "vc/types.h"
 
 using base::Closure;
-using bluetooth::Uuid;
 using bluetooth::csis::CsisClient;
 using bluetooth::vc::ConnectionState;
 using bluetooth::vc::VolumeInputStatus;
diff --git a/system/osi/include/compat.h b/system/osi/include/compat.h
index 2a93a849b8..78c294806d 100644
--- a/system/osi/include/compat.h
+++ b/system/osi/include/compat.h
@@ -19,8 +19,14 @@
 #pragma once
 
 #include <features.h>
+#include <stddef.h>
 #include <sys/types.h>
 
+/// Supplied by bionic and glibc>=2.38
+/// This declaration is added simplify clang-tidy
+/// misc-include-cleaner check.
+extern "C" size_t strlcpy(char* dst, const char* src, size_t siz);
+
 #if __GLIBC__
 
 #include <unistd.h>
@@ -28,10 +34,4 @@
 /* Get thread identification. */
 pid_t gettid(void) throw();
 
-/* glibc>=2.38 supplies its own strlcpy which conflicts with this declaration */
-#if !(__GLIBC_PREREQ(2, 38))
-/* Copy src to string dst of size siz. */
-size_t strlcpy(char* dst, const char* src, size_t siz);
-#endif /* !(__GLIBC_PREREQ(2, 38)) */
-
-#endif
+#endif  // __GLIBC__
diff --git a/system/osi/src/compat.cc b/system/osi/src/compat.cc
index 2e0eb0d606..d4cbe5ca60 100644
--- a/system/osi/src/compat.cc
+++ b/system/osi/src/compat.cc
@@ -64,7 +64,7 @@ pid_t gettid(void) throw() { return syscall(SYS_gettid); }
  * will be copied.  Always NUL terminates (unless siz == 0).
  * Returns strlen(src); if retval >= siz, truncation occurred.
  */
-size_t strlcpy(char* dst, const char* src, size_t siz) {
+extern "C" size_t strlcpy(char* dst, const char* src, size_t siz) {
   char* d = dst;
   const char* s = src;
   size_t n = siz;