legacy: Un-include unnecessary stack/include/bt_types
Bug: 197478351
Tag: #refactor
Test: gd/cert/run
Change-Id: I0d86908c31ff1fc3e3dd8824ccad15d3aee5b6e6
diff --git a/system/btif/include/btif_common.h b/system/btif/include/btif_common.h
index e8f828a..73f3428 100644
--- a/system/btif/include/btif_common.h
+++ b/system/btif/include/btif_common.h
@@ -27,7 +27,6 @@
#include <hardware/bluetooth.h>
#include <functional>
#include "abstract_message_loop.h"
-#include "bt_types.h"
#include "bta/include/bta_api.h"
#include "osi/include/log.h"
#include "osi/include/osi.h"
diff --git a/system/btif/include/btif_pan_internal.h b/system/btif/include/btif_pan_internal.h
index 37630db..50929be 100644
--- a/system/btif/include/btif_pan_internal.h
+++ b/system/btif/include/btif_pan_internal.h
@@ -27,7 +27,6 @@
#ifndef BTIF_PAN_INTERNAL_H
#define BTIF_PAN_INTERNAL_H
-#include "bt_types.h"
#include "btif_pan.h"
/*******************************************************************************
diff --git a/system/btif/include/btif_storage.h b/system/btif/include/btif_storage.h
index 925f248..b385548 100644
--- a/system/btif/include/btif_storage.h
+++ b/system/btif/include/btif_storage.h
@@ -23,7 +23,6 @@
#include <hardware/bluetooth.h>
#include "bt_target.h"
-#include "bt_types.h"
#include "types/ble_address_with_type.h"
/*******************************************************************************
diff --git a/system/device/src/controller.cc b/system/device/src/controller.cc
index 75fa696..3fc3d9f 100644
--- a/system/device/src/controller.cc
+++ b/system/device/src/controller.cc
@@ -22,7 +22,6 @@
#include <base/logging.h>
-#include "bt_types.h"
#include "btcore/include/event_mask.h"
#include "btcore/include/module.h"
#include "btcore/include/version.h"
diff --git a/system/embdrv/sbc/encoder/include/sbc_types.h b/system/embdrv/sbc/encoder/include/sbc_types.h
index 211c693..1877d03 100644
--- a/system/embdrv/sbc/encoder/include/sbc_types.h
+++ b/system/embdrv/sbc/encoder/include/sbc_types.h
@@ -28,7 +28,6 @@
#include <stdint.h>
#include "bt_target.h"
-#include "bt_types.h"
#define abs32(x) (((x) >= 0) ? (x) : (-(x)))
diff --git a/system/hci/include/btsnoop.h b/system/hci/include/btsnoop.h
index cf005cb..e574c98 100644
--- a/system/hci/include/btsnoop.h
+++ b/system/hci/include/btsnoop.h
@@ -21,7 +21,7 @@
#include <stdbool.h>
#include <cstdint>
-#include "bt_types.h"
+#include "stack/include/bt_hdr.h"
static const char BTSNOOP_MODULE[] = "btsnoop_module";
diff --git a/system/hci/include/btsnoop_mem.h b/system/hci/include/btsnoop_mem.h
index 1d78a62..c3372da 100644
--- a/system/hci/include/btsnoop_mem.h
+++ b/system/hci/include/btsnoop_mem.h
@@ -20,7 +20,7 @@
#include <stdint.h>
-#include "bt_types.h"
+#include "stack/include/bt_hdr.h"
// Callback invoked for each HCI packet.
// Highlander mode - there can be only one...
diff --git a/system/hci/include/hci_packet_factory.h b/system/hci/include/hci_packet_factory.h
index 1296939..8a6e98e 100644
--- a/system/hci/include/hci_packet_factory.h
+++ b/system/hci/include/hci_packet_factory.h
@@ -18,8 +18,8 @@
#pragma once
-#include "bt_types.h"
#include "btcore/include/event_mask.h"
+#include "stack/include/bt_hdr.h"
typedef struct {
BT_HDR* (*make_reset)(void);
diff --git a/system/hci/include/hci_packet_parser.h b/system/hci/include/hci_packet_parser.h
index c37a831..00716ea 100644
--- a/system/hci/include/hci_packet_parser.h
+++ b/system/hci/include/hci_packet_parser.h
@@ -20,11 +20,11 @@
#include <stdint.h>
-#include "bt_types.h"
#include "btcore/include/device_features.h"
#include "btcore/include/version.h"
#include "features.h"
#include "osi/include/allocator.h"
+#include "stack/include/bt_hdr.h"
#include "types/raw_address.h"
typedef struct {
diff --git a/system/hci/include/packet_fragmenter.h b/system/hci/include/packet_fragmenter.h
index 0188a93..29651a0 100644
--- a/system/hci/include/packet_fragmenter.h
+++ b/system/hci/include/packet_fragmenter.h
@@ -18,10 +18,10 @@
#pragma once
-#include "bt_types.h"
#include "device/include/controller.h"
#include "hci_layer.h"
#include "osi/include/allocator.h"
+#include "stack/include/bt_hdr.h"
typedef void (*transmit_finished_cb)(BT_HDR* packet, bool all_fragments_sent);
typedef void (*packet_reassembled_cb)(BT_HDR* packet);
diff --git a/system/hci/src/btsnoop.cc b/system/hci/src/btsnoop.cc
index dadb7dd..26e2daa 100644
--- a/system/hci/src/btsnoop.cc
+++ b/system/hci/src/btsnoop.cc
@@ -39,19 +39,19 @@
#include <unordered_map>
#include <unordered_set>
-#include "bt_types.h"
#include "common/time_util.h"
#include "hci/include/btsnoop.h"
#include "hci/include/btsnoop_mem.h"
#include "hci_layer.h"
#include "internal_include/bt_trace.h"
+#include "main/shim/shim.h"
#include "osi/include/log.h"
#include "osi/include/properties.h"
+#include "stack/include/bt_hdr.h"
#include "stack/include/hcimsgs.h"
#include "stack/include/rfcdefs.h"
#include "stack/l2cap/l2c_int.h"
#include "stack_config.h"
-#include "main/shim/shim.h"
// The number of of packets per btsnoop file before we rotate to the next
// file. As of right now there are two snoop files that are rotated through.
diff --git a/system/hci/src/btsnoop_net.cc b/system/hci/src/btsnoop_net.cc
index f8321bf..f689e8c 100644
--- a/system/hci/src/btsnoop_net.cc
+++ b/system/hci/src/btsnoop_net.cc
@@ -32,7 +32,6 @@
#include <mutex>
-#include "bt_types.h"
#include "check.h"
#include "osi/include/log.h"
#include "osi/include/osi.h"
diff --git a/system/hci/src/hci_packet_factory.cc b/system/hci/src/hci_packet_factory.cc
index 742f362..904fe36 100644
--- a/system/hci/src/hci_packet_factory.cc
+++ b/system/hci/src/hci_packet_factory.cc
@@ -18,7 +18,6 @@
#include <base/logging.h>
-#include "bt_types.h"
#include "check.h"
#include "hci/include/buffer_allocator.h"
#include "hci_internals.h"
@@ -27,6 +26,7 @@
#include "hcidefs.h"
#include "hcimsgs.h"
#include "osi/include/allocator.h"
+#include "stack/include/bt_hdr.h"
static const allocator_t* buffer_allocator;
diff --git a/system/profile/avrcp/connection_handler.cc b/system/profile/avrcp/connection_handler.cc
index 7a2b44b..612fbbf 100644
--- a/system/profile/avrcp/connection_handler.cc
+++ b/system/profile/avrcp/connection_handler.cc
@@ -22,7 +22,6 @@
#include "avrc_defs.h"
#include "avrcp_message_converter.h"
-#include "bt_types.h"
#include "btu.h"
#include "packet/avrcp/avrcp_packet.h"
// TODO (apanicke): Remove dependency on this header once we cleanup feature
diff --git a/system/stack/acl/btm_ble_connection_establishment.cc b/system/stack/acl/btm_ble_connection_establishment.cc
index 9a7f9af..5df2f55 100644
--- a/system/stack/acl/btm_ble_connection_establishment.cc
+++ b/system/stack/acl/btm_ble_connection_establishment.cc
@@ -21,7 +21,6 @@
#include <bitset>
-#include "bt_types.h"
#include "btm_int.h"
#include "common/metrics.h"
#include "device/include/controller.h"
diff --git a/system/stack/avct/avct_api.cc b/system/stack/avct/avct_api.cc
index da4c904..f0c7646 100644
--- a/system/stack/avct/avct_api.cc
+++ b/system/stack/avct/avct_api.cc
@@ -27,7 +27,6 @@
#include "avct_int.h"
#include "bt_common.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "bt_utils.h"
#include "bta/include/bta_api.h"
#include "btm_api.h"
diff --git a/system/stack/avct/avct_ccb.cc b/system/stack/avct/avct_ccb.cc
index e551eaf..cc3d49f 100644
--- a/system/stack/avct/avct_ccb.cc
+++ b/system/stack/avct/avct_ccb.cc
@@ -27,7 +27,6 @@
#include "avct_api.h"
#include "avct_int.h"
#include "bt_target.h"
-#include "bt_types.h"
/*******************************************************************************
*
diff --git a/system/stack/avct/avct_l2c.cc b/system/stack/avct/avct_l2c.cc
index 40005e1..bedc20a 100644
--- a/system/stack/avct/avct_l2c.cc
+++ b/system/stack/avct/avct_l2c.cc
@@ -25,7 +25,6 @@
#include "avct_api.h"
#include "avct_int.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "l2c_api.h"
#include "l2cdefs.h"
#include "osi/include/osi.h"
diff --git a/system/stack/avct/avct_lcb.cc b/system/stack/avct/avct_lcb.cc
index 1cd6219..e1b072f 100644
--- a/system/stack/avct/avct_lcb.cc
+++ b/system/stack/avct/avct_lcb.cc
@@ -29,7 +29,6 @@
#include "avct_int.h"
#include "bt_common.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "bt_utils.h"
#include "osi/include/osi.h"
diff --git a/system/stack/avct/avct_lcb_act.cc b/system/stack/avct/avct_lcb_act.cc
index 9e32ee4..bbdbccd 100644
--- a/system/stack/avct/avct_lcb_act.cc
+++ b/system/stack/avct/avct_lcb_act.cc
@@ -27,7 +27,6 @@
#include "avct_int.h"
#include "bt_common.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "bt_utils.h"
#include "bta/include/bta_api.h"
#include "btm_api.h"
diff --git a/system/stack/avdt/avdt_ad.cc b/system/stack/avdt/avdt_ad.cc
index ff10254..426520f 100644
--- a/system/stack/avdt/avdt_ad.cc
+++ b/system/stack/avdt/avdt_ad.cc
@@ -29,7 +29,6 @@
#include "avdt_int.h"
#include "avdtc_api.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "bt_utils.h"
#include "l2c_api.h"
#include "l2cdefs.h"
diff --git a/system/stack/avdt/avdt_api.cc b/system/stack/avdt/avdt_api.cc
index 9bc6f5a..cfa52a8 100644
--- a/system/stack/avdt/avdt_api.cc
+++ b/system/stack/avdt/avdt_api.cc
@@ -28,7 +28,6 @@
#include "avdt_int.h"
#include "avdtc_api.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "bta/include/bta_api.h"
#include "btm_api.h"
#include "btu.h"
diff --git a/system/stack/avdt/avdt_ccb.cc b/system/stack/avdt/avdt_ccb.cc
index edaf4f9..41e2c00 100644
--- a/system/stack/avdt/avdt_ccb.cc
+++ b/system/stack/avdt/avdt_ccb.cc
@@ -29,7 +29,6 @@
#include "avdtc_api.h"
#include "bt_common.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "bt_utils.h"
#include "btu.h"
#include "osi/include/osi.h"
diff --git a/system/stack/avdt/avdt_ccb_act.cc b/system/stack/avdt/avdt_ccb_act.cc
index b424fd5..0a5c05b 100644
--- a/system/stack/avdt/avdt_ccb_act.cc
+++ b/system/stack/avdt/avdt_ccb_act.cc
@@ -29,7 +29,6 @@
#include "avdtc_api.h"
#include "bt_common.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "bt_utils.h"
#include "btm_api.h"
#include "btu.h"
diff --git a/system/stack/avdt/avdt_l2c.cc b/system/stack/avdt/avdt_l2c.cc
index 287f25e..0d68020 100644
--- a/system/stack/avdt/avdt_l2c.cc
+++ b/system/stack/avdt/avdt_l2c.cc
@@ -24,7 +24,6 @@
#include "avdt_int.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "bta/include/bta_av_api.h"
#include "btm_api.h"
#include "device/include/interop.h"
diff --git a/system/stack/avdt/avdt_msg.cc b/system/stack/avdt/avdt_msg.cc
index bb49ede..35b2182 100644
--- a/system/stack/avdt/avdt_msg.cc
+++ b/system/stack/avdt/avdt_msg.cc
@@ -34,7 +34,6 @@
#include "avdtc_api.h"
#include "bt_common.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "bt_utils.h"
#include "btu.h"
#include "osi/include/log.h"
diff --git a/system/stack/avdt/avdt_scb.cc b/system/stack/avdt/avdt_scb.cc
index 6f6cf97..c04bada 100644
--- a/system/stack/avdt/avdt_scb.cc
+++ b/system/stack/avdt/avdt_scb.cc
@@ -29,7 +29,6 @@
#include "avdtc_api.h"
#include "bt_common.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "bt_utils.h"
#include "btu.h"
#include "osi/include/osi.h"
diff --git a/system/stack/avdt/avdt_scb_act.cc b/system/stack/avdt/avdt_scb_act.cc
index 8129344..7401750 100644
--- a/system/stack/avdt/avdt_scb_act.cc
+++ b/system/stack/avdt/avdt_scb_act.cc
@@ -32,7 +32,6 @@
#include "avdtc_api.h"
#include "bt_common.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "bt_utils.h"
#include "btu.h"
#include "osi/include/log.h"
diff --git a/system/stack/bnep/bnep_main.cc b/system/stack/bnep/bnep_main.cc
index 1651498..6cf5cbb 100644
--- a/system/stack/bnep/bnep_main.cc
+++ b/system/stack/bnep/bnep_main.cc
@@ -28,7 +28,6 @@
#include "bt_target.h"
#include "bt_common.h"
-#include "bt_types.h"
#include "l2c_api.h"
#include "l2cdefs.h"
diff --git a/system/stack/bnep/bnep_utils.cc b/system/stack/bnep/bnep_utils.cc
index 37f088c..e60da48 100644
--- a/system/stack/bnep/bnep_utils.cc
+++ b/system/stack/bnep/bnep_utils.cc
@@ -27,7 +27,6 @@
#include "bnep_int.h"
#include "bt_common.h"
-#include "bt_types.h"
#include "bt_utils.h"
#include "btu.h"
#include "device/include/controller.h"
diff --git a/system/stack/btm/btm_ble_addr.cc b/system/stack/btm/btm_ble_addr.cc
index c61fac6..a8dcbf5 100644
--- a/system/stack/btm/btm_ble_addr.cc
+++ b/system/stack/btm/btm_ble_addr.cc
@@ -25,7 +25,6 @@
#include <base/bind.h>
#include <string.h>
-#include "bt_types.h"
#include "btu.h"
#include "device/include/controller.h"
#include "gap_api.h"
diff --git a/system/stack/btm/btm_ble_adv_filter.cc b/system/stack/btm/btm_ble_adv_filter.cc
index 44ca2f7..b707921 100644
--- a/system/stack/btm/btm_ble_adv_filter.cc
+++ b/system/stack/btm/btm_ble_adv_filter.cc
@@ -20,7 +20,6 @@
#include "bt_target.h"
-#include "bt_types.h"
#include "btm_ble_api.h"
#include "btm_dev.h"
#include "btm_int.h"
diff --git a/system/stack/btm/btm_ble_batchscan.cc b/system/stack/btm/btm_ble_batchscan.cc
index 6c0530a..70f7855 100644
--- a/system/stack/btm/btm_ble_batchscan.cc
+++ b/system/stack/btm/btm_ble_batchscan.cc
@@ -22,7 +22,6 @@
#include <vector>
#include "bt_target.h"
-#include "bt_types.h"
#include "btm_ble_api.h"
#include "btm_int.h"
#include "btu.h"
diff --git a/system/stack/btm/btm_ble_cont_energy.cc b/system/stack/btm/btm_ble_cont_energy.cc
index e23d63c..3ad11d4 100644
--- a/system/stack/btm/btm_ble_cont_energy.cc
+++ b/system/stack/btm/btm_ble_cont_energy.cc
@@ -19,7 +19,6 @@
#include <string.h>
#include "bt_target.h"
-#include "bt_types.h"
#include "btm_ble_api.h"
#include "btm_int.h"
#include "btu.h"
diff --git a/system/stack/btm/btm_ble_privacy.cc b/system/stack/btm/btm_ble_privacy.cc
index 790bffb..d820396 100644
--- a/system/stack/btm/btm_ble_privacy.cc
+++ b/system/stack/btm/btm_ble_privacy.cc
@@ -25,7 +25,6 @@
#include "bt_target.h"
#include "ble_advertiser.h"
-#include "bt_types.h"
#include "btm_int.h"
#include "btu.h"
#include "device/include/controller.h"
diff --git a/system/stack/btm/btm_dev.cc b/system/stack/btm/btm_dev.cc
index f1de18e..042c47c 100644
--- a/system/stack/btm/btm_dev.cc
+++ b/system/stack/btm/btm_dev.cc
@@ -28,7 +28,6 @@
#include <string.h>
#include "bt_common.h"
-#include "bt_types.h"
#include "btm_api.h"
#include "btu.h"
#include "device/include/controller.h"
diff --git a/system/stack/btm/btm_devctl.cc b/system/stack/btm/btm_devctl.cc
index 83631ae..6836111 100644
--- a/system/stack/btm/btm_devctl.cc
+++ b/system/stack/btm/btm_devctl.cc
@@ -28,7 +28,6 @@
#include <stdlib.h>
#include <string.h>
-#include "bt_types.h"
#include "bta/dm/bta_dm_int.h"
#include "bta/sys/bta_sys.h"
#include "btcore/include/module.h"
diff --git a/system/stack/btm/btm_inq.cc b/system/stack/btm/btm_inq.cc
index 78e9c83..5413857 100644
--- a/system/stack/btm/btm_inq.cc
+++ b/system/stack/btm/btm_inq.cc
@@ -39,7 +39,6 @@
#include "advertise_data_parser.h"
#include "bt_common.h"
-#include "bt_types.h"
#include "hcidefs.h"
#include "main/shim/btm_api.h"
#include "main/shim/shim.h"
diff --git a/system/stack/btm/btm_iso_impl.h b/system/stack/btm/btm_iso_impl.h
index af31a2d..b317d66 100644
--- a/system/stack/btm/btm_iso_impl.h
+++ b/system/stack/btm/btm_iso_impl.h
@@ -24,7 +24,6 @@
#include "base/bind.h"
#include "base/callback.h"
#include "bind_helpers.h"
-#include "bt_types.h"
#include "btm_iso_api.h"
#include "btu.h"
#include "common/time_util.h"
diff --git a/system/stack/btm/btm_main.cc b/system/stack/btm/btm_main.cc
index 0862df9..f77a693 100644
--- a/system/stack/btm/btm_main.cc
+++ b/system/stack/btm/btm_main.cc
@@ -25,7 +25,6 @@
#include <memory>
#include <string>
#include "bt_target.h"
-#include "bt_types.h"
#include "main/shim/dumpsys.h"
#include "stack/btm/btm_int_types.h"
#include "stack/include/btm_client_interface.h"
diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc
index 57a0546..1b08320 100644
--- a/system/stack/btm/btm_sec.cc
+++ b/system/stack/btm/btm_sec.cc
@@ -31,7 +31,6 @@
#include <frameworks/proto_logging/stats/enums/bluetooth/hci/enums.pb.h>
#include <string.h>
-#include "bt_types.h"
#include "btif/include/btif_storage.h"
#include "common/metrics.h"
#include "common/time_util.h"
diff --git a/system/stack/eatt/eatt_impl.h b/system/stack/eatt/eatt_impl.h
index 5b41b63..8e67f12 100644
--- a/system/stack/eatt/eatt_impl.h
+++ b/system/stack/eatt/eatt_impl.h
@@ -20,7 +20,6 @@
#include "acl_api.h"
#include "bind_helpers.h"
-#include "bt_types.h"
#include "device/include/controller.h"
#include "eatt.h"
#include "l2c_api.h"
diff --git a/system/stack/hcic/hcicmds.cc b/system/stack/hcic/hcicmds.cc
index 395a450..2fe41a5 100644
--- a/system/stack/hcic/hcicmds.cc
+++ b/system/stack/hcic/hcicmds.cc
@@ -35,7 +35,6 @@
#include "stack/include/acl_hci_link_interface.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "device/include/esco_parameters.h"
#include "hcidefs.h"
diff --git a/system/stack/hid/hidd_api.cc b/system/stack/hid/hidd_api.cc
index fe919ba..6ddf321 100644
--- a/system/stack/hid/hidd_api.cc
+++ b/system/stack/hid/hidd_api.cc
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <string.h>
-#include "bt_types.h"
#include "btm_api.h"
#include "btu.h"
#include "hidd_api.h"
diff --git a/system/stack/hid/hidh_api.cc b/system/stack/hid/hidh_api.cc
index 49ee928..56be4dc 100644
--- a/system/stack/hid/hidh_api.cc
+++ b/system/stack/hid/hidh_api.cc
@@ -27,7 +27,6 @@
#include <string.h>
#include "bt_common.h"
-#include "bt_types.h"
#include "btm_api.h"
#include "btu.h"
#include "hiddefs.h"
diff --git a/system/stack/hid/hidh_conn.cc b/system/stack/hid/hidh_conn.cc
index 87ded1c..b9b2517 100644
--- a/system/stack/hid/hidh_conn.cc
+++ b/system/stack/hid/hidh_conn.cc
@@ -26,7 +26,6 @@
#include <string.h>
#include "bt_common.h"
-#include "bt_types.h"
#include "l2c_api.h"
#include "l2cdefs.h"
diff --git a/system/stack/include/avct_api.h b/system/stack/include/avct_api.h
index 8cc0bba..e79c83b 100644
--- a/system/stack/include/avct_api.h
+++ b/system/stack/include/avct_api.h
@@ -26,7 +26,6 @@
#define AVCT_API_H
#include "bt_target.h"
-#include "bt_types.h"
/*****************************************************************************
* Constants
diff --git a/system/stack/include/avdt_api.h b/system/stack/include/avdt_api.h
index 085eca1..5f2bbb5 100644
--- a/system/stack/include/avdt_api.h
+++ b/system/stack/include/avdt_api.h
@@ -30,7 +30,6 @@
#include <string>
#include "bt_target.h"
-#include "bt_types.h"
#include "osi/include/log.h"
/*****************************************************************************
diff --git a/system/stack/include/btm_iso_api_types.h b/system/stack/include/btm_iso_api_types.h
index 2009dd3..5113050 100644
--- a/system/stack/include/btm_iso_api_types.h
+++ b/system/stack/include/btm_iso_api_types.h
@@ -17,7 +17,6 @@
#pragma once
-#include "bt_types.h"
#include "hcimsgs.h"
namespace bluetooth {
diff --git a/system/stack/include/hcimsgs.h b/system/stack/include/hcimsgs.h
index 7e45c6a..5c52cde 100644
--- a/system/stack/include/hcimsgs.h
+++ b/system/stack/include/hcimsgs.h
@@ -20,7 +20,6 @@
#define HCIMSGS_H
#include "bt_target.h"
-#include "bt_types.h"
#include "device/include/esco_parameters.h"
#include "hcidefs.h"
#include "types/ble_address_with_type.h"
diff --git a/system/stack/l2cap/l2c_fcr.cc b/system/stack/l2cap/l2c_fcr.cc
index 4e6095c..3d25b90 100644
--- a/system/stack/l2cap/l2c_fcr.cc
+++ b/system/stack/l2cap/l2c_fcr.cc
@@ -29,7 +29,6 @@
#include <string.h>
#include "bt_common.h"
-#include "bt_types.h"
#include "btu.h"
#include "common/time_util.h"
#include "hcimsgs.h"
diff --git a/system/stack/l2cap/l2c_utils.cc b/system/stack/l2cap/l2c_utils.cc
index 72c5326..2b62178 100644
--- a/system/stack/l2cap/l2c_utils.cc
+++ b/system/stack/l2cap/l2c_utils.cc
@@ -27,7 +27,6 @@
#include <string.h>
#include "bt_common.h"
-#include "bt_types.h"
#include "btm_api.h"
#include "device/include/controller.h"
#include "hci/include/btsnoop.h"
diff --git a/system/stack/pan/pan_api.cc b/system/stack/pan/pan_api.cc
index 9021380..643c181 100644
--- a/system/stack/pan/pan_api.cc
+++ b/system/stack/pan/pan_api.cc
@@ -28,7 +28,6 @@
#include <string.h>
#include "bnep_api.h"
#include "bt_common.h"
-#include "bt_types.h"
#include "bta_sys.h"
#include "btm_api.h"
#include "hcidefs.h"
diff --git a/system/stack/pan/pan_main.cc b/system/stack/pan/pan_main.cc
index e4301e3..bacd6e1 100644
--- a/system/stack/pan/pan_main.cc
+++ b/system/stack/pan/pan_main.cc
@@ -26,7 +26,6 @@
#include <string.h>
#include "bnep_api.h"
#include "bt_common.h"
-#include "bt_types.h"
#include "bt_utils.h"
#include "hcidefs.h"
#include "l2c_api.h"
diff --git a/system/stack/rfcomm/rfc_mx_fsm.cc b/system/stack/rfcomm/rfc_mx_fsm.cc
index 96302f2..e3360e8 100644
--- a/system/stack/rfcomm/rfc_mx_fsm.cc
+++ b/system/stack/rfcomm/rfc_mx_fsm.cc
@@ -24,7 +24,6 @@
******************************************************************************/
#include <string.h>
#include "bt_common.h"
-#include "bt_types.h"
#include "bt_utils.h"
#include "l2c_api.h"
#include "l2cdefs.h"
diff --git a/system/stack/sdp/sdp_server.cc b/system/stack/sdp/sdp_server.cc
index 1814ba5..e4f3e40 100644
--- a/system/stack/sdp/sdp_server.cc
+++ b/system/stack/sdp/sdp_server.cc
@@ -26,7 +26,6 @@
#include <string.h>
#include "bt_common.h"
-#include "bt_types.h"
#include "avrc_defs.h"
#include "device/include/interop.h"
diff --git a/system/stack/sdp/sdp_utils.cc b/system/stack/sdp/sdp_utils.cc
index 3fbafb2..8be8f0d 100644
--- a/system/stack/sdp/sdp_utils.cc
+++ b/system/stack/sdp/sdp_utils.cc
@@ -28,7 +28,6 @@
#include <vector>
#include "bt_common.h"
-#include "bt_types.h"
#include "btif_config.h"
#include "avrc_defs.h"
diff --git a/system/stack/smp/smp_utils.cc b/system/stack/smp/smp_utils.cc
index 8492f09..58daf74 100644
--- a/system/stack/smp/smp_utils.cc
+++ b/system/stack/smp/smp_utils.cc
@@ -25,7 +25,6 @@
#include <ctype.h>
#include <string.h>
-#include "bt_types.h"
#include "bt_utils.h"
#include "btm_ble_api.h"
#include "device/include/controller.h"
diff --git a/system/stack/test/common/stack_test_packet_utils.h b/system/stack/test/common/stack_test_packet_utils.h
index fcbc5a9..e03b6bd 100644
--- a/system/stack/test/common/stack_test_packet_utils.h
+++ b/system/stack/test/common/stack_test_packet_utils.h
@@ -17,7 +17,7 @@
******************************************************************************/
#pragma once
-#include "bt_types.h"
+#include "stack/include/bt_hdr.h"
namespace bluetooth {
diff --git a/system/stack/test/fuzzers/a2dp/codec/a2dpCodecHelperFunctions.h b/system/stack/test/fuzzers/a2dp/codec/a2dpCodecHelperFunctions.h
index dec0e49..47a65cb 100644
--- a/system/stack/test/fuzzers/a2dp/codec/a2dpCodecHelperFunctions.h
+++ b/system/stack/test/fuzzers/a2dp/codec/a2dpCodecHelperFunctions.h
@@ -118,7 +118,6 @@
return params;
}
-#include "bt_types.h"
#define MAX_BTHDR_SIZE 1024
std::shared_ptr<BT_HDR> getArbitraryBtHdr(FuzzedDataProvider* fdp) {
// Build a data buffer
diff --git a/system/stack/test/fuzzers/a2dp/codec/a2dpCodecInfoFuzzFunctions.h b/system/stack/test/fuzzers/a2dp/codec/a2dpCodecInfoFuzzFunctions.h
index 187b474..eba44b0 100644
--- a/system/stack/test/fuzzers/a2dp/codec/a2dpCodecInfoFuzzFunctions.h
+++ b/system/stack/test/fuzzers/a2dp/codec/a2dpCodecInfoFuzzFunctions.h
@@ -20,7 +20,6 @@
#include <fuzzer/FuzzedDataProvider.h>
#include <vector>
#include "a2dp_codec_api.h"
-#include "bt_types.h"
#include "fuzzers/a2dp/codec/a2dpCodecHelperFunctions.h"
#include "fuzzers/common/commonFuzzHelpers.h"
diff --git a/system/stack/test/fuzzers/a2dp/codec/a2dpCodecInfoFuzzHelpers.h b/system/stack/test/fuzzers/a2dp/codec/a2dpCodecInfoFuzzHelpers.h
index fc1e2c2..bd324e1 100644
--- a/system/stack/test/fuzzers/a2dp/codec/a2dpCodecInfoFuzzHelpers.h
+++ b/system/stack/test/fuzzers/a2dp/codec/a2dpCodecInfoFuzzHelpers.h
@@ -23,7 +23,6 @@
#include <fuzzer/FuzzedDataProvider.h>
#include <vector>
#include "a2dp_codec_api.h"
-#include "bt_types.h"
// Keep a vector of any allocated codec_info objects.
// It will be up to the caller to free this array at the end of a fuzz loop
diff --git a/system/stack/test/rfcomm/stack_rfcomm_test.cc b/system/stack/test/rfcomm/stack_rfcomm_test.cc
index b20bc8b..a4f3255 100644
--- a/system/stack/test/rfcomm/stack_rfcomm_test.cc
+++ b/system/stack/test/rfcomm/stack_rfcomm_test.cc
@@ -20,7 +20,6 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "bt_types.h"
#include "btm_api.h"
#include "l2c_api.h"
#include "osi/include/osi.h"
diff --git a/system/stack/test/rfcomm/stack_rfcomm_test_utils.h b/system/stack/test/rfcomm/stack_rfcomm_test_utils.h
index c7fee43..eb8ec48 100644
--- a/system/stack/test/rfcomm/stack_rfcomm_test_utils.h
+++ b/system/stack/test/rfcomm/stack_rfcomm_test_utils.h
@@ -21,8 +21,6 @@
#include <gmock/gmock.h>
-#include "bt_types.h"
-
namespace bluetooth {
namespace rfcomm {
@@ -229,4 +227,4 @@
const std::string& str);
} // namespace rfcomm
-} // namespace bluetooth
\ No newline at end of file
+} // namespace bluetooth
diff --git a/system/test/mock/mock_bta_dm_act.h b/system/test/mock/mock_bta_dm_act.h
index 95716b6..2ebe03b 100644
--- a/system/test/mock/mock_bta_dm_act.h
+++ b/system/test/mock/mock_bta_dm_act.h
@@ -56,7 +56,6 @@
#include "stack/btm/neighbor_inquiry.h"
#include "stack/gatt/connection_manager.h"
#include "stack/include/acl_api.h"
-#include "stack/include/bt_types.h"
#include "stack/include/btm_client_interface.h"
#include "stack/include/btu.h"
#include "types/raw_address.h"
@@ -761,4 +760,4 @@
} // namespace mock
} // namespace test
-// END mockcify generation
\ No newline at end of file
+// END mockcify generation
diff --git a/system/test/mock/mock_bta_hf_client_api.cc b/system/test/mock/mock_bta_hf_client_api.cc
index cd036c9..24901fb 100644
--- a/system/test/mock/mock_bta_hf_client_api.cc
+++ b/system/test/mock/mock_bta_hf_client_api.cc
@@ -31,7 +31,6 @@
#include "bta/sys/bta_sys.h"
#include "osi/include/allocator.h"
#include "osi/include/compat.h"
-#include "stack/include/bt_types.h"
#include "types/raw_address.h"
#ifndef UNUSED_ATTR
diff --git a/system/test/mock/mock_bta_sys_main.h b/system/test/mock/mock_bta_sys_main.h
index 95bc473..35dd87d 100644
--- a/system/test/mock/mock_bta_sys_main.h
+++ b/system/test/mock/mock_bta_sys_main.h
@@ -47,7 +47,6 @@
#include "osi/include/alarm.h"
#include "osi/include/allocator.h"
#include "osi/include/log.h"
-#include "stack/include/bt_types.h"
#include "stack/include/btu.h"
// Mocked compile conditionals, if any
@@ -163,4 +162,4 @@
} // namespace mock
} // namespace test
-// END mockcify generation
\ No newline at end of file
+// END mockcify generation
diff --git a/system/test/mock/mock_device_controller.cc b/system/test/mock/mock_device_controller.cc
index 1d087b5..e4dddc4 100644
--- a/system/test/mock/mock_device_controller.cc
+++ b/system/test/mock/mock_device_controller.cc
@@ -32,7 +32,6 @@
// still applies, but crafting proper inclusion is out of scope
// for this effort. This compilation unit may compile as-is, or
// may need attention to prune the inclusion set.
-#include "bt_types.h"
#include "main/shim/controller.h"
// Mock include file to share data between tests and mock
diff --git a/system/test/mock/mock_device_controller.h b/system/test/mock/mock_device_controller.h
index 3417910..8d8a9d9 100644
--- a/system/test/mock/mock_device_controller.h
+++ b/system/test/mock/mock_device_controller.h
@@ -33,7 +33,6 @@
// for this effort. This compilation unit may compile as-is, or
// may need attention to prune the inclusion set.
#include <base/logging.h>
-#include "bt_types.h"
#include "btcore/include/event_mask.h"
#include "btcore/include/module.h"
#include "btcore/include/version.h"
diff --git a/system/test/mock/mock_stack_acl_ble.cc b/system/test/mock/mock_stack_acl_ble.cc
index 45345cc..5b3b59e 100644
--- a/system/test/mock/mock_stack_acl_ble.cc
+++ b/system/test/mock/mock_stack_acl_ble.cc
@@ -31,7 +31,6 @@
#include "stack/btm/btm_sec.h"
#include "stack/gatt/connection_manager.h"
#include "stack/include/acl_api.h"
-#include "stack/include/bt_types.h"
#include "stack/include/hcidefs.h"
#include "stack/include/l2cap_hci_link_interface.h"
#include "types/ble_address_with_type.h"
diff --git a/system/test/mock/mock_stack_avct_api.cc b/system/test/mock/mock_stack_avct_api.cc
index 85adf06..e93ef07 100644
--- a/system/test/mock/mock_stack_avct_api.cc
+++ b/system/test/mock/mock_stack_avct_api.cc
@@ -28,7 +28,6 @@
#include "avct_api.h"
#include "bt_common.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "bta/include/bta_api.h"
#include "btm_api.h"
#include "l2c_api.h"
diff --git a/system/test/mock/mock_stack_avdt_api.cc b/system/test/mock/mock_stack_avdt_api.cc
index a758601..87ca6c9 100644
--- a/system/test/mock/mock_stack_avdt_api.cc
+++ b/system/test/mock/mock_stack_avdt_api.cc
@@ -28,7 +28,6 @@
#include "avdt_api.h"
#include "avdtc_api.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "bta/include/bta_api.h"
#include "btm_api.h"
#include "btu.h"
diff --git a/system/test/mock/mock_stack_btm_ble.cc b/system/test/mock/mock_stack_btm_ble.cc
index 835b1d2..d8653d7 100644
--- a/system/test/mock/mock_stack_btm_ble.cc
+++ b/system/test/mock/mock_stack_btm_ble.cc
@@ -34,7 +34,6 @@
#include "stack/btm/security_device_record.h"
#include "stack/crypto_toolbox/crypto_toolbox.h"
#include "stack/include/acl_api.h"
-#include "stack/include/bt_types.h"
#include "stack/include/btm_api.h"
#include "stack/include/btu.h"
#include "stack/include/gatt_api.h"
diff --git a/system/test/mock/mock_stack_btm_ble_adv_filter.cc b/system/test/mock/mock_stack_btm_ble_adv_filter.cc
index 8d53a80..91a7dc8 100644
--- a/system/test/mock/mock_stack_btm_ble_adv_filter.cc
+++ b/system/test/mock/mock_stack_btm_ble_adv_filter.cc
@@ -30,7 +30,6 @@
#include <vector>
#include "bind_helpers.h"
#include "bt_target.h"
-#include "bt_types.h"
#include "btm_ble_api.h"
#include "btu.h"
#include "device/include/controller.h"
diff --git a/system/test/mock/mock_stack_btm_ble_batchscan.cc b/system/test/mock/mock_stack_btm_ble_batchscan.cc
index 3f5a880..3a2209f 100644
--- a/system/test/mock/mock_stack_btm_ble_batchscan.cc
+++ b/system/test/mock/mock_stack_btm_ble_batchscan.cc
@@ -30,7 +30,6 @@
#include <string.h>
#include <vector>
#include "bt_target.h"
-#include "bt_types.h"
#include "btm_ble_api.h"
#include "btu.h"
#include "device/include/controller.h"
diff --git a/system/test/mock/mock_stack_btm_ble_bgconn.h b/system/test/mock/mock_stack_btm_ble_bgconn.h
index 41914ba..8e1ed0c 100644
--- a/system/test/mock/mock_stack_btm_ble_bgconn.h
+++ b/system/test/mock/mock_stack_btm_ble_bgconn.h
@@ -43,7 +43,6 @@
#include "stack/btm/btm_dev.h"
#include "stack/btm/btm_int_types.h"
#include "stack/btm/security_device_record.h"
-#include "stack/include/bt_types.h"
#include "stack/include/hcimsgs.h"
#include "types/raw_address.h"
diff --git a/system/test/mock/mock_stack_btm_ble_gap.cc b/system/test/mock/mock_stack_btm_ble_gap.cc
index 98355b5..8701547 100644
--- a/system/test/mock/mock_stack_btm_ble_gap.cc
+++ b/system/test/mock/mock_stack_btm_ble_gap.cc
@@ -43,7 +43,6 @@
#include "stack/gatt/gatt_int.h"
#include "stack/include/acl_api.h"
#include "stack/include/advertise_data_parser.h"
-#include "stack/include/bt_types.h"
#include "stack/include/btm_api_types.h"
#include "stack/include/gap_api.h"
#include "stack/include/hci_error_code.h"
diff --git a/system/test/mock/mock_stack_btm_dev.cc b/system/test/mock/mock_stack_btm_dev.cc
index 5257346..9ac05be 100644
--- a/system/test/mock/mock_stack_btm_dev.cc
+++ b/system/test/mock/mock_stack_btm_dev.cc
@@ -29,7 +29,6 @@
#include <stdlib.h>
#include <string.h>
#include "bt_common.h"
-#include "bt_types.h"
#include "btm_api.h"
#include "btu.h"
#include "device/include/controller.h"
diff --git a/system/test/mock/mock_stack_btm_devctl.cc b/system/test/mock/mock_stack_btm_devctl.cc
index 5aeab02..9865202 100644
--- a/system/test/mock/mock_stack_btm_devctl.cc
+++ b/system/test/mock/mock_stack_btm_devctl.cc
@@ -28,7 +28,6 @@
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
-#include "bt_types.h"
#include "bta/dm/bta_dm_int.h"
#include "bta/sys/bta_sys.h"
#include "btcore/include/module.h"
diff --git a/system/test/mock/mock_stack_btm_inq.cc b/system/test/mock/mock_stack_btm_inq.cc
index 594e74f..0957f23 100644
--- a/system/test/mock/mock_stack_btm_inq.cc
+++ b/system/test/mock/mock_stack_btm_inq.cc
@@ -30,7 +30,6 @@
#include <string.h>
#include "advertise_data_parser.h"
#include "bt_common.h"
-#include "bt_types.h"
#include "btm_api.h"
#include "btu.h"
#include "common/time_util.h"
diff --git a/system/test/mock/mock_stack_btm_main.cc b/system/test/mock/mock_stack_btm_main.cc
index 1744bc3..7df789b 100644
--- a/system/test/mock/mock_stack_btm_main.cc
+++ b/system/test/mock/mock_stack_btm_main.cc
@@ -27,7 +27,6 @@
#include <memory>
#include <string>
#include "bt_target.h"
-#include "bt_types.h"
#include "main/shim/dumpsys.h"
#include "stack/btm/btm_int_types.h"
#include "stack/include/btm_client_interface.h"
diff --git a/system/test/mock/mock_stack_btm_sec.cc b/system/test/mock/mock_stack_btm_sec.cc
index f9fe8d4..8b0cbe8 100644
--- a/system/test/mock/mock_stack_btm_sec.cc
+++ b/system/test/mock/mock_stack_btm_sec.cc
@@ -28,7 +28,6 @@
#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
#include <frameworks/proto_logging/stats/enums/bluetooth/hci/enums.pb.h>
#include <string.h>
-#include "bt_types.h"
#include "btif/include/btif_storage.h"
#include "common/metrics.h"
#include "common/time_util.h"
diff --git a/system/test/mock/mock_stack_hidd_api.cc b/system/test/mock/mock_stack_hidd_api.cc
index 992e361..90aaa4c 100644
--- a/system/test/mock/mock_stack_hidd_api.cc
+++ b/system/test/mock/mock_stack_hidd_api.cc
@@ -27,7 +27,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "bt_types.h"
#include "btm_api.h"
#include "btu.h"
#include "hidd_api.h"
diff --git a/system/test/mock/mock_stack_l2cap_utils.cc b/system/test/mock/mock_stack_l2cap_utils.cc
index 304c759..a8102bc 100644
--- a/system/test/mock/mock_stack_l2cap_utils.cc
+++ b/system/test/mock/mock_stack_l2cap_utils.cc
@@ -25,7 +25,6 @@
extern std::map<std::string, int> mock_function_count_map;
#include <cstdint>
-#include "stack/include/bt_types.h"
#include "stack/l2cap/l2c_int.h"
#include "types/raw_address.h"
diff --git a/system/test/mock/mock_stack_pan_api.cc b/system/test/mock/mock_stack_pan_api.cc
index 29023b2..fdb984e 100644
--- a/system/test/mock/mock_stack_pan_api.cc
+++ b/system/test/mock/mock_stack_pan_api.cc
@@ -28,7 +28,6 @@
#include <string.h>
#include "bnep_api.h"
#include "bt_common.h"
-#include "bt_types.h"
#include "btm_api.h"
#include "hcidefs.h"
#include "l2c_api.h"
diff --git a/system/test/mock/mock_udrv_ulinux_uipc.cc b/system/test/mock/mock_udrv_ulinux_uipc.cc
index 12e29eb..1ce8952 100644
--- a/system/test/mock/mock_udrv_ulinux_uipc.cc
+++ b/system/test/mock/mock_udrv_ulinux_uipc.cc
@@ -42,7 +42,6 @@
#include <set>
#include "audio_a2dp_hw/include/audio_a2dp_hw.h"
#include "bt_common.h"
-#include "bt_types.h"
#include "bt_utils.h"
#include "osi/include/osi.h"
#include "osi/include/socket_utils/sockets.h"
diff --git a/system/test/mock/mock_utils_bt.h b/system/test/mock/mock_utils_bt.h
index 1b0b8a1..82a2d04 100644
--- a/system/test/mock/mock_utils_bt.h
+++ b/system/test/mock/mock_utils_bt.h
@@ -44,7 +44,6 @@
#include <mutex>
-#include "bt_types.h"
#include "bt_utils.h"
#include "btcore/include/module.h"
#include "osi/include/compat.h"
@@ -72,4 +71,4 @@
} // namespace mock
} // namespace test
-// END mockcify generation
\ No newline at end of file
+// END mockcify generation
diff --git a/system/udrv/ulinux/uipc.cc b/system/udrv/ulinux/uipc.cc
index 9ae78b5..dd404b3 100644
--- a/system/udrv/ulinux/uipc.cc
+++ b/system/udrv/ulinux/uipc.cc
@@ -43,7 +43,6 @@
#include "audio_a2dp_hw/include/audio_a2dp_hw.h"
#include "bt_common.h"
-#include "bt_types.h"
#include "bt_utils.h"
#include "osi/include/osi.h"
#include "osi/include/socket_utils/sockets.h"
diff --git a/system/utils/src/bt_utils.cc b/system/utils/src/bt_utils.cc
index 58cabaf..3f267c1 100644
--- a/system/utils/src/bt_utils.cc
+++ b/system/utils/src/bt_utils.cc
@@ -42,7 +42,6 @@
#include <processgroup/sched_policy.h>
#endif
-#include "bt_types.h"
#include "btcore/include/module.h"
#include "osi/include/compat.h"
#include "osi/include/log.h"
diff --git a/system/vnd/include/vendor_api.h b/system/vnd/include/vendor_api.h
index a26ee72..be10778 100644
--- a/system/vnd/include/vendor_api.h
+++ b/system/vnd/include/vendor_api.h
@@ -11,7 +11,6 @@
#ifndef VENDOR_API_H
#define VENDOR_API_H
-#include "bt_types.h"
#include "btm_api.h"
/****************************************************************************
