bt_target:[8/37] IWYU stack::

Bug: 315176531
Test: m .
Flag: EXEMPT, IWYU
Change-Id: I70fa868b6c01bfac57d8c0dd333b7d3861a3af20

31 files changed, 46 insertions, 56 deletions

diff --git a/system/stack/avct/avct_l2c_br.cc b/system/stack/avct/avct_l2c_br.cc
index 70b4b5e0f2..d52b06a306 100644
--- a/system/stack/avct/avct_l2c_br.cc
+++ b/system/stack/avct/avct_l2c_br.cc
@@ -30,7 +30,6 @@
 
 #include "avct_api.h"
 #include "avct_int.h"
-#include "bt_target.h"
 #include "internal_include/bt_target.h"
 #include "l2c_api.h"
 #include "l2cdefs.h"
diff --git a/system/stack/avct/avct_lcb_act.cc b/system/stack/avct/avct_lcb_act.cc
index 32cdb1ede1..36d641c85b 100644
--- a/system/stack/avct/avct_lcb_act.cc
+++ b/system/stack/avct/avct_lcb_act.cc
@@ -26,7 +26,6 @@
 
 #include "avct_api.h"
 #include "avct_int.h"
-#include "bt_target.h"
 #include "bta/include/bta_sec_api.h"
 #include "device/include/device_iot_config.h"
 #include "internal_include/bt_target.h"
diff --git a/system/stack/avdt/avdt_ccb_act.cc b/system/stack/avdt/avdt_ccb_act.cc
index e1cbeba333..4cc1d16008 100644
--- a/system/stack/avdt/avdt_ccb_act.cc
+++ b/system/stack/avdt/avdt_ccb_act.cc
@@ -28,11 +28,9 @@
 #include "avdt_api.h"
 #include "avdt_int.h"
 #include "avdtc_api.h"
-#include "bt_target.h"
-#include "btm_api.h"
+#include "internal_include/bt_target.h"
 #include "osi/include/allocator.h"
 #include "osi/include/osi.h"
-#include "stack/btm/btm_sec.h"
 #include "stack/include/bt_hdr.h"
 #include "types/raw_address.h"
 
diff --git a/system/stack/avdt/avdt_l2c.cc b/system/stack/avdt/avdt_l2c.cc
index 1d50681109..7888a52631 100644
--- a/system/stack/avdt/avdt_l2c.cc
+++ b/system/stack/avdt/avdt_l2c.cc
@@ -22,21 +22,21 @@
  *
  ******************************************************************************/
 
+#include <base/logging.h>
+
 #include "avdt_int.h"
-#include "bt_target.h"
 #include "bta/include/bta_av_api.h"
-#include "btm_api.h"
 #include "device/include/interop.h"
+#include "internal_include/bt_target.h"
 #include "l2c_api.h"
 #include "l2cdefs.h"
 #include "osi/include/allocator.h"
 #include "osi/include/osi.h"
 #include "stack/include/acl_api.h"
 #include "stack/include/bt_hdr.h"
+#include "stack/include/btm_api.h"
 #include "types/raw_address.h"
 
-#include <base/logging.h>
-
 /* callback function declarations */
 void avdt_l2c_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid,
                                 uint16_t psm, uint8_t id);
diff --git a/system/stack/btm/btm_ble_cont_energy.cc b/system/stack/btm/btm_ble_cont_energy.cc
index ef7600382e..4d1a7e78d5 100644
--- a/system/stack/btm/btm_ble_cont_energy.cc
+++ b/system/stack/btm/btm_ble_cont_energy.cc
@@ -21,8 +21,8 @@
 #include <inttypes.h>
 #include <string.h>
 
-#include "bt_target.h"
 #include "btm_ble_api.h"
+#include "internal_include/bt_target.h"
 #include "os/log.h"
 #include "stack/btm/btm_int_types.h"
 #include "stack/include/bt_types.h"
diff --git a/system/stack/btm/btm_ble_scanner.cc b/system/stack/btm/btm_ble_scanner.cc
index c4523179b1..16864dd652 100644
--- a/system/stack/btm/btm_ble_scanner.cc
+++ b/system/stack/btm/btm_ble_scanner.cc
@@ -15,18 +15,11 @@
  */
 
 #include <base/logging.h>
-#include <string.h>
-
-#include <queue>
-#include <vector>
 
 #include "ble_scanner.h"
 #include "ble_scanner_hci_interface.h"
-#include "bt_target.h"
-#include "btm_int_types.h"
-#include "device/include/controller.h"
+#include "internal_include/bt_target.h"
 #include "internal_include/stack_config.h"
-#include "osi/include/alarm.h"
 #include "stack/btm/btm_ble_int.h"
 
 std::mutex lock1;
diff --git a/system/stack/btm/btm_iot_config.cc b/system/stack/btm/btm_iot_config.cc
index de64ba090a..7f2e0e1e12 100644
--- a/system/stack/btm/btm_iot_config.cc
+++ b/system/stack/btm/btm_iot_config.cc
@@ -18,13 +18,12 @@
 
 #define LOG_TAG "btm_iot"
 
-#include "bt_target.h"
 #include "btif/include/btif_storage.h"
-#include "btif/include/btif_util.h"
 #include "btm_ble_api.h"
-#include "btm_int_types.h"
 #include "device/include/device_iot_config.h"
-#include "osi/include/log.h"
+#include "internal_include/bt_target.h"
+#include "os/log.h"
+#include "stack/acl/acl.h"
 
 /*******************************************************************************
  *
diff --git a/system/stack/btm/btm_main.cc b/system/stack/btm/btm_main.cc
index a1f72526af..9bd9a931d1 100644
--- a/system/stack/btm/btm_main.cc
+++ b/system/stack/btm/btm_main.cc
@@ -25,16 +25,16 @@
 #include <memory>
 #include <string>
 
-#include "bt_target.h"
 #include "btm_int_types.h"
-#include "btm_sec_cb.h"
-#include "main/shim/dumpsys.h"
-#include "osi/include/log.h"
-#include "stack/include/btm_client_interface.h"
-#include "stack/include/inq_hci_link_interface.h"
+#include "internal_include/bt_target.h"
+#include "os/log.h"
 #include "stack/include/security_client_callbacks.h"
 #include "types/raw_address.h"
 
+#ifdef TARGET_FLOSS
+#include "stack/include/inq_hci_link_interface.h"  // btm_inq_db_set_inq_by_rssi
+#endif                                             // TARGET_FLOSS
+
 /* Global BTM control block structure
 */
 tBTM_CB btm_cb;
diff --git a/system/stack/btm/btm_sco_hfp_hal.h b/system/stack/btm/btm_sco_hfp_hal.h
index c72ebe2daa..741aa6853f 100644
--- a/system/stack/btm/btm_sco_hfp_hal.h
+++ b/system/stack/btm/btm_sco_hfp_hal.h
@@ -20,8 +20,8 @@
 
 #include <vector>
 
-#include "bt_target.h"
 #include "device/include/esco_parameters.h"
+#include "internal_include/bt_target.h"
 #include "raw_address.h"
 
 // Used by the Bluetooth stack to get WBS supported and codec, or notify SCO
diff --git a/system/stack/gap/gap_conn.cc b/system/stack/gap/gap_conn.cc
index 36df97466f..e42ff22dc5 100644
--- a/system/stack/gap/gap_conn.cc
+++ b/system/stack/gap/gap_conn.cc
@@ -22,7 +22,7 @@
 
 #include "device/include/controller.h"
 #include "gap_api.h"
-#include "internal_include//bt_target.h"
+#include "internal_include/bt_target.h"
 #include "l2c_api.h"
 #include "l2cdefs.h"
 #include "osi/include/allocator.h"
diff --git a/system/stack/gatt/gatt_auth.cc b/system/stack/gatt/gatt_auth.cc
index 126baebbf3..c19b2d8e01 100644
--- a/system/stack/gatt/gatt_auth.cc
+++ b/system/stack/gatt/gatt_auth.cc
@@ -24,9 +24,9 @@
 #include <base/logging.h>
 #include <string.h>
 
-#include "bt_target.h"
 #include "gatt_api.h"
 #include "gatt_int.h"
+#include "internal_include/bt_target.h"
 #include "osi/include/allocator.h"
 #include "osi/include/osi.h"
 #include "stack/btm/btm_ble_sec.h"
diff --git a/system/stack/hcic/hcicmds.cc b/system/stack/hcic/hcicmds.cc
index 40b008b836..b68fd976f0 100644
--- a/system/stack/hcic/hcicmds.cc
+++ b/system/stack/hcic/hcicmds.cc
@@ -27,10 +27,10 @@
 #include <base/functional/callback_forward.h>
 #include <string.h>
 
-#include "bt_target.h"
 #include "device/include/esco_parameters.h"
 #include "hcidefs.h"
 #include "hcimsgs.h"
+#include "internal_include/bt_target.h"
 #include "main/shim/acl_api.h"
 #include "osi/include/allocator.h"
 #include "stack/include/bt_hdr.h"
diff --git a/system/stack/include/a2dp_aac.h b/system/stack/include/a2dp_aac.h
index 4d3ffddc40..1b0311af53 100644
--- a/system/stack/include/a2dp_aac.h
+++ b/system/stack/include/a2dp_aac.h
@@ -21,13 +21,12 @@
 #ifndef A2DP_AAC_H
 #define A2DP_AAC_H
 
-#include <bt_target.h>
-#include <stddef.h>
 #include <stdint.h>
 
 #include "a2dp_aac_constants.h"
 #include "a2dp_codec_api.h"
 #include "avdt_api.h"
+#include "internal_include/bt_target.h"
 #include "stack/include/bt_hdr.h"
 
 class A2dpCodecConfigAacBase : public A2dpCodecConfig {
diff --git a/system/stack/include/a2dp_sbc.h b/system/stack/include/a2dp_sbc.h
index 075929ceb2..60997c629c 100644
--- a/system/stack/include/a2dp_sbc.h
+++ b/system/stack/include/a2dp_sbc.h
@@ -21,13 +21,13 @@
 #ifndef A2DP_SBC_H
 #define A2DP_SBC_H
 
-#include <bt_target.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include "a2dp_codec_api.h"
 #include "a2dp_sbc_constants.h"
 #include "avdt_api.h"
+#include "internal_include/bt_target.h"
 #include "stack/include/bt_hdr.h"
 
 class A2dpCodecConfigSbcBase : public A2dpCodecConfig {
diff --git a/system/stack/include/a2dp_vendor_aptx.h b/system/stack/include/a2dp_vendor_aptx.h
index 283cce6c78..4dc34e1091 100644
--- a/system/stack/include/a2dp_vendor_aptx.h
+++ b/system/stack/include/a2dp_vendor_aptx.h
@@ -21,13 +21,13 @@
 #ifndef A2DP_VENDOR_APTX_H
 #define A2DP_VENDOR_APTX_H
 
-#include <bt_target.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include "a2dp_codec_api.h"
 #include "a2dp_vendor_aptx_constants.h"
 #include "avdt_api.h"
+#include "internal_include/bt_target.h"
 #include "stack/include/bt_hdr.h"
 
 class A2dpCodecConfigAptx : public A2dpCodecConfig {
diff --git a/system/stack/include/a2dp_vendor_aptx_hd.h b/system/stack/include/a2dp_vendor_aptx_hd.h
index 03e82513a8..d8363a7768 100644
--- a/system/stack/include/a2dp_vendor_aptx_hd.h
+++ b/system/stack/include/a2dp_vendor_aptx_hd.h
@@ -21,13 +21,13 @@
 #ifndef A2DP_VENDOR_APTX_HD_H
 #define A2DP_VENDOR_APTX_HD_H
 
-#include <bt_target.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include "a2dp_codec_api.h"
 #include "a2dp_vendor_aptx_hd_constants.h"
 #include "avdt_api.h"
+#include "internal_include/bt_target.h"
 #include "stack/include/bt_hdr.h"
 
 class A2dpCodecConfigAptxHd : public A2dpCodecConfig {
diff --git a/system/stack/include/a2dp_vendor_ldac.h b/system/stack/include/a2dp_vendor_ldac.h
index d11893b286..b28faa90ab 100644
--- a/system/stack/include/a2dp_vendor_ldac.h
+++ b/system/stack/include/a2dp_vendor_ldac.h
@@ -21,13 +21,13 @@
 #ifndef A2DP_VENDOR_LDAC_H
 #define A2DP_VENDOR_LDAC_H
 
-#include <bt_target.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include "a2dp_codec_api.h"
 #include "a2dp_vendor_ldac_constants.h"
 #include "avdt_api.h"
+#include "internal_include/bt_target.h"
 #include "stack/include/bt_hdr.h"
 
 class A2dpCodecConfigLdacBase : public A2dpCodecConfig {
diff --git a/system/stack/include/avct_api.h b/system/stack/include/avct_api.h
index 41fb60cc21..220ac679fa 100644
--- a/system/stack/include/avct_api.h
+++ b/system/stack/include/avct_api.h
@@ -27,7 +27,7 @@
 
 #include <cstdint>
 
-#include "bt_target.h"
+#include "internal_include/bt_target.h"
 #include "stack/include/bt_hdr.h"
 #include "types/raw_address.h"
 
diff --git a/system/stack/include/avdt_api.h b/system/stack/include/avdt_api.h
index 606bc62295..6139d58818 100644
--- a/system/stack/include/avdt_api.h
+++ b/system/stack/include/avdt_api.h
@@ -30,9 +30,9 @@
 #include <cstdint>
 #include <string>
 
-#include "bt_target.h"
+#include "internal_include/bt_target.h"
 #include "macros.h"
-#include "osi/include/log.h"
+#include "os/log.h"
 #include "stack/include/bt_hdr.h"
 #include "types/raw_address.h"
 
diff --git a/system/stack/include/avrc_api.h b/system/stack/include/avrc_api.h
index 2e3a031d63..0404bb39a9 100644
--- a/system/stack/include/avrc_api.h
+++ b/system/stack/include/avrc_api.h
@@ -28,11 +28,12 @@
 
 #include <cstdint>
 
-#include "bt_target.h"
+#include "internal_include/bt_target.h"
 #include "stack/include/avct_api.h"
 #include "stack/include/avrc_defs.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/sdp_api.h"
+#include "stack/sdp/sdp_discovery_db.h"
 #include "types/raw_address.h"
 
 /*****************************************************************************
diff --git a/system/stack/include/gatt_api.h b/system/stack/include/gatt_api.h
index 942cea1f28..c70bda0eac 100644
--- a/system/stack/include/gatt_api.h
+++ b/system/stack/include/gatt_api.h
@@ -24,11 +24,14 @@
 #include <list>
 #include <string>
 
-#include "bt_target.h"
 #include "btm_ble_api.h"
 #include "gattdefs.h"
 #include "hardware/bt_gatt_types.h"
+#include "include/hardware/bt_common_types.h"
+#include "internal_include/bt_target.h"
 #include "macros.h"
+#include "stack/include/btm_ble_api_types.h"
+#include "stack/include/hci_error_code.h"
 #include "types/bluetooth/uuid.h"
 #include "types/bt_transport.h"
 #include "types/raw_address.h"
diff --git a/system/stack/include/hiddefs.h b/system/stack/include/hiddefs.h
index aadafdb491..9d71bba824 100644
--- a/system/stack/include/hiddefs.h
+++ b/system/stack/include/hiddefs.h
@@ -27,8 +27,7 @@
 
 #include <base/strings/stringprintf.h>
 
-#include <cstring>
-
+#include "internal_include/bt_target.h"
 #include "macros.h"
 #include "stack/include/sdp_api.h"
 /*
diff --git a/system/stack/include/l2c_api.h b/system/stack/include/l2c_api.h
index b744acf376..9d0ac0d9c3 100644
--- a/system/stack/include/l2c_api.h
+++ b/system/stack/include/l2c_api.h
@@ -29,8 +29,8 @@
 #include <cstdint>
 #include <vector>
 
-#include "bt_target.h"
 #include "hcidefs.h"
+#include "internal_include/bt_target.h"
 #include "l2cdefs.h"
 #include "stack/include/bt_hdr.h"
 #include "types/bt_transport.h"
diff --git a/system/stack/include/l2cdefs.h b/system/stack/include/l2cdefs.h
index be9e1f23de..2d8be2b985 100644
--- a/system/stack/include/l2cdefs.h
+++ b/system/stack/include/l2cdefs.h
@@ -21,6 +21,7 @@
 
 #include <cstdint>
 
+#include "internal_include/bt_target.h"  // L2CAP_EXTFEA_SUPPORTED_MASK
 #include "macros.h"
 
 /* L2CAP command codes
diff --git a/system/stack/include/port_api.h b/system/stack/include/port_api.h
index f9c7062a49..8d2cbbb98b 100644
--- a/system/stack/include/port_api.h
+++ b/system/stack/include/port_api.h
@@ -26,7 +26,7 @@
 
 #include <cstdint>
 
-#include "bt_target.h"
+#include "internal_include/bt_target.h"
 #include "types/raw_address.h"
 
 /*****************************************************************************
diff --git a/system/stack/include/sdp_api.h b/system/stack/include/sdp_api.h
index c2adbefc9c..2d5dd61ea5 100644
--- a/system/stack/include/sdp_api.h
+++ b/system/stack/include/sdp_api.h
@@ -22,7 +22,6 @@
 
 #include <cstdint>
 
-#include "bt_target.h"
 #include "stack/include/sdp_callback.h"
 #include "stack/include/sdp_device_id.h"
 #include "stack/include/sdp_status.h"
diff --git a/system/stack/include/srvc_api.h b/system/stack/include/srvc_api.h
index 106c932ac2..8d79f998aa 100644
--- a/system/stack/include/srvc_api.h
+++ b/system/stack/include/srvc_api.h
@@ -21,9 +21,9 @@
 
 #include <cstdint>
 
-#include "bt_target.h"
 #include "gatt_api.h"
 #include "gattdefs.h"
+#include "internal_include/bt_target.h"
 #include "types/bt_transport.h"
 #include "types/raw_address.h"
 
diff --git a/system/stack/rfcomm/rfc_utils.cc b/system/stack/rfcomm/rfc_utils.cc
index 1d86998bb4..6318cdace3 100644
--- a/system/stack/rfcomm/rfc_utils.cc
+++ b/system/stack/rfcomm/rfc_utils.cc
@@ -24,19 +24,19 @@
 
 #define LOG_TAG "rfcomm"
 
+#include <base/logging.h>
+
 #include <cstdint>
 
-#include "bt_target.h"
+#include "internal_include/bt_target.h"
+#include "os/log.h"
 #include "osi/include/allocator.h"
-#include "osi/include/log.h"
 #include "osi/include/osi.h"  // UNUSED_ATTR
 #include "stack/include/bt_hdr.h"
 #include "stack/include/port_ext.h"
 #include "stack/rfcomm/rfc_int.h"
 #include "types/raw_address.h"
 
-#include <base/logging.h>
-
 /*******************************************************************************
  *
  * Function         rfc_calc_fcs
diff --git a/system/stack/srvc/srvc_dis_int.h b/system/stack/srvc/srvc_dis_int.h
index fb3703e87f..9189cef1b4 100644
--- a/system/stack/srvc/srvc_dis_int.h
+++ b/system/stack/srvc/srvc_dis_int.h
@@ -19,8 +19,8 @@
 #ifndef SRVC_DIS_INT_H
 #define SRVC_DIS_INT_H
 
-#include "bt_target.h"
 #include "gatt_api.h"
+#include "internal_include/bt_target.h"
 #include "srvc_api.h"
 #include "srvc_eng_int.h"
 
diff --git a/system/stack/srvc/srvc_eng_int.h b/system/stack/srvc/srvc_eng_int.h
index d42a0405c5..fbab0c6f1f 100644
--- a/system/stack/srvc/srvc_eng_int.h
+++ b/system/stack/srvc/srvc_eng_int.h
@@ -19,8 +19,8 @@
 #ifndef SRVC_ENG_INT_H
 #define SRVC_ENG_INT_H
 
-#include "bt_target.h"
 #include "gatt_api.h"
+#include "internal_include/bt_target.h"
 #include "srvc_api.h"
 #include "types/raw_address.h"
 
diff --git a/system/stack/test/fuzzers/a2dp/a2dpFuzzHelpers.h b/system/stack/test/fuzzers/a2dp/a2dpFuzzHelpers.h
index 937203169c..d159496691 100644
--- a/system/stack/test/fuzzers/a2dp/a2dpFuzzHelpers.h
+++ b/system/stack/test/fuzzers/a2dp/a2dpFuzzHelpers.h
@@ -24,8 +24,8 @@
 
 #include <vector>
 
-#include "bt_target.h"
 #include "fuzzers/sdp/sdpFuzzHelpers.h"
+#include "internal_include/bt_target.h"
 #include "osi/include/allocator.h"
 #include "stack/a2dp/a2dp_int.h"
 #include "types/raw_address.h"