From e11b6bb7246adc15deed1fb186b7d889d6fce56f Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Sat, 22 Aug 2020 12:33:58 -0700
Subject: [PATCH] Re-include stack/btm/btm_dev.h

Towards proper interfaces

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I2228f2ab4d938ef3c94db34bfa2d508654a33826
---
 stack/btm/btm_dev.h     | 21 +++++----------------
 stack/gatt/gatt_main.cc |  1 +
 stack/hid/hidh_api.cc   |  1 +
 stack/l2cap/l2c_ble.cc  |  1 +
 stack/l2cap/l2c_link.cc |  3 +++
 stack/smp/smp_keys.cc   |  1 +
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/stack/btm/btm_dev.h b/stack/btm/btm_dev.h
index 2e7a24fb0..01ac9419a 100644
--- a/stack/btm/btm_dev.h
+++ b/stack/btm/btm_dev.h
@@ -14,23 +14,12 @@
  * limitations under the License.
  */
 
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "bt_common.h"
-#include "bt_types.h"
-#include "btm_api.h"
-#include "btm_int.h"
-#include "btu.h"
-#include "device/include/controller.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
-#include "l2c_api.h"
-#include "main/shim/btm_api.h"
-#include "main/shim/shim.h"
+#include "gd/os/log.h"
+#include "stack/btm/btm_ble_int.h"
+#include "stack/btm/security_device_record.h"
 #include "stack/include/acl_api.h"
+#include "stack/include/hcimsgs.h"
+#include "types/raw_address.h"
 
 /*******************************************************************************
  *
diff --git a/stack/gatt/gatt_main.cc b/stack/gatt/gatt_main.cc
index e69c7978f..a701a22aa 100644
--- a/stack/gatt/gatt_main.cc
+++ b/stack/gatt/gatt_main.cc
@@ -35,6 +35,7 @@
 #include "l2c_api.h"
 #include "osi/include/osi.h"
 #include "stack/btm/btm_dev.h"
+#include "stack/btm/btm_sec.h"
 
 using base::StringPrintf;
 
diff --git a/stack/hid/hidh_api.cc b/stack/hid/hidh_api.cc
index c27781f42..8272470b1 100644
--- a/stack/hid/hidh_api.cc
+++ b/stack/hid/hidh_api.cc
@@ -35,6 +35,7 @@
 #include "hidh_api.h"
 #include "hidh_int.h"
 #include "stack/btm/btm_dev.h"
+#include "stack/btm/btm_sec.h"
 
 using bluetooth::Uuid;
 
diff --git a/stack/l2cap/l2c_ble.cc b/stack/l2cap/l2c_ble.cc
index f465f3240..e3eb2f8f3 100644
--- a/stack/l2cap/l2c_ble.cc
+++ b/stack/l2cap/l2c_ble.cc
@@ -36,6 +36,7 @@
 #include "main/shim/shim.h"
 #include "osi/include/osi.h"
 #include "stack/btm/btm_dev.h"
+#include "stack/btm/btm_sec.h"
 #include "stack/gatt/connection_manager.h"
 #include "stack/include/acl_api.h"
 #include "stack_config.h"
diff --git a/stack/l2cap/l2c_link.cc b/stack/l2cap/l2c_link.cc
index 4bdfe87a8..6e53fa598 100644
--- a/stack/l2cap/l2c_link.cc
+++ b/stack/l2cap/l2c_link.cc
@@ -26,8 +26,11 @@
 
 #include <cstdint>
 
+#include "device/include/controller.h"
 #include "gd/os/log.h"
+#include "osi/include/osi.h"
 #include "stack/btm/btm_dev.h"
+#include "stack/include/bt_types.h"
 #include "stack/l2cap/l2c_int.h"
 #include "types/bt_transport.h"
 #include "types/raw_address.h"
diff --git a/stack/smp/smp_keys.cc b/stack/smp/smp_keys.cc
index 04a63cd83..e35535315 100644
--- a/stack/smp/smp_keys.cc
+++ b/stack/smp/smp_keys.cc
@@ -38,6 +38,7 @@
 #include "p_256_ecc_pp.h"
 #include "smp_int.h"
 #include "stack/btm/btm_dev.h"
+#include "stack/btm/btm_sec.h"
 #include "stack/crypto_toolbox/crypto_toolbox.h"
 #include "stack/include/acl_api.h"
 
-- 
2.11.0