legacy: Properly include various
Bug: 197478351
Tag: #refactor
Test: gd/cert/run
Change-Id: I3bdffbdd9a41239472a66b96a814eb0721ccba04
diff --git a/system/bta/ag/bta_ag_cfg.cc b/system/bta/ag/bta_ag_cfg.cc
index fe75b61..c331973 100644
--- a/system/bta/ag/bta_ag_cfg.cc
+++ b/system/bta/ag/bta_ag_cfg.cc
@@ -24,9 +24,9 @@
******************************************************************************/
#include "bt_target.h" // Must be first to define build configuration
-
#include "bta/ag/bta_ag_int.h"
#include "bta/include/bta_ag_api.h"
+#include "device/include/esco_parameters.h"
#include "osi/include/allocator.h"
#include "osi/include/compat.h"
#include "stack/include/bt_types.h"
diff --git a/system/btif/include/btif_hh.h b/system/btif/include/btif_hh.h
index 1d4bc93..2f0aa40 100644
--- a/system/btif/include/btif_hh.h
+++ b/system/btif/include/btif_hh.h
@@ -23,8 +23,10 @@
#include <hardware/bt_hh.h>
#include <pthread.h>
#include <stdint.h>
+
#include "bta/include/bta_hh_api.h"
#include "btu.h"
+#include "osi/include/alarm.h"
#include "osi/include/fixed_queue.h"
/*******************************************************************************
diff --git a/system/btif/src/btif_rc.cc b/system/btif/src/btif_rc.cc
index 5709285..273bafd 100644
--- a/system/btif/src/btif_rc.cc
+++ b/system/btif/src/btif_rc.cc
@@ -24,8 +24,12 @@
#define LOG_TAG "bt_btif_avrc"
+#include "btif_rc.h"
+
#include <errno.h>
#include <fcntl.h>
+#include <hardware/bluetooth.h>
+#include <hardware/bt_rc.h>
#include <pthread.h>
#include <string.h>
#include <time.h>
@@ -33,18 +37,15 @@
#include <mutex>
-#include <hardware/bluetooth.h>
-#include <hardware/bt_rc.h>
-
#include "avrc_defs.h"
#include "bta_api.h"
#include "bta_av_api.h"
#include "btif_av.h"
#include "btif_common.h"
-#include "btif_rc.h"
#include "btif_util.h"
#include "btu.h"
#include "device/include/interop.h"
+#include "osi/include/alarm.h"
#include "osi/include/allocator.h"
#include "osi/include/list.h"
#include "osi/include/log.h"
diff --git a/system/btif/src/btif_storage.cc b/system/btif/src/btif_storage.cc
index a375962..8f07ec3 100644
--- a/system/btif/src/btif_storage.cc
+++ b/system/btif/src/btif_storage.cc
@@ -55,6 +55,7 @@
#include "osi/include/config.h"
#include "osi/include/log.h"
#include "osi/include/osi.h"
+#include "stack/include/btu.h"
using base::Bind;
using bluetooth::Uuid;
diff --git a/system/btif/test/btif_rc_test.cc b/system/btif/test/btif_rc_test.cc
index c90b424..25b63a4 100644
--- a/system/btif/test/btif_rc_test.cc
+++ b/system/btif/test/btif_rc_test.cc
@@ -17,10 +17,12 @@
#include <base/logging.h>
#include <gtest/gtest.h>
#include <stdio.h>
+
#include <cstdint>
#include "bta/include/bta_av_api.h"
#include "btif/include/btif_common.h"
+#include "common/message_loop_thread.h"
#include "device/include/interop.h"
#include "include/hardware/bt_rc.h"
#include "osi/test/AllocationTestHarness.h"
diff --git a/system/device/src/controller.cc b/system/device/src/controller.cc
index b741686..a1fc2f1 100644
--- a/system/device/src/controller.cc
+++ b/system/device/src/controller.cc
@@ -26,6 +26,8 @@
#include "btcore/include/module.h"
#include "btcore/include/version.h"
#include "check.h"
+#include "hci/include/hci_packet_factory.h"
+#include "hci/include/hci_packet_parser.h"
#include "main/shim/controller.h"
#include "main/shim/hci_layer.h"
#include "main/shim/shim.h"
diff --git a/system/main/shim/btm_api.h b/system/main/shim/btm_api.h
index 8e54e04..47d0ce4 100644
--- a/system/main/shim/btm_api.h
+++ b/system/main/shim/btm_api.h
@@ -16,6 +16,7 @@
#pragma once
+#include "device/include/esco_parameters.h"
#include "stack/btm/btm_sec.h"
#include "stack/btm/neighbor_inquiry.h"
#include "stack/include/acl_api_types.h"
diff --git a/system/stack/bnep/bnep_int.h b/system/stack/bnep/bnep_int.h
index f9dc7a4..854198a 100644
--- a/system/stack/bnep/bnep_int.h
+++ b/system/stack/bnep/bnep_int.h
@@ -28,6 +28,7 @@
#include "bnep_api.h"
#include "bt_target.h"
#include "btu.h"
+#include "osi/include/alarm.h"
#include "osi/include/fixed_queue.h"
/* BNEP frame types
diff --git a/system/stack/btm/btm_ble_addr.cc b/system/stack/btm/btm_ble_addr.cc
index faa9727..9b52199 100644
--- a/system/stack/btm/btm_ble_addr.cc
+++ b/system/stack/btm/btm_ble_addr.cc
@@ -25,15 +25,17 @@
#include <base/bind.h>
#include <string.h>
+#include "btm_ble_int.h"
#include "btu.h"
#include "device/include/controller.h"
#include "gap_api.h"
-
-#include "btm_ble_int.h"
#include "main/shim/shim.h"
+#include "osi/include/osi.h" // UNUSED_ATTR
#include "stack/btm/btm_dev.h"
#include "stack/crypto_toolbox/crypto_toolbox.h"
#include "stack/include/acl_api.h"
+#include "stack/include/bt_octets.h"
+#include "types/raw_address.h"
extern tBTM_CB btm_cb;
diff --git a/system/stack/btm/btm_devctl.cc b/system/stack/btm/btm_devctl.cc
index 41f6741..72b414e 100644
--- a/system/stack/btm/btm_devctl.cc
+++ b/system/stack/btm/btm_devctl.cc
@@ -37,6 +37,7 @@
#include "common/message_loop_thread.h"
#include "device/include/controller.h"
#include "hci/include/hci_layer.h"
+#include "hci/include/hci_packet_factory.h"
#include "main/shim/btm_api.h"
#include "main/shim/controller.h"
#include "main/shim/hci_layer.h"
diff --git a/system/stack/btm/btm_iso_impl.h b/system/stack/btm/btm_iso_impl.h
index c93ea1f..4a80676 100644
--- a/system/stack/btm/btm_iso_impl.h
+++ b/system/stack/btm/btm_iso_impl.h
@@ -28,6 +28,8 @@
#include "btu.h"
#include "common/time_util.h"
#include "device/include/controller.h"
+#include "hci/include/hci_layer.h"
+#include "osi/include/allocator.h"
#include "osi/include/log.h"
#include "stack/include/hci_error_code.h"
#include "stack/include/hcidefs.h"
diff --git a/system/stack/gatt/gatt_int.h b/system/stack/gatt/gatt_int.h
index 893f747..1a8ace4 100644
--- a/system/stack/gatt/gatt_int.h
+++ b/system/stack/gatt/gatt_int.h
@@ -19,20 +19,21 @@
#ifndef GATT_INT_H
#define GATT_INT_H
-#include "bt_target.h"
+#include <base/bind.h>
+#include <base/strings/stringprintf.h>
+#include <string.h>
+#include <list>
+#include <queue>
+#include <unordered_set>
+#include <vector>
+
+#include "bt_target.h"
#include "btm_ble_api.h"
#include "btu.h"
#include "gatt_api.h"
#include "osi/include/fixed_queue.h"
-#include <base/bind.h>
-#include <base/strings/stringprintf.h>
-#include <string.h>
-#include <list>
-#include <unordered_set>
-#include <vector>
-
#define GATT_CREATE_CONN_ID(tcb_idx, gatt_if) \
((uint16_t)((((uint8_t)(tcb_idx)) << 8) | ((uint8_t)(gatt_if))))
#define GATT_GET_TCB_IDX(conn_id) ((uint8_t)(((uint16_t)(conn_id)) >> 8))
diff --git a/system/stack/include/btm_api.h b/system/stack/include/btm_api.h
index 6065428..867efba 100644
--- a/system/stack/include/btm_api.h
+++ b/system/stack/include/btm_api.h
@@ -26,6 +26,7 @@
#include <cstdint>
+#include "device/include/esco_parameters.h"
#include "stack/btm/neighbor_inquiry.h"
#include "stack/include/btm_api_types.h"
#include "stack/include/btm_status.h"
diff --git a/system/stack/include/btm_client_interface.h b/system/stack/include/btm_client_interface.h
index 3822537..9afacaf 100644
--- a/system/stack/include/btm_client_interface.h
+++ b/system/stack/include/btm_client_interface.h
@@ -17,6 +17,8 @@
#pragma once
#include <cstdint>
+
+#include "device/include/esco_parameters.h"
#include "stack/btm/neighbor_inquiry.h"
#include "stack/include/acl_client_callbacks.h"
#include "stack/include/btm_api_types.h"
diff --git a/system/stack/smp/smp_keys.cc b/system/stack/smp/smp_keys.cc
index c9649f2..f15063d 100644
--- a/system/stack/smp/smp_keys.cc
+++ b/system/stack/smp/smp_keys.cc
@@ -21,10 +21,13 @@
* This file contains security manager protocol utility functions
*
******************************************************************************/
-#include "bt_target.h"
-
#include <base/bind.h>
-#include <string.h>
+#include <base/callback.h>
+
+#include <algorithm>
+#include <cstring>
+
+#include "bt_target.h"
#include "bt_utils.h"
#include "btm_ble_api.h"
#include "btm_ble_int.h"
@@ -37,8 +40,6 @@
#include "stack/crypto_toolbox/crypto_toolbox.h"
#include "stack/include/acl_api.h"
-#include <algorithm>
-
extern tBTM_CB btm_cb; // TODO Remove
using base::Bind;
diff --git a/system/stack/test/btm_iso_test.cc b/system/stack/test/btm_iso_test.cc
index 20feaeb..79ffb69 100644
--- a/system/stack/test/btm_iso_test.cc
+++ b/system/stack/test/btm_iso_test.cc
@@ -20,6 +20,7 @@
#include "btm_iso_api.h"
#include "device/include/controller.h"
+#include "hci/include/hci_layer.h"
#include "main/shim/shim.h"
#include "mock_controller.h"
#include "mock_hcic_layer.h"
diff --git a/system/stack/test/gatt/mock_gatt_utils_ref.cc b/system/stack/test/gatt/mock_gatt_utils_ref.cc
index 661a828..b5e41af 100644
--- a/system/stack/test/gatt/mock_gatt_utils_ref.cc
+++ b/system/stack/test/gatt/mock_gatt_utils_ref.cc
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#include "common/message_loop_thread.h"
#include "stack/gatt/gatt_int.h"
#include "utils/include/bt_utils.h"
diff --git a/system/stack/test/stack_smp_test.cc b/system/stack/test/stack_smp_test.cc
index 2268252..db00c15 100644
--- a/system/stack/test/stack_smp_test.cc
+++ b/system/stack/test/stack_smp_test.cc
@@ -15,13 +15,14 @@
* limitations under the License.
*
******************************************************************************/
-#include <stdarg.h>
-#include <string>
-
#include <gmock/gmock.h>
#include <gtest/gtest.h>
+#include <stdarg.h>
+
+#include <string>
#include "bt_trace.h"
+#include "hci/include/packet_fragmenter.h"
#include "internal_include/stack_config.h"
#include "stack/btm/btm_int_types.h"
#include "stack/include/acl_api.h"
diff --git a/system/test/mock/mock_bta_gattc_api.cc b/system/test/mock/mock_bta_gattc_api.cc
index 767e605..fbe6868 100644
--- a/system/test/mock/mock_bta_gattc_api.cc
+++ b/system/test/mock/mock_bta_gattc_api.cc
@@ -19,6 +19,8 @@
* Functions generated:30
*/
+#include <base/callback.h>
+
#include <map>
#include <string>
diff --git a/system/test/mock/mock_bta_gatts_api.cc b/system/test/mock/mock_bta_gatts_api.cc
index 1032913..e801f0b 100644
--- a/system/test/mock/mock_bta_gatts_api.cc
+++ b/system/test/mock/mock_bta_gatts_api.cc
@@ -25,10 +25,13 @@
extern std::map<std::string, int> mock_function_count_map;
#include <base/bind.h>
+#include <base/callback.h>
#include <base/location.h>
+
#include <cstdint>
#include <memory>
#include <vector>
+
#include "bt_target.h"
#include "bta/gatt/bta_gatts_int.h"
#include "osi/include/allocator.h"
diff --git a/system/test/mock/mock_device_controller.h b/system/test/mock/mock_device_controller.h
index 2acccde..df567f5 100644
--- a/system/test/mock/mock_device_controller.h
+++ b/system/test/mock/mock_device_controller.h
@@ -33,6 +33,8 @@
// for this effort. This compilation unit may compile as-is, or
// may need attention to prune the inclusion set.
#include <base/logging.h>
+
+#include "btcore/include/device_features.h"
#include "btcore/include/event_mask.h"
#include "btcore/include/module.h"
#include "btcore/include/version.h"
diff --git a/system/test/mock/mock_hcic_hciblecmds.cc b/system/test/mock/mock_hcic_hciblecmds.cc
index bb62a58..19419ad 100644
--- a/system/test/mock/mock_hcic_hciblecmds.cc
+++ b/system/test/mock/mock_hcic_hciblecmds.cc
@@ -25,8 +25,10 @@
#define UNUSED_ATTR
#include <base/bind.h>
+#include <base/callback.h>
#include <stddef.h>
#include <string.h>
+
#include "bt_target.h"
#include "btu.h"
#include "hcimsgs.h"
diff --git a/system/test/mock/mock_hcic_hcicmds.cc b/system/test/mock/mock_hcic_hcicmds.cc
index af9107f..28fef71 100644
--- a/system/test/mock/mock_hcic_hcicmds.cc
+++ b/system/test/mock/mock_hcic_hcicmds.cc
@@ -25,13 +25,14 @@
extern std::map<std::string, int> mock_function_count_map;
#define UNUSED_ATTR
+#include <base/callback.h>
#include <stddef.h>
-#include "types/raw_address.h"
#include "bt_target.h"
#include "btu.h"
#include "hcimsgs.h"
#include "stack/include/acl_hci_link_interface.h"
+#include "types/raw_address.h"
namespace test {
namespace mock {
diff --git a/system/test/mock/mock_stack_btm_ble_batchscan.cc b/system/test/mock/mock_stack_btm_ble_batchscan.cc
index b1c4fd2..4e88e1d 100644
--- a/system/test/mock/mock_stack_btm_ble_batchscan.cc
+++ b/system/test/mock/mock_stack_btm_ble_batchscan.cc
@@ -25,10 +25,12 @@
extern std::map<std::string, int> mock_function_count_map;
#include <base/bind.h>
-#include <stddef.h>
-#include <stdio.h>
+#include <base/callback.h>
#include <string.h>
+
+#include <cstddef>
#include <vector>
+
#include "bt_target.h"
#include "btm_ble_api.h"
#include "btu.h"
diff --git a/system/test/mock/mock_stack_btm_sco.cc b/system/test/mock/mock_stack_btm_sco.cc
index c326170..42616ee 100644
--- a/system/test/mock/mock_stack_btm_sco.cc
+++ b/system/test/mock/mock_stack_btm_sco.cc
@@ -25,6 +25,7 @@
extern std::map<std::string, int> mock_function_count_map;
+#include "device/include/esco_parameters.h"
#include "stack/include/btm_api_types.h"
#include "stack/include/btm_status.h"
#include "stack/include/hci_error_code.h"
diff --git a/system/test/mock/mock_stack_btu_hcif.cc b/system/test/mock/mock_stack_btu_hcif.cc
index d1ee7e5..60528ed 100644
--- a/system/test/mock/mock_stack_btu_hcif.cc
+++ b/system/test/mock/mock_stack_btu_hcif.cc
@@ -26,8 +26,11 @@
#define LOG_TAG "bt_btu_hcif"
#include <base/bind.h>
+#include <base/callback.h>
#include <base/location.h>
+
#include <cstdint>
+
#include "btif/include/btif_config.h"
#include "common/metrics.h"
#include "device/include/controller.h"
diff --git a/system/test/mock/mock_stack_gatt_attr.cc b/system/test/mock/mock_stack_gatt_attr.cc
index 8198b1c..051ede2 100644
--- a/system/test/mock/mock_stack_gatt_attr.cc
+++ b/system/test/mock/mock_stack_gatt_attr.cc
@@ -19,6 +19,8 @@
* Functions generated:14
*/
+#include <base/callback.h>
+
#include <cstdint>
#include <map>
#include <string>
