diff --git a/system/bta/ag/bta_ag_sdp.cc b/system/bta/ag/bta_ag_sdp.cc
index 1d556d6d332f040742e25191882384a7f158d768..aac5f8dc4f6d09160cc4c2e8366fb2ee4322ec1c 100644
--- a/system/bta/ag/bta_ag_sdp.cc
+++ b/system/bta/ag/bta_ag_sdp.cc
@@ -39,6 +39,7 @@
 #include "osi/include/allocator.h"
 #include "osi/include/osi.h"  // UNUSED_ATTR
 #include "stack/btm/btm_sco_hfp_hal.h"
+#include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/btm_api.h"
 #include "stack/include/main_thread.h"
diff --git a/system/bta/ar/bta_ar.cc b/system/bta/ar/bta_ar.cc
index 0afca202c190263dcfd3a490afc233234a2d618a..028fc8e62d113a17facbb5c67b9ab19a106bfc01 100644
--- a/system/bta/ar/bta_ar.cc
+++ b/system/bta/ar/bta_ar.cc
@@ -28,6 +28,7 @@
 #include "bta/sys/bta_sys.h"
 #include "stack/include/avct_api.h"
 #include "stack/include/avrc_api.h"
+#include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/sdp_api.h"
 #include "types/raw_address.h"
diff --git a/system/bta/av/bta_av_aact.cc b/system/bta/av/bta_av_aact.cc
index 79fcfdd91033616717c059909bee787c5d64968f..be2ea44d5c24db94798893343b246f8a4ab1e495 100644
--- a/system/bta/av/bta_av_aact.cc
+++ b/system/bta/av/bta_av_aact.cc
@@ -49,6 +49,7 @@
 #include "stack/include/a2dp_sbc.h"
 #include "stack/include/acl_api.h"
 #include "stack/include/bt_hdr.h"
+#include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/btm_api.h"
 #include "stack/include/btm_client_interface.h"
diff --git a/system/bta/av/bta_av_act.cc b/system/bta/av/bta_av_act.cc
index 4f008d5466b23beae2b1b668204bcb795e234566..52d29f6e2177491f97762accf0afb9aaa198dfc7 100644
--- a/system/bta/av/bta_av_act.cc
+++ b/system/bta/av/bta_av_act.cc
@@ -39,6 +39,7 @@
 #include "osi/include/properties.h"
 #include "stack/include/acl_api.h"
 #include "stack/include/bt_hdr.h"
+#include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/l2c_api.h"
 #include "stack/include/sdp_api.h"
diff --git a/system/bta/csis/csis_client.cc b/system/bta/csis/csis_client.cc
index 3bc262e4a453c16b907572e8f7aa03cada2aa537..f3968deb95e2b1dbbf40041e4275f774eb359c77 100644
--- a/system/bta/csis/csis_client.cc
+++ b/system/bta/csis/csis_client.cc
@@ -47,6 +47,7 @@
 #include "stack/btm/btm_dev.h"
 #include "stack/btm/btm_sec.h"
 #include "stack/gatt/gatt_int.h"
+#include "stack/include/bt_types.h"
 #include "stack/include/btm_ble_sec_api.h"
 
 using base::Closure;
diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc
index 81808e0ff8379fd9b020a475caba23795c2a99e3..935d343291fe076d56f1441d7feff7e67a6409a6 100644
--- a/system/bta/dm/bta_dm_act.cc
+++ b/system/bta/dm/bta_dm_act.cc
@@ -51,6 +51,7 @@
 #include "stack/gatt/connection_manager.h"
 #include "stack/include/acl_api.h"
 #include "stack/include/bt_hdr.h"
+#include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/btm_client_interface.h"
 #include "stack/include/gatt_api.h"
diff --git a/system/bta/gatt/bta_gattc_cache.cc b/system/bta/gatt/bta_gattc_cache.cc
index c5c2322f9bb0f9a1c3901dee2c87c53272f3ed9e..d337fa795f9a8bb0cef52711a9054c68c7899911 100644
--- a/system/bta/gatt/bta_gattc_cache.cc
+++ b/system/bta/gatt/bta_gattc_cache.cc
@@ -41,6 +41,7 @@
 #include "osi/include/allocator.h"
 #include "osi/include/osi.h"  // UNUSED_ATTR
 #include "stack/btm/btm_sec.h"
+#include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/gatt_api.h"
 #include "stack/include/sdp_api.h"
diff --git a/system/bta/has/has_client.cc b/system/bta/has/has_client.cc
index 859b84857c51ac017151519cf545f22b20b440a4..71beba452f709f36edc86efd0c618eaa5e3042a3 100644
--- a/system/bta/has/has_client.cc
+++ b/system/bta/has/has_client.cc
@@ -31,17 +31,15 @@
 #include "bta_csis_api.h"
 #include "bta_gatt_api.h"
 #include "bta_gatt_queue.h"
-#include "bta_groups.h"
 #include "bta_has_api.h"
 #include "bta_le_audio_uuids.h"
 #include "btm_sec.h"
-#include "device/include/controller.h"
 #include "gap_api.h"
 #include "gatt_api.h"
 #include "has_types.h"
-#include "osi/include/log.h"
-#include "osi/include/osi.h"
+#include "os/log.h"
 #include "osi/include/properties.h"
+#include "stack/include/bt_types.h"
 
 using base::Closure;
 using bluetooth::Uuid;
diff --git a/system/bta/has/has_types.h b/system/bta/has/has_types.h
index 66d0dd3fb87b593e4249b5bb90fa90041a2e6b80..5b1fe54b920c3e4263d2e6818bd5f8ba75725ecb 100644
--- a/system/bta/has/has_types.h
+++ b/system/bta/has/has_types.h
@@ -22,12 +22,14 @@
 #include <set>
 #include <vector>
 
-#include "bta_gatt_api.h"
 #include "gap_api.h"
 #include "hardware/bt_has.h"
 #include "has_ctp.h"
 #include "has_journal.h"
 #include "has_preset.h"
+#include "internal_include/bt_trace.h"
+#include "stack/include/bt_types.h"
+#include "stack/include/gatt_api.h"
 
 namespace le_audio {
 namespace has {
diff --git a/system/bta/hearing_aid/hearing_aid.cc b/system/bta/hearing_aid/hearing_aid.cc
index f6ca2980c9f5b9894972bd95a8763cd8cffa3d98..5530abbabb3f3acd86d9b0002613aded4c8166e1 100644
--- a/system/bta/hearing_aid/hearing_aid.cc
+++ b/system/bta/hearing_aid/hearing_aid.cc
@@ -45,6 +45,7 @@
 #include "stack/include/acl_api.h"        // BTM_ReadRSSI
 #include "stack/include/acl_api_types.h"  // tBTM_RSSI_RESULT
 #include "stack/include/bt_hdr.h"
+#include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/l2c_api.h"  // L2CAP_MIN_OFFSET
 #include "types/bluetooth/uuid.h"
diff --git a/system/bta/hf_client/bta_hf_client_sdp.cc b/system/bta/hf_client/bta_hf_client_sdp.cc
index 765140f0736b865396a19812c93362f5562c407e..03eb2ce4caf42d598f919f84d7d5b0bd913f946a 100644
--- a/system/bta/hf_client/bta_hf_client_sdp.cc
+++ b/system/bta/hf_client/bta_hf_client_sdp.cc
@@ -33,6 +33,7 @@
 #include "os/log.h"
 #include "osi/include/allocator.h"
 #include "osi/include/osi.h"  // UNUSED_ATTR
+#include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/btm_api.h"
 #include "stack/include/sdp_api.h"
diff --git a/system/bta/hh/bta_hh_le.cc b/system/bta/hh/bta_hh_le.cc
index 0a88943a56f615c8ce8c4fd7efaed107a6c27419..9acf55cce7a82558260bf36622f9b39ad8eff03e 100644
--- a/system/bta/hh/bta_hh_le.cc
+++ b/system/bta/hh/bta_hh_le.cc
@@ -32,6 +32,7 @@
 #include "osi/include/osi.h"    // ARRAY_SIZE
 #include "stack/btm/btm_sec.h"  // BTM_
 #include "stack/include/bt_hdr.h"
+#include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/btm_log_history.h"
 #include "stack/include/l2c_api.h"  // L2CA_
diff --git a/system/bta/jv/bta_jv_act.cc b/system/bta/jv/bta_jv_act.cc
index 7d0d75f4d9eaa01ff89b4b7e632470a089269435..41953641cb05e1235d7f2cce0d23c4c736eb5f90 100644
--- a/system/bta/jv/bta_jv_act.cc
+++ b/system/bta/jv/bta_jv_act.cc
@@ -42,6 +42,7 @@
 #include "stack/include/avdt_api.h"  // AVDT_PSM
 #include "stack/include/bt_hdr.h"
 #include "stack/include/bt_psm_types.h"
+#include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
 #include "stack/include/gap_api.h"
 #include "stack/include/l2cdefs.h"
diff --git a/system/bta/le_audio/broadcaster/broadcaster.cc b/system/bta/le_audio/broadcaster/broadcaster.cc
index d65cf54b0a9a61a14cf04cc085bc3d5cb7d4baa9..107e913a78d9cf4f0cb687412b1c45fa7051541c 100644
--- a/system/bta/le_audio/broadcaster/broadcaster.cc
+++ b/system/bta/le_audio/broadcaster/broadcaster.cc
@@ -21,7 +21,6 @@
 
 #include <mutex>
 
-#include "bta/include/bta_le_audio_api.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"
@@ -29,11 +28,12 @@
 #include "bta/le_audio/le_audio_types.h"
 #include "bta/le_audio/le_audio_utils.h"
 #include "bta/le_audio/metrics_collector.h"
+#include "common/strings.h"
 #include "device/include/controller.h"
-#include "gd/common/strings.h"
 #include "internal_include/stack_config.h"
-#include "osi/include/log.h"
+#include "os/log.h"
 #include "osi/include/properties.h"
+#include "stack/include/bt_types.h"
 #include "stack/include/btm_api_types.h"
 #include "stack/include/btm_iso_api.h"
 
diff --git a/system/bta/le_audio/client.cc b/system/bta/le_audio/client.cc
index 6c21b55647c633619907619b0e47678336f6c35d..7ca3cd48554a3cfcd3579fbb4ce189c2179bccec 100644
--- a/system/bta/le_audio/client.cc
+++ b/system/bta/le_audio/client.cc
@@ -24,11 +24,9 @@
 #include <mutex>
 #include <optional>
 
-#include "advertise_data_parser.h"
 #include "audio_hal_client/audio_hal_client.h"
 #include "audio_hal_interface/le_audio_software.h"
 #include "bta/csis/csis_types.h"
-#include "bta_api.h"
 #include "bta_gatt_api.h"
 #include "bta_gatt_queue.h"
 #include "bta_groups.h"
@@ -42,7 +40,6 @@
 #include "content_control_id_keeper.h"
 #include "device/include/controller.h"
 #include "devices.h"
-#include "gatt/bta_gattc_int.h"
 #include "gd/common/strings.h"
 #include "internal_include/stack_config.h"
 #include "le_audio_health_status.h"
@@ -50,10 +47,11 @@
 #include "le_audio_types.h"
 #include "le_audio_utils.h"
 #include "metrics_collector.h"
-#include "osi/include/log.h"
+#include "os/log.h"
 #include "osi/include/osi.h"
 #include "osi/include/properties.h"
 #include "stack/btm/btm_sec.h"
+#include "stack/include/bt_types.h"
 #include "stack/include/main_thread.h"
 #include "state_machine.h"
 #include "storage_helper.h"
diff --git a/system/bta/le_audio/client_parser.cc b/system/bta/le_audio/client_parser.cc
index 35bf8de348b0a5c650379d35e13991d47c311019..64937af92cfd5665092678a2293929eba67f4798 100644
--- a/system/bta/le_audio/client_parser.cc
+++ b/system/bta/le_audio/client_parser.cc
@@ -28,16 +28,12 @@
 #include <hardware/bt_gatt_types.h>
 
 #include <map>
-#include <memory>
 #include <numeric>
 
-#include "bta_le_audio_api.h"
-#include "gap_api.h"
-#include "gatt_api.h"
-#include "gd/common/strings.h"
+#include "internal_include/bt_trace.h"
 #include "le_audio_types.h"
-#include "osi/include/allocator.h"
-#include "osi/include/log.h"
+#include "os/log.h"
+#include "stack/include/bt_types.h"
 
 using le_audio::types::acs_ac_record;
 
diff --git a/system/bta/le_audio/state_machine_test.cc b/system/bta/le_audio/state_machine_test.cc
index 58d4620a2bdc09a7dcaaca14f49c7ace932c33b5..e88c75c01b7ea56e05e77e67fa8ef7033e8d8428 100644
--- a/system/bta/le_audio/state_machine_test.cc
+++ b/system/bta/le_audio/state_machine_test.cc
@@ -34,6 +34,7 @@
 #include "mock_controller.h"
 #include "mock_csis_client.h"
 #include "mock_iso_manager.h"
+#include "stack/include/bt_types.h"
 #include "test/common/mock_functions.h"
 #include "types/bt_transport.h"
 
diff --git a/system/bta/le_audio/storage_helper.cc b/system/bta/le_audio/storage_helper.cc
index ede095ed64a7001609a1948de4b5d19d90547b42..ccb25998a4f4a07149945962b8950526d844b050 100644
--- a/system/bta/le_audio/storage_helper.cc
+++ b/system/bta/le_audio/storage_helper.cc
@@ -22,6 +22,7 @@
 #include "gd/common/strings.h"
 #include "le_audio_types.h"
 #include "osi/include/log.h"
+#include "stack/include/bt_types.h"
 
 using le_audio::types::hdl_pair;
 
@@ -464,4 +465,4 @@ bool DeserializeHandles(LeAudioDevice* leAudioDevice,
   leAudioDevice->known_service_handles_ = true;
   return true;
 }
-}  // namespace le_audio
\ No newline at end of file
+}  // namespace le_audio
diff --git a/system/bta/vc/device.cc b/system/bta/vc/device.cc
index d9ebfdfae2c82f47dd316f55a118034c8209f922..c5a0c616e5f58e8d2c9ad9190e3714c9cfaa872c 100644
--- a/system/bta/vc/device.cc
+++ b/system/bta/vc/device.cc
@@ -26,6 +26,7 @@
 #include "gatt_api.h"
 #include "gd/common/strings.h"
 #include "stack/btm/btm_sec.h"
+#include "stack/include/bt_types.h"
 #include "types/bluetooth/uuid.h"
 
 using namespace bluetooth::vc::internal;
diff --git a/system/bta/vc/vc.cc b/system/bta/vc/vc.cc
index 22b0755553278dea125675488c7e6a03b04c0093..5a112b1981d716a35dafea5cdf0fc9168c6b7071 100644
--- a/system/bta/vc/vc.cc
+++ b/system/bta/vc/vc.cc
@@ -38,6 +38,7 @@
 #include "osi/include/log.h"
 #include "osi/include/osi.h"
 #include "stack/btm/btm_sec.h"
+#include "stack/include/bt_types.h"
 #include "types/bluetooth/uuid.h"
 #include "types/raw_address.h"