diff --git a/system/btif/include/btif_common.h b/system/btif/include/btif_common.h
index e8f828a87c37cc4d5d8cfffa542036c4b681fa49..73f3428a7977d1a9c5a0176bd7878997c841d70e 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 37630dbe0dac52a718d1eee883b81eb45f0ef08d..50929beefbe76ec9c221a57ad44cd3792ee0a3d7 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 925f248f919cad4424027181fcb4018eae471066..b3855480ee09f74b20aa1771a4bbaca014d35735 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 75fa69682beac420a5f64b91f923096bc7a5787c..3fc3d9f2eee54b04a28310adc095b8462d486696 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 211c69367eae9e190bc4278959bdadafe10c44ec..1877d032b4e764abf4e391ae2aca08f905a4e9d1 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 cf005cb249608427e63e1d411e8865cf1b572f75..e574c98bcaa6e97c5ed92919f5bd460afda5d03c 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 1d78a62787ea8c508a8be39c1a12f40fe641bcca..c3372da4eb10ef1760a186b99ca123a3f1b005e6 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 1296939398ec9dcfdc7a6b860f1ffc0df1a7b625..8a6e98e4c1ca8dc2c153bdcdbc4b0a8f5880070c 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 c37a83126a86020155bfe6bf4957b316b94bcfd3..00716ea47350fd4a1f87e245aa72745cc54e7559 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 0188a937e48de4b612472b99ab7a546c4f594fc3..29651a043dc92368770a28c0d2f4925cab5a93ac 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 dadb7dd46f29b5283ca696ea672b042de6641f7e..26e2daa3c1105c96577fded9269d2ddc4826b967 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 f8321bf6ad7019c9c7e9fe197d085e0a22fdc9bd..f689e8c46361552a12834db4d2e61e8476090626 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 742f36265b992998503587e1c06ee7af6cd35af9..904fe3607fa32858b4ea5a7b03ff8a0f353253c9 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 7a2b44bda01069197f336f3fdf322e0719274c36..612fbbf9529b238acc579bffab4c8ec333f7c72f 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 9a7f9af74b2637be9a405cadf20a8b85eda56a15..5df2f551f15ea866b36862a71d635ed3f383ee0d 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 da4c904272a3676ded042f28422d500601494008..f0c764680b51346375416e40121d50e29ed32921 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 e551eaf5b7989975b6770e0493fc4f2b42697e5b..cc3d49fd858beb72df448067ef4baca4ff495c51 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 40005e12824fef0e05c80530882d4a66a9c473cd..bedc20a322cc25824be1737d6efbcabcb4a2244b 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 1cd62191f17d3f2f71645e7d86431048238006d8..e1b072f9ef1f62931bf7c4556eab08a690418bf1 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 9e32ee4e9a3c4b89ad5d1bef9ce58c70a3a42dde..bbdbccda8082bf7f1983896548671ced827e6a2e 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 ff102548f5ad69b06c5d07f3d01b8162e8014f21..426520fa3f5c0124bd0dd215a3976118d22523ba 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 9bc6f5a167029083e7497eb43992db3e9dee9bbd..cfa52a84699f8292afe73c6031f8c21f674db4cf 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 edaf4f960eddd6b80173c4b7077763b62d0e4873..41e2c008279ed578300e5fbd3e4730d0cfea437a 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 b424fd5588cdac76e57e1131c5a0e09d08126bca..0a5c05b2015f85c7f7a67ba736d7fd46b3520a95 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 287f25efaac90307bb02e849ac3440163e2d3663..0d680205193a0a72b32da20ab5633d27bbc8c604 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 bb49ede3e94ccf207dc4520a9438cdfdcaf7a40c..35b2182004170ddac1db8227d4e7cf06e0fba24d 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 6f6cf977ca40c61bc62435f87705c81ad04d98eb..c04badac470b0ad57209002f604e42f25a873c78 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 81293444b5e55b0aef7dce6dfb8de6ae4860aa2c..7401750feb23886cc62fbfd7b962894088fbaeb6 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 1651498fa531b3bb208b96909b6f18380350a75e..6cf5cbb9b5c2b088d70c7f31d75e53b0ede2b181 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 37f088c2f0a9aa3e4b29216b05e5cbce21190a7f..e60da489400a51fc6183d9f8cb3d9ec5d73a0dd9 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 c61fac6c9441f1e0bbcf485b3930a289d207b15f..a8dcbf5f88eb5513e7c0965621affc8146ab5956 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 44ca2f75ef6f759b414ad8a0ca87ec1f6e0d456a..b707921563b8f8e90f2d519ebe3f8be53315ccf6 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 6c0530ac2e9af3ac73b8890420b5258d9e5f633a..70f785510d9508ba61725212d44d8089070bb915 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 e23d63cd5c6bbb53a405712ee0e23bfacb243c38..3ad11d457eb34a03a7499cb907796b49bd2773c4 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 790bffbed5f32195fa7de255e39f6094f0ad357b..d820396e573badd201c2d0b55057fde1a76cd135 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 f1de18ee6bc1edf048316866013000d664518c01..042c47c3f0902b218a58c496f75b1fa3f334e6b6 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 83631aee021666017f54a1bbcdbd8e4ef29da49e..6836111a3e430ad43539beec68fef1a0ccf92b8b 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 78e9c83482fe866a6b669a33a6c9b2b7edb7a796..5413857f12166eaff798505e267f0112795508eb 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 af31a2dfe6c4380450e35870906f84a4b906e100..b317d66a1e65096b22f90687740f28f0d6351983 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 0862df9ca82a6d1c5ed3b5743524370c26733513..f77a693f6ee3d82bc9349f1c25f2265c29aa6a50 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 57a054632a79a4f041b9a1a76d4b0e040081d1f7..1b083202c88c38a867704f73aafd8ddb43ae4622 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 5b41b634fc66a7c2cba3e29468957d5e68335f4d..8e67f121b408b8bec38c846a2f42ca6203b52122 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 395a4503f36c8cac335074b070cf7090111b710f..2fe41a5dcee946eac7eaf5c22aabdd3c6f9cf9e1 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 fe919baf98b6afb81fb147fde3e38bc1c1b5ffd8..6ddf32104b76dd09d8549b2c322ee620b96639a4 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 49ee92831f118df95210e4d5a149de3f555d27c7..56be4dca51d96abe7ee8da2015e4f1ba1bb48ce6 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 87ded1c07670aec120017f54f17bccc59fe2cdb9..b9b2517898e723eb4781504b0bb94cb6e5fcb6b8 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 8cc0bba37760b31e4298bf2924440811f1e1f0ed..e79c83b696b663ff95ff72579bfba9f25924329e 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 085eca1b035433b50b71ca2f68437b0adba77c4d..5f2bbb50cb938462cd62ec1b39a8ae4fd0825a6d 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 2009dd332f18688d98c0073c11e38403017ea877..51130505ba8db6dc9a4124ecb606f0f150dfb19b 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 7e45c6adb7b1ec9d7cf34ce5ea03c57823bdf097..5c52cde92984e1d0b3a3b3e87ce0f8efa4200f40 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 4e6095c9568d1184f3a08216aa763b5edddb75eb..3d25b90e99ded1459a1bfd2cce5382cae2982225 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 72c5326fa66bf104c6ebe042eda651b2e08f43d1..2b62178ec7a917b16ff153f90f60fd2c99c6479c 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 902138027f03417e34d0ba3119b8d591c99bc59c..643c181976f971d0381d9279798d76180e7a96d2 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 e4301e366b68abd27a95242b3600f4e18c385d84..bacd6e1b431647ec6857619d162cb6c724198f65 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 96302f2cbeb14be206b3483b5991ed956536db87..e3360e8e6336b60dbe7a528c2604f75c80e626ac 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 1814ba5516761223d337096840ca1608412dd168..e4f3e407cb6913ea5991927d9cb439ea90b990a3 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 3fbafb21f8b50c21241e76e2882f7e603f08567d..8be8f0d053178da4147bf6716688a3d72bf849ce 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 8492f097b2fd0a9c03193e6de88cef1262ea64e5..58daf741d0ec243e959bbe7a54f10db5579e3886 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 fcbc5a9d18e6265dda803fc605881887cc6c5d8f..e03b6bd4973e4c654298cdeba9e981976bec7e26 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 dec0e49d6869fcd8f3af6b4aaebab74efa78be75..47a65cb89588aa03618eac754a79ebc937996f88 100644
--- a/system/stack/test/fuzzers/a2dp/codec/a2dpCodecHelperFunctions.h
+++ b/system/stack/test/fuzzers/a2dp/codec/a2dpCodecHelperFunctions.h
@@ -118,7 +118,6 @@ tA2DP_ENCODER_INIT_PEER_PARAMS getArbitraryA2dpEncoderInitPeerParams(
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 187b474d78e78764f56f767584dbef5b42d52604..eba44b06d4b4130a079ad6feceb3a9eacfc39d16 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 fc1e2c2c8efbe9bdedcd692122138867b4c13988..bd324e1df745b018930dc3b6c093999aa41f97bc 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 b20bc8ba4854dad80d92747104e3efc2960759fc..a4f3255f2b039d7b843494d2f20c91107427a094 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 c7fee43f7e075238cb137787bb4ad310612fd11d..eb8ec483da7e94cf65fedd676cc971d8ee335bb0 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 @@ std::vector<uint8_t> CreateQuickDataPacket(uint8_t dlci, bool cr,
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 95716b6ee8f2110fa158cc6f99f75b79988abb3c..2ebe03b1191075ebf3f45a8b0199e5e797da7c60 100644
--- a/system/test/mock/mock_bta_dm_act.h
+++ b/system/test/mock/mock_bta_dm_act.h
@@ -56,7 +56,6 @@ extern std::map<std::string, int> mock_function_count_map;
#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 @@ extern struct handle_remote_features_complete handle_remote_features_complete;
} // 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 cd036c9da1ae3c143ae7cac463070605cf0abe02..24901fb903d7adb4d0dbac5e316b1a1aa4580e5b 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 @@ extern std::map<std::string, int> mock_function_count_map;
#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 95bc473847a9013c693c64474e829d6b02547eb5..35dd87d6a62dd5d467e594cf5c194a584c778962 100644
--- a/system/test/mock/mock_bta_sys_main.h
+++ b/system/test/mock/mock_bta_sys_main.h
@@ -47,7 +47,6 @@ extern std::map<std::string, int> mock_function_count_map;
#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 @@ extern struct bta_sys_start_timer bta_sys_start_timer;
} // 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 1d087b5bce9a84ea76f2a30e96c3f7197afaadd3..e4dddc4c566c9520f0e20409591c563250578c15 100644
--- a/system/test/mock/mock_device_controller.cc
+++ b/system/test/mock/mock_device_controller.cc
@@ -32,7 +32,6 @@ extern std::map<std::string, int> mock_function_count_map;
// 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 3417910e54da184d8462485163e1c652262e27d6..8d8a9d99937cbd22797172eecfcea05c5edcc3de 100644
--- a/system/test/mock/mock_device_controller.h
+++ b/system/test/mock/mock_device_controller.h
@@ -33,7 +33,6 @@ extern std::map<std::string, int> mock_function_count_map;
// 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 45345cc26db11c9c4bf1d7c371460c49f6f5a358..5b3b59e3ddfecec907d19b6b8152939d6adfccf4 100644
--- a/system/test/mock/mock_stack_acl_ble.cc
+++ b/system/test/mock/mock_stack_acl_ble.cc
@@ -31,7 +31,6 @@ extern std::map<std::string, int> mock_function_count_map;
#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 85adf06a57a9318720e1da85941f878b5191a464..e93ef071206f8e94a7418e88d5f10e160d8a948b 100644
--- a/system/test/mock/mock_stack_avct_api.cc
+++ b/system/test/mock/mock_stack_avct_api.cc
@@ -28,7 +28,6 @@ extern std::map<std::string, int> mock_function_count_map;
#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 a75860146c6f036867a528e2c4b584f3b8c021f5..87ca6c92299b55e11d2552dca7b941cb814e142c 100644
--- a/system/test/mock/mock_stack_avdt_api.cc
+++ b/system/test/mock/mock_stack_avdt_api.cc
@@ -28,7 +28,6 @@ extern std::map<std::string, int> mock_function_count_map;
#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 835b1d230d19d0a3276089a3ad1388cbe2d5b6ce..d8653d780607d6082342b77b926e230b3a63fff9 100644
--- a/system/test/mock/mock_stack_btm_ble.cc
+++ b/system/test/mock/mock_stack_btm_ble.cc
@@ -34,7 +34,6 @@ extern std::map<std::string, int> mock_function_count_map;
#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 8d53a80704f9ef5cbe6d89af31c546962c556486..91a7dc8c981bb2a3b92bafeecfce9173535f5c68 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 @@ extern std::map<std::string, int> mock_function_count_map;
#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 3f5a8803baaa426a09f69159423b02bccca52953..3a2209fe608e976233910b8b969e5370f02aaff6 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 @@ extern std::map<std::string, int> mock_function_count_map;
#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 41914ba6bc85986f8800fc208f880765a0241f53..8e1ed0c5129cd03b932d8a5f1048f67b5bed9249 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 @@ extern std::map<std::string, int> mock_function_count_map;
#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 98355b59d808de9284b918ba7b88cc4a793e128d..8701547cc3c39e0406e881f869e1886b457958b4 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 @@ extern std::map<std::string, int> mock_function_count_map;
#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 52573462dc86d1ea550cff80f54feef449c2fbd9..9ac05be4bcd92606be84990b51b2ceedc2be995e 100644
--- a/system/test/mock/mock_stack_btm_dev.cc
+++ b/system/test/mock/mock_stack_btm_dev.cc
@@ -29,7 +29,6 @@ extern std::map<std::string, int> mock_function_count_map;
#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 5aeab027c4ab87b713356c534b1541c05f03b341..986520234dac6a4bf3314b0d127cbbf8a6b9946d 100644
--- a/system/test/mock/mock_stack_btm_devctl.cc
+++ b/system/test/mock/mock_stack_btm_devctl.cc
@@ -28,7 +28,6 @@ extern std::map<std::string, int> mock_function_count_map;
#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 594e74f48f40c50cb6c4588ef915d65325995254..0957f23dd561e99555c0789e7880527e027cb73d 100644
--- a/system/test/mock/mock_stack_btm_inq.cc
+++ b/system/test/mock/mock_stack_btm_inq.cc
@@ -30,7 +30,6 @@ extern std::map<std::string, int> mock_function_count_map;
#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 1744bc32d964002b1f525a5835a0c9324e7356fd..7df789b0c4adf4f7ac732eaaf210dae5ee75ffc3 100644
--- a/system/test/mock/mock_stack_btm_main.cc
+++ b/system/test/mock/mock_stack_btm_main.cc
@@ -27,7 +27,6 @@ extern std::map<std::string, int> mock_function_count_map;
#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 f9fe8d4b55b27170047db67a3639f83eb198d878..8b0cbe824b23bad36f3732e92edcbc66d776e5ba 100644
--- a/system/test/mock/mock_stack_btm_sec.cc
+++ b/system/test/mock/mock_stack_btm_sec.cc
@@ -28,7 +28,6 @@ extern std::map<std::string, int> mock_function_count_map;
#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 992e361cf7017eacee0ac1a39cbf69375c82a3cf..90aaa4c698ec705626239e49dce27b4fefc42e55 100644
--- a/system/test/mock/mock_stack_hidd_api.cc
+++ b/system/test/mock/mock_stack_hidd_api.cc
@@ -27,7 +27,6 @@ extern std::map<std::string, int> mock_function_count_map;
#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 304c7596b300e7a735c73247db20c98288d0a737..a8102bc69afefb7c5afe4ff3ec0c962c9a59086a 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 29023b2d0d75331281c35fe09d9cce37fdba4943..fdb984eb235230dae69b3e08fd0eeb7ed5d80887 100644
--- a/system/test/mock/mock_stack_pan_api.cc
+++ b/system/test/mock/mock_stack_pan_api.cc
@@ -28,7 +28,6 @@ extern std::map<std::string, int> mock_function_count_map;
#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 12e29ebab67c614de605687ad170f1b97f82b6ea..1ce8952b16bba8fd80f354399e847d1fe13a25df 100644
--- a/system/test/mock/mock_udrv_ulinux_uipc.cc
+++ b/system/test/mock/mock_udrv_ulinux_uipc.cc
@@ -42,7 +42,6 @@ extern std::map<std::string, int> mock_function_count_map;
#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 1b0b8a1671481f5762d2a28b5f37aee2e8c734f6..82a2d049079d68a8300c5516701df403b0a39127 100644
--- a/system/test/mock/mock_utils_bt.h
+++ b/system/test/mock/mock_utils_bt.h
@@ -44,7 +44,6 @@ extern std::map<std::string, int> mock_function_count_map;
#include <mutex>
-#include "bt_types.h"
#include "bt_utils.h"
#include "btcore/include/module.h"
#include "osi/include/compat.h"
@@ -72,4 +71,4 @@ extern struct raise_priority_a2dp raise_priority_a2dp;
} // 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 9ae78b5f812018ec1861a69b587888d41bfa25a8..dd404b3690b5db038f14bfee24dcd249152d967a 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 58cabafa61a55d80a11a75817025c5f1c3069ec8..3f267c17e6fb8efc5786ba6bfc05905d57eff590 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 a26ee723181a381246ff579482ccb8f026aa2764..be10778c1bd15575b20826cf51944ff59ed5d4a6 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"
/****************************************************************************