diff --git a/system/bta/av/bta_av_aact.cc b/system/bta/av/bta_av_aact.cc
index e2d0327bf94ba68d8960c648f67349189de001c6..79fcfdd91033616717c059909bee787c5d64968f 100644
--- a/system/bta/av/bta_av_aact.cc
+++ b/system/bta/av/bta_av_aact.cc
@@ -52,6 +52,7 @@
#include "stack/include/bt_uuid16.h"
#include "stack/include/btm_api.h"
#include "stack/include/btm_client_interface.h"
+#include "stack/include/btm_log_history.h"
#include "stack/include/l2c_api.h"
#include "types/hci_role.h"
#include "types/raw_address.h"
diff --git a/system/bta/dm/bta_dm_disc.cc b/system/bta/dm/bta_dm_disc.cc
index 85dc848c24c8deea1db61d2568ef0de1ec9a18cb..b02c3a298795533cccd99ae2f9cb7e5bae7bcfde 100644
--- a/system/bta/dm/bta_dm_disc.cc
+++ b/system/bta/dm/bta_dm_disc.cc
@@ -46,6 +46,7 @@
#include "stack/include/bt_name.h"
#include "stack/include/bt_uuid16.h"
#include "stack/include/btm_client_interface.h"
+#include "stack/include/btm_log_history.h"
#include "stack/include/gap_api.h"
#include "stack/include/gatt_api.h"
#include "stack/include/sdp_status.h"
diff --git a/system/bta/hh/bta_hh_act.cc b/system/bta/hh/bta_hh_act.cc
index d97a116f56d77fa909ea559b62719bbd0fb91fb1..158837c1a90380133403f846a0d74857a7af8789 100644
--- a/system/bta/hh/bta_hh_act.cc
+++ b/system/bta/hh/bta_hh_act.cc
@@ -39,6 +39,7 @@
#include "stack/include/acl_api.h"
#include "stack/include/bt_hdr.h"
#include "stack/include/bt_uuid16.h"
+#include "stack/include/btm_log_history.h"
#include "stack/include/hiddefs.h"
#include "stack/include/hidh_api.h"
#include "stack/include/sdp_api.h"
diff --git a/system/bta/hh/bta_hh_le.cc b/system/bta/hh/bta_hh_le.cc
index 6586104611d24bae662b0a48733518278e6aa4de..0a88943a56f615c8ce8c4fd7efaed107a6c27419 100644
--- a/system/bta/hh/bta_hh_le.cc
+++ b/system/bta/hh/bta_hh_le.cc
@@ -33,6 +33,7 @@
#include "stack/btm/btm_sec.h" // BTM_
#include "stack/include/bt_hdr.h"
#include "stack/include/bt_uuid16.h"
+#include "stack/include/btm_log_history.h"
#include "stack/include/l2c_api.h" // L2CA_
#include "stack/include/main_thread.h"
#include "stack/include/srvc_api.h" // tDIS_VALUE
diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h
index f3671a4bf4d11df48174ffeb2ecb92f9a0db1965..0c4d243fcbecefc02538e52ddadf0db56f0f69b3 100644
--- a/system/bta/include/bta_api.h
+++ b/system/bta/include/bta_api.h
@@ -25,14 +25,16 @@
#ifndef BTA_API_H
#define BTA_API_H
-#include <base/strings/stringprintf.h>
#include <base/functional/callback.h>
+#include <base/strings/stringprintf.h>
#include <cstdint>
#include <vector>
#include "bt_target.h" // Must be first to define build configuration
+#include "bta_api_data_types.h"
#include "osi/include/log.h"
+#include "stack/include/bt_name.h"
#include "stack/include/bt_octets.h"
#include "stack/include/bt_types.h"
#include "stack/include/btm_api_types.h"
@@ -43,8 +45,6 @@
#include "types/bluetooth/uuid.h"
#include "types/bt_transport.h"
#include "types/raw_address.h"
-#include "bta_api_data_types.h"
-
/*
* Service ID
diff --git a/system/bta/le_audio/le_audio_types.h b/system/bta/le_audio/le_audio_types.h
index 6f6b83e007902cfe442f65b0da2b944c9357a3b7..c532103ad770beb0e4fb108e41c150fff8d65d59 100644
--- a/system/bta/le_audio/le_audio_types.h
+++ b/system/bta/le_audio/le_audio_types.h
@@ -31,9 +31,11 @@
#include <variant>
#include <vector>
+#include "bluetooth/uuid.h"
#include "bta_le_audio_uuids.h"
#include "btm_iso_api_types.h"
#include "osi/include/alarm.h"
+#include "stack/include/bt_types.h"
namespace le_audio {
diff --git a/system/btif/src/btif_hf.cc b/system/btif/src/btif_hf.cc
index d42213d132cff827f41a1081f9dd55c0f6b162c4..4f3e1cd07444fcee1bfd510e2f350e0d5fc52959 100644
--- a/system/btif/src/btif_hf.cc
+++ b/system/btif/src/btif_hf.cc
@@ -52,6 +52,7 @@
#include "stack/btm/btm_sco_hfp_hal.h"
#include "stack/include/bt_uuid16.h"
#include "stack/include/btm_api.h"
+#include "stack/include/btm_log_history.h"
#include "types/raw_address.h"
namespace {
diff --git a/system/main/shim/acl.cc b/system/main/shim/acl.cc
index 32a53a2f980dc8f34c8e79b17592c9638637153c..d593a50c71ee19fdd9913dca41e2615b389c27a0 100644
--- a/system/main/shim/acl.cc
+++ b/system/main/shim/acl.cc
@@ -56,6 +56,7 @@
#include "stack/btm/btm_int_types.h"
#include "stack/btm/btm_sec_cb.h"
#include "stack/include/bt_hdr.h"
+#include "stack/include/btm_log_history.h"
#include "stack/l2cap/l2c_int.h"
#include "types/ble_address_with_type.h"
#include "types/raw_address.h"
diff --git a/system/main/shim/btm.h b/system/main/shim/btm.h
index fcde56861547ceeba25ea944910f3f150ee4d7e6..587d80671c13743fb3212f5c900e1b7192cc53f7 100644
--- a/system/main/shim/btm.h
+++ b/system/main/shim/btm.h
@@ -20,9 +20,9 @@
#include <cstdint>
#include <functional>
#include <mutex>
-#include <unordered_map>
#include <vector>
+#include "bt_transport.h"
#include "gd/common/callback.h"
#include "gd/hci/le_advertising_manager.h"
#include "gd/hci/le_scanning_manager.h"
@@ -30,8 +30,6 @@
#include "gd/os/alarm.h"
#include "hci/hci_packets.h"
#include "stack/btm/neighbor_inquiry.h"
-#include "stack/include/btm_api_types.h"
-#include "types/bluetooth/uuid.h"
#include "types/raw_address.h"
//
diff --git a/system/stack/acl/acl.cc b/system/stack/acl/acl.cc
index 7f897bbf982fec23c6d789a83cc1c29256d8f7e6..8342ad9751f691a3cfe6e89e1173c355c0d3ab3f 100644
--- a/system/stack/acl/acl.cc
+++ b/system/stack/acl/acl.cc
@@ -14,10 +14,6 @@
* limitations under the License.
*/
-#include <unordered_set>
-
-#include "main/shim/dumpsys.h"
-#include "osi/include/log.h"
#include "stack/acl/acl.h"
#include "types/raw_address.h"
diff --git a/system/stack/acl/acl.h b/system/stack/acl/acl.h
index ad44adad3ad6a753b092de589b403eacacc753a2..959d6cb13ad36c20c480f0bd0c5ed4dc9a4d37eb 100644
--- a/system/stack/acl/acl.h
+++ b/system/stack/acl/acl.h
@@ -18,13 +18,12 @@
#include <cstdint>
#include <string>
-#include <unordered_set>
#include <vector>
+#include "bt_target.h"
#include "stack/acl/peer_packet_types.h"
-#include "stack/include/acl_api_types.h"
-#include "stack/include/bt_types.h"
#include "stack/include/btm_api_types.h"
+#include "stack/include/btm_status.h"
#include "stack/include/hcimsgs.h"
#include "types/bt_transport.h"
#include "types/hci_role.h"
diff --git a/system/stack/acl/btm_pm.cc b/system/stack/acl/btm_pm.cc
index 0d238325d7f676f1e039ad63d634f83c68e0a143..2383a902dcd75c46b0ca61fd7a2265bbb621417d 100644
--- a/system/stack/acl/btm_pm.cc
+++ b/system/stack/acl/btm_pm.cc
@@ -38,7 +38,6 @@
#include "bt_target.h"
#include "device/include/controller.h"
#include "device/include/interop.h"
-#include "gd/common/init_flags.h"
#include "main/shim/dumpsys.h"
#include "os/log.h"
#include "osi/include/osi.h" // UNUSED_ATTR
@@ -47,6 +46,7 @@
#include "stack/btm/btm_sec_cb.h"
#include "stack/include/btm_api.h"
#include "stack/include/btm_api_types.h"
+#include "stack/include/btm_log_history.h"
#include "stack/include/btm_status.h"
#include "types/raw_address.h"
diff --git a/system/stack/btm/btm_ble_gap.cc b/system/stack/btm/btm_ble_gap.cc
index 7047eda5b71823eff7ca2d97669a87f12109eebe..11c0110ec4534684e020b6e169abfc410978fea3 100644
--- a/system/stack/btm/btm_ble_gap.cc
+++ b/system/stack/btm/btm_ble_gap.cc
@@ -59,6 +59,7 @@
#include "stack/include/bt_types.h"
#include "stack/include/bt_uuid16.h"
#include "stack/include/btm_api_types.h"
+#include "stack/include/btm_log_history.h"
#include "stack/include/gap_api.h"
#include "stack/include/hci_error_code.h"
#include "stack/include/inq_hci_link_interface.h"
diff --git a/system/stack/btm/btm_dev.cc b/system/stack/btm/btm_dev.cc
index 97d3ce9169615e9321c8afe9f14f702c04c316bf..f6b26138ac15ef02a7a9f0995e953c8e62bac7a9 100644
--- a/system/stack/btm/btm_dev.cc
+++ b/system/stack/btm/btm_dev.cc
@@ -44,6 +44,7 @@
#include "rust/src/connection/ffi/connection_shim.h"
#include "stack/include/acl_api.h"
#include "stack/include/bt_octets.h"
+#include "stack/include/btm_log_history.h"
#include "types/raw_address.h"
extern tBTM_CB btm_cb;
diff --git a/system/stack/btm/btm_inq.cc b/system/stack/btm/btm_inq.cc
index aa74f5926f32185e03eb8aa69206b4ba0a5c8304..6c3366ce7279729120416aa68c11822e69c93685 100644
--- a/system/stack/btm/btm_inq.cc
+++ b/system/stack/btm/btm_inq.cc
@@ -54,6 +54,7 @@
#include "stack/include/bt_uuid16.h"
#include "stack/include/btm_api.h"
#include "stack/include/btm_ble_api.h"
+#include "stack/include/btm_log_history.h"
#include "stack/include/inq_hci_link_interface.h"
#include "types/bluetooth/uuid.h"
#include "types/raw_address.h"
diff --git a/system/stack/btm/btm_sco.cc b/system/stack/btm/btm_sco.cc
index e7f4fb7defee1c1c9010dbb45595784b7e6e8001..5a3e5db0ad6bef188c11aecb46e5b37a84251e46 100644
--- a/system/stack/btm/btm_sco.cc
+++ b/system/stack/btm/btm_sco.cc
@@ -35,25 +35,18 @@
#include "common/bidi_queue.h"
#include "device/include/controller.h"
#include "device/include/device_iot_config.h"
-#include "embdrv/sbc/decoder/include/oi_codec_sbc.h"
-#include "embdrv/sbc/decoder/include/oi_status.h"
#include "gd/hci/hci_layer.h"
#include "hci/hci_packets.h"
#include "hci/include/hci_layer.h"
#include "main/shim/entry.h"
-#include "main/shim/hci_layer.h"
-#include "osi/include/allocator.h"
-#include "osi/include/log.h"
-#include "osi/include/osi.h"
#include "osi/include/properties.h"
#include "osi/include/stack_power_telemetry.h"
#include "stack/btm/btm_sco_hfp_hal.h"
#include "stack/btm/btm_sec.h"
-#include "stack/btm/security_device_record.h"
#include "stack/include/acl_api.h"
-#include "stack/include/bt_hdr.h"
#include "stack/include/btm_api.h"
#include "stack/include/btm_api_types.h"
+#include "stack/include/btm_log_history.h"
#include "stack/include/hci_error_code.h"
#include "stack/include/main_thread.h"
#include "stack/include/sdpdefs.h"
diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc
index 90d40f56b6a02627f840a1fd53f97dbefd025a2f..0a59267c26cd134452931053f7ed2e9ebaee9e48 100644
--- a/system/stack/btm/btm_sec.cc
+++ b/system/stack/btm/btm_sec.cc
@@ -52,6 +52,7 @@
#include "stack/btm/security_device_record.h"
#include "stack/include/acl_api.h"
#include "stack/include/bt_psm_types.h"
+#include "stack/include/btm_log_history.h"
#include "stack/include/btm_sec_api.h"
#include "stack/include/btm_status.h"
#include "stack/include/l2cap_security_interface.h"
diff --git a/system/stack/btm/btm_sec_cb.h b/system/stack/btm/btm_sec_cb.h
index 7d19bbad39224699e2f1990444ef82633ea9b528..79b0909ac30665776ed276d8cb2d98862cc6c81f 100644
--- a/system/stack/btm/btm_sec_cb.h
+++ b/system/stack/btm/btm_sec_cb.h
@@ -19,7 +19,6 @@
#include <cstdint>
-#include "osi/include/allocator.h"
#include "osi/include/fixed_queue.h"
#include "osi/include/list.h"
#include "stack/btm/btm_ble_int_types.h"
diff --git a/system/stack/btm/btm_sec_int_types.h b/system/stack/btm/btm_sec_int_types.h
index d92047b43dfa868295022911f5a449fe91688398..f28ec6d5ed82c88187709204b5178ba233951315 100644
--- a/system/stack/btm/btm_sec_int_types.h
+++ b/system/stack/btm/btm_sec_int_types.h
@@ -18,21 +18,11 @@
#pragma once
#include <cstdint>
-#include <memory>
-#include <string>
-#include "osi/include/allocator.h"
-#include "osi/include/fixed_queue.h"
-#include "osi/include/list.h"
-#include "stack/acl/acl.h"
-#include "stack/btm/btm_ble_int_types.h"
-#include "stack/btm/btm_sco.h"
-#include "stack/btm/neighbor_inquiry.h"
-#include "stack/btm/security_device_record.h"
#include "stack/include/bt_octets.h"
-#include "stack/include/btm_ble_api_types.h"
-#include "stack/include/rfcdefs.h"
-#include "stack/include/security_client_callbacks.h"
+#include "stack/include/btm_api_types.h" // tBTM_CMPL_CB
+#include "stack/include/btm_ble_sec_api_types.h"
+#include "stack/include/btm_sec_api_types.h"
#include "types/raw_address.h"
/*
diff --git a/system/stack/btm/neighbor_inquiry.h b/system/stack/btm/neighbor_inquiry.h
index 5eb6d918ea3af9e8b88c3f7b59172aef1a8e78c1..650a0cdde9071a96791dcc088563e356ca5b7a84 100644
--- a/system/stack/btm/neighbor_inquiry.h
+++ b/system/stack/btm/neighbor_inquiry.h
@@ -18,9 +18,12 @@
#include <cstdint>
+#include "bt_target.h" // BTM_NO_SSP_ON_INQUIRY
#include "osi/include/alarm.h"
#include "stack/include/bt_device_type.h"
+#include "stack/include/bt_name.h"
#include "stack/include/btm_api_types.h"
+#include "stack/include/btm_status.h"
#include "types/ble_address_with_type.h"
#include "types/raw_address.h"
diff --git a/system/stack/btm/security_device_record.h b/system/stack/btm/security_device_record.h
index b780b8768299b4b957c6394b927b9951d15400a6..18df5584dfdb0a20f1d36e00cc6fe9c5c892ee1a 100644
--- a/system/stack/btm/security_device_record.h
+++ b/system/stack/btm/security_device_record.h
@@ -20,7 +20,6 @@
#include <base/logging.h>
#include <base/strings/stringprintf.h>
-#include <string.h>
#include <cstdint>
#include <string>
diff --git a/system/stack/btu/btu_event.cc b/system/stack/btu/btu_event.cc
index 54e38a47b1bcb5d4ce601c16e0b51372931f687b..d1bfc5b2caac3d71c7cc2abaca258482760b9c4f 100644
--- a/system/stack/btu/btu_event.cc
+++ b/system/stack/btu/btu_event.cc
@@ -17,6 +17,7 @@
#include "btm_iso_api.h"
#include "osi/include/allocator.h"
#include "stack/include/bt_hdr.h"
+#include "stack/include/bt_types.h"
#include "stack/include/btu_hcif.h"
using bluetooth::hci::IsoManager;
diff --git a/system/stack/gatt/connection_manager.cc b/system/stack/gatt/connection_manager.cc
index 6a8028bc5553933f895f0c362ae8de3740c4fbdd..129968e5030b3dd57751490c49731a5ee64981fd 100644
--- a/system/stack/gatt/connection_manager.cc
+++ b/system/stack/gatt/connection_manager.cc
@@ -37,6 +37,7 @@
#include "stack/btm/btm_ble_bgconn.h"
#include "stack/include/advertise_data_parser.h"
#include "stack/include/btm_ble_api.h"
+#include "stack/include/btm_log_history.h"
#include "stack/include/l2c_api.h"
#include "stack/include/main_thread.h"
#include "types/raw_address.h"
diff --git a/system/stack/gatt/gatt_api.cc b/system/stack/gatt/gatt_api.cc
index 1954ecc185014197067f44f91085c93d2ce5d5ca..bc47a213a844836e9c8003f26032d1e82f583c76 100644
--- a/system/stack/gatt/gatt_api.cc
+++ b/system/stack/gatt/gatt_api.cc
@@ -42,6 +42,7 @@
#include "stack/gatt/gatt_int.h"
#include "stack/include/bt_hdr.h"
#include "stack/include/bt_uuid16.h"
+#include "stack/include/sdp_api.h"
#include "types/bluetooth/uuid.h"
#include "types/bt_transport.h"
#include "types/raw_address.h"
diff --git a/system/stack/include/btm_api.h b/system/stack/include/btm_api.h
index 0f50cf99b03be553ae8b1db7a24f7f49809d30ca..12466352f5d424305b457ffbe7e7ddb1a079463a 100644
--- a/system/stack/include/btm_api.h
+++ b/system/stack/include/btm_api.h
@@ -28,14 +28,8 @@
#include "device/include/esco_parameters.h"
#include "stack/btm/neighbor_inquiry.h"
-#include "stack/include/bt_hdr.h"
-#include "stack/include/bt_octets.h"
#include "stack/include/btm_api_types.h"
-#include "stack/include/btm_log_history.h"
#include "stack/include/btm_status.h"
-#include "stack/include/sco_client_callbacks.h"
-#include "stack/include/sdp_api.h"
-#include "types/bluetooth/uuid.h"
#include "types/bt_transport.h"
#include "types/raw_address.h"
diff --git a/system/stack/include/btm_api_types.h b/system/stack/include/btm_api_types.h
index 849bc83ef5e0abc01ee5a11469c95f7ac9206090..012a682dfe4d18f58193c5f1f73fdfde71819aaa 100644
--- a/system/stack/include/btm_api_types.h
+++ b/system/stack/include/btm_api_types.h
@@ -24,17 +24,11 @@
#include <cstdint>
#include <string>
-#include "internal_include/bt_target.h"
#include "stack/include/bt_dev_class.h"
#include "stack/include/bt_hdr.h"
-#include "stack/include/bt_name.h"
-#include "stack/include/bt_octets.h"
-#include "stack/include/btm_status.h"
#include "stack/include/hci_mode.h"
#include "stack/include/hcidefs.h"
#include "stack/include/sdpdefs.h"
-#include "types/ble_address_with_type.h"
-#include "types/bt_transport.h"
#include "types/raw_address.h"
/* Structure returned with Vendor Specific Command complete callback */
diff --git a/system/stack/include/btm_ble_api.h b/system/stack/include/btm_ble_api.h
index ef0f5d43aa0a79eb82d858fbfc544f747b435551..a78ceaeff62c8ba5304e8fa587ae3653bb2a8567 100644
--- a/system/stack/include/btm_ble_api.h
+++ b/system/stack/include/btm_ble_api.h
@@ -33,7 +33,6 @@
#include "btm_api.h"
#include "btm_ble_api_types.h"
-#include "osi/include/alarm.h"
#include "stack/btm/neighbor_inquiry.h"
#include "types/bt_transport.h"
#include "types/raw_address.h"
diff --git a/system/stack/include/btm_ble_api_types.h b/system/stack/include/btm_ble_api_types.h
index 131c08a900959a202b1bb129649faea3c84142da..07f5bd9963026598d2362c0d23ae95af65667db6 100644
--- a/system/stack/include/btm_ble_api_types.h
+++ b/system/stack/include/btm_ble_api_types.h
@@ -26,7 +26,6 @@
#include <vector>
#include "stack/include/bt_octets.h"
-#include "stack/include/btm_api_types.h"
#include "stack/include/btm_status.h"
#include "stack/include/hci_error_code.h"
#include "types/ble_address_with_type.h"
diff --git a/system/stack/include/btm_ble_sec_api.h b/system/stack/include/btm_ble_sec_api.h
index c0b5454e92de66b285ca112007057972c982f7eb..451e63063a04327c0a6be607e2132b954d244482 100644
--- a/system/stack/include/btm_ble_sec_api.h
+++ b/system/stack/include/btm_ble_sec_api.h
@@ -22,11 +22,9 @@
#include <hardware/bt_common_types.h>
#include <cstdint>
-#include <memory>
#include "btm_ble_api_types.h"
#include "btm_ble_sec_api_types.h"
-#include "types/bt_transport.h"
#include "types/raw_address.h"
/*******************************************************************************
diff --git a/system/stack/include/btm_sec_api.h b/system/stack/include/btm_sec_api.h
index b1c383d560dfd99ed538fbaed00075d1d9402bce..74622e8df97a2005f49d807ed4631fb88c955d0f 100644
--- a/system/stack/include/btm_sec_api.h
+++ b/system/stack/include/btm_sec_api.h
@@ -18,7 +18,10 @@
#pragma once
#include <cstdint>
-#include "types/bt_transport.h"
+
+#include "stack/include/bt_dev_class.h"
+#include "stack/include/bt_name.h"
+#include "stack/include/bt_octets.h"
#include "types/raw_address.h"
/*****************************************************************************
diff --git a/system/stack/include/btm_sec_api_types.h b/system/stack/include/btm_sec_api_types.h
index f83a79ef6ed1c7d8b6cd9aa850795a56564c9d76..b2a9cff66a9a63209cf64c76cc9706676afae161 100644
--- a/system/stack/include/btm_sec_api_types.h
+++ b/system/stack/include/btm_sec_api_types.h
@@ -20,12 +20,11 @@
#include <cstdint>
#include <string>
-#include "internal_include/bt_target.h"
-#include "stack/include/bt_octets.h"
+
#include "stack/include/bt_name.h"
+#include "stack/include/bt_octets.h"
#include "stack/include/hcidefs.h"
#include "stack/include/smp_api_types.h"
-#include "types/ble_address_with_type.h"
#include "types/bt_transport.h"
#include "types/raw_address.h"
diff --git a/system/stack/include/l2cap_security_interface.h b/system/stack/include/l2cap_security_interface.h
index c3d14762613d4ef39c85a4e5f82fe55e81caf883..8d8b22c3ea09a44f64084d841d641ab611d1f29d 100644
--- a/system/stack/include/l2cap_security_interface.h
+++ b/system/stack/include/l2cap_security_interface.h
@@ -18,6 +18,7 @@
#pragma once
#include <cstdint>
+#include "stack/include/btm_status.h"
#include "types/raw_address.h"
// This header contains functions for Security Module to invoke
diff --git a/system/stack/include/sec_hci_link_interface.h b/system/stack/include/sec_hci_link_interface.h
index f1c93a0c165878f997aa2c489daaa4b7f60092a8..687cdfa398331bd4e4c9e1191e53e24da4f04d39 100644
--- a/system/stack/include/sec_hci_link_interface.h
+++ b/system/stack/include/sec_hci_link_interface.h
@@ -19,7 +19,6 @@
#include <cstdint>
-#include "stack/include/bt_types.h"
#include "stack/include/btm_sec_api_types.h"
#include "types/raw_address.h"
diff --git a/system/stack/include/security_client_callbacks.h b/system/stack/include/security_client_callbacks.h
index 76687bf40ae8c44a6ddd956c1b91b123a07301f9..6b593fdd6256a59eb1203020c4053118aec69613 100644
--- a/system/stack/include/security_client_callbacks.h
+++ b/system/stack/include/security_client_callbacks.h
@@ -18,8 +18,9 @@
#include <cstdint>
+#include "stack/include/bt_dev_class.h"
+#include "stack/include/bt_name.h"
#include "stack/include/bt_octets.h"
-#include "stack/include/btm_sec_api_types.h"
#include "stack/include/btm_ble_sec_api_types.h"
#include "stack/include/hci_error_code.h"
#include "types/raw_address.h"
diff --git a/system/stack/l2cap/l2c_ble.cc b/system/stack/l2cap/l2c_ble.cc
index 7d9b39ec909d653ac96e7f8f13cf53b478e7bade..81364018f566f8d4fcd627b4ffa87e7b963dea17 100644
--- a/system/stack/l2cap/l2c_ble.cc
+++ b/system/stack/l2cap/l2c_ble.cc
@@ -45,6 +45,7 @@
#include "stack/btm/btm_sec_int_types.h"
#include "stack/include/acl_api.h"
#include "stack/include/bt_psm_types.h"
+#include "stack/include/btm_log_history.h"
#include "stack/include/l2c_api.h"
#include "stack/include/l2cdefs.h"
#include "stack/l2cap/l2c_int.h"
diff --git a/system/stack/smp/smp_main.cc b/system/stack/smp/smp_main.cc
index d8978d42dca12fa4c5f11e948dfbb2f35d34a713..e6d17457d9aa09872fffcd2ba802c137b94996c3 100644
--- a/system/stack/smp/smp_main.cc
+++ b/system/stack/smp/smp_main.cc
@@ -18,12 +18,11 @@
#define LOG_TAG "bluetooth"
-#include "bt_target.h"
-
#include <string.h>
-#include "smp_int.h"
#include "osi/include/log.h"
+#include "smp_int.h"
+#include "stack/include/btm_log_history.h"
namespace {
diff --git a/system/test/mock/mock_stack_hcic_hciblecmds.h b/system/test/mock/mock_stack_hcic_hciblecmds.h
index 9bf6b7f023fc5bbb489a312f4b5f6269dc272137..5d9b5766b452f5750efa9bcee9be0efaa3643699 100644
--- a/system/test/mock/mock_stack_hcic_hciblecmds.h
+++ b/system/test/mock/mock_stack_hcic_hciblecmds.h
@@ -24,8 +24,10 @@
#include <cstdint>
#include <functional>
+#include <vector>
// Original included files, if any
+#include "base/callback.h"
#include "hcimsgs.h"
#include "stack/include/bt_octets.h"
#include "types/raw_address.h"
diff --git a/system/test/mock/mock_stack_hcic_hcicmds.h b/system/test/mock/mock_stack_hcic_hcicmds.h
index d613e2d1f304fd0b09737e0313fff904e9ae80bb..03aa7feb36a66f7e543895934d6a8581a0cdeb38 100644
--- a/system/test/mock/mock_stack_hcic_hcicmds.h
+++ b/system/test/mock/mock_stack_hcic_hcicmds.h
@@ -27,6 +27,7 @@
#include <functional>
// Original included files, if any
+#include "base/callback.h"
#include "device/include/esco_parameters.h"
#include "hcimsgs.h"
#include "stack/include/bt_octets.h"