Use fully qualified path for btcore includes.

28 files changed, 34 insertions, 34 deletions

diff --git a/btcore/src/bdaddr.c b/btcore/src/bdaddr.c
index f0f85ddf1..ddbd9d3b3 100644
--- a/btcore/src/bdaddr.c
+++ b/btcore/src/bdaddr.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "bdaddr.h"
+#include "btcore/include/bdaddr.h"
 
 bool bdaddr_is_empty(const bt_bdaddr_t *addr) {
   assert(addr != NULL);
diff --git a/btcore/src/counter.c b/btcore/src/counter.c
index 70c734626..0570ec349 100644
--- a/btcore/src/counter.c
+++ b/btcore/src/counter.c
@@ -26,10 +26,10 @@
 
 #include "osi/include/allocator.h"
 #include "osi/include/atomic.h"
-#include "counter.h"
+#include "btcore/include/counter.h"
 #include "osi/include/hash_map.h"
 #include "osi/include/list.h"
-#include "module.h"
+#include "btcore/include/module.h"
 #include "osi/include/osi.h"
 #include "osi/include/hash_functions.h"
 #include "osi/include/log.h"
diff --git a/btcore/src/module.c b/btcore/src/module.c
index 87a8c3d07..b4b4e78eb 100644
--- a/btcore/src/module.c
+++ b/btcore/src/module.c
@@ -24,7 +24,7 @@
 
 #include "osi/include/allocator.h"
 #include "osi/include/hash_map.h"
-#include "module.h"
+#include "btcore/include/module.h"
 #include "osi/include/osi.h"
 #include "osi/include/hash_functions.h"
 #include "osi/include/log.h"
diff --git a/btif/src/btif_config.c b/btif/src/btif_config.c
index 7e8e58a80..3c5e1c43f 100644
--- a/btif/src/btif_config.c
+++ b/btif/src/btif_config.c
@@ -25,12 +25,12 @@
 #include <string.h>
 
 #include "osi/include/alarm.h"
-#include "bdaddr.h"
+#include "btcore/include/bdaddr.h"
 #include "btif_config.h"
 #include "btif_config_transcode.h"
 #include "btif_util.h"
 #include "osi/include/config.h"
-#include "module.h"
+#include "btcore/include/module.h"
 #include "osi/include/osi.h"
 #include "osi/include/log.h"
 
diff --git a/btif/src/btif_core.c b/btif/src/btif_core.c
index 6bfed41cf..4894000c6 100644
--- a/btif/src/btif_core.c
+++ b/btif/src/btif_core.c
@@ -37,7 +37,7 @@
 #include <sys/types.h>
 
 #define LOG_TAG "BTIF_CORE"
-#include "bdaddr.h"
+#include "btcore/include/bdaddr.h"
 #include "bt_utils.h"
 #include "bta_api.h"
 #include "bte.h"
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c
index de17efbf9..3dd7d3ec9 100644
--- a/btif/src/btif_dm.c
+++ b/btif/src/btif_dm.c
@@ -36,7 +36,7 @@
 #include <cutils/properties.h>
 #include "gki.h"
 #include "btu.h"
-#include "bdaddr.h"
+#include "btcore/include/bdaddr.h"
 #include "bta_api.h"
 #include "btif_api.h"
 #include "btif_util.h"
diff --git a/btif/src/btif_gatt_client.c b/btif/src/btif_gatt_client.c
index 7eecaf6ce..bfffcd471 100644
--- a/btif/src/btif_gatt_client.c
+++ b/btif/src/btif_gatt_client.c
@@ -33,7 +33,7 @@
 
 #define LOG_TAG "BtGatt.btif"
 
-#include "bdaddr.h"
+#include "btcore/include/bdaddr.h"
 #include "btif_common.h"
 #include "btif_util.h"
 
diff --git a/btif/src/btif_gatt_util.c b/btif/src/btif_gatt_util.c
index ca079e9c7..df0600b97 100644
--- a/btif/src/btif_gatt_util.c
+++ b/btif/src/btif_gatt_util.c
@@ -25,7 +25,7 @@
 
 #define LOG_TAG "BtGatt.btif"
 
-#include "bdaddr.h"
+#include "btcore/include/bdaddr.h"
 #include "bta_api.h"
 #include "bta_gatt_api.h"
 #include "bta_jv_api.h"
diff --git a/btif/src/btif_hf.c b/btif/src/btif_hf.c
index b0fe81711..02006cd08 100644
--- a/btif/src/btif_hf.c
+++ b/btif/src/btif_hf.c
@@ -34,7 +34,7 @@
 #include "btif_util.h"
 #include "btif_profile_queue.h"
 
-#include "bdaddr.h"
+#include "btcore/include/bdaddr.h"
 #include "bta_ag_api.h"
 
 /************************************************************************************
diff --git a/btif/src/btif_hf_client.c b/btif/src/btif_hf_client.c
index 8a7a97ac3..196578b7e 100644
--- a/btif/src/btif_hf_client.c
+++ b/btif/src/btif_hf_client.c
@@ -36,7 +36,7 @@
 #include "btif_util.h"
 #include "btif_profile_queue.h"
 #include "bt_utils.h"
-#include "bdaddr.h"
+#include "btcore/include/bdaddr.h"
 #include "bta_hf_client_api.h"
 
 /************************************************************************************
diff --git a/btif/src/btif_mce.c b/btif/src/btif_mce.c
index 3a2bee7ba..9961e2d8b 100644
--- a/btif/src/btif_mce.c
+++ b/btif/src/btif_mce.c
@@ -38,7 +38,7 @@
 #include "bta_mce_api.h"
 
 #include "bt_types.h"
-#include "bdaddr.h"
+#include "btcore/include/bdaddr.h"
 
 /*****************************************************************************
 **  Static variables
diff --git a/btif/src/btif_pan.c b/btif/src/btif_pan.c
index 678679bcc..c412f2baa 100644
--- a/btif/src/btif_pan.c
+++ b/btif/src/btif_pan.c
@@ -50,7 +50,7 @@
 #include "btif_common.h"
 #include "btif_util.h"
 #include "btm_api.h"
-#include "bdaddr.h"
+#include "btcore/include/bdaddr.h"
 #include "device/include/controller.h"
 
 #include "bta_api.h"
diff --git a/btif/src/btif_storage.c b/btif/src/btif_storage.c
index 47ef1d7f5..69018e198 100644
--- a/btif/src/btif_storage.c
+++ b/btif/src/btif_storage.c
@@ -41,7 +41,7 @@
 #include "btif_api.h"
 #include "btif_storage.h"
 #include "btif_util.h"
-#include "bdaddr.h"
+#include "btcore/include/bdaddr.h"
 #include "osi/include/config.h"
 #include "gki.h"
 #include "osi/include/osi.h"
diff --git a/btif/src/stack_manager.c b/btif/src/stack_manager.c
index 836f1a432..ff71b08bf 100644
--- a/btif/src/stack_manager.c
+++ b/btif/src/stack_manager.c
@@ -23,7 +23,7 @@
 #include "btif_api.h"
 #include "btif_common.h"
 #include "device/include/controller.h"
-#include "module.h"
+#include "btcore/include/module.h"
 #include "osi/include/osi.h"
 #include "osi/include/log.h"
 #include "osi/include/semaphore.h"
diff --git a/device/src/controller.c b/device/src/controller.c
index 23d86c3f2..c1eadc08e 100644
--- a/device/src/controller.c
+++ b/device/src/controller.c
@@ -21,18 +21,18 @@
 #include <assert.h>
 #include <stdbool.h>
 
-#include "bdaddr.h"
+#include "btcore/include/bdaddr.h"
 #include "bt_types.h"
 #include "device/include/controller.h"
-#include "event_mask.h"
+#include "btcore/include/event_mask.h"
 #include "osi/include/future.h"
 #include "hcimsgs.h"
 #include "hci/include/hci_layer.h"
 #include "hci/include/hci_packet_factory.h"
 #include "hci/include/hci_packet_parser.h"
-#include "module.h"
+#include "btcore/include/module.h"
 #include "stack/include/btm_ble_api.h"
-#include "version.h"
+#include "btcore/include/version.h"
 
 const bt_event_mask_t BLE_EVENT_MASK = { "\x00\x00\x00\x00\x00\x00\x00\x3f" };
 #if (BLE_INCLUDED)
diff --git a/hci/src/hci_layer.c b/hci/src/hci_layer.c
index 87f47f25c..cedfddee6 100644
--- a/hci/src/hci_layer.c
+++ b/hci/src/hci_layer.c
@@ -33,7 +33,7 @@
 #include "hci_layer.h"
 #include "osi/include/list.h"
 #include "low_power_manager.h"
-#include "module.h"
+#include "btcore/include/module.h"
 #include "osi/include/non_repeating_timer.h"
 #include "osi/include/osi.h"
 #include "osi/include/log.h"
diff --git a/main/bte_main.c b/main/bte_main.c
index 2f15baaf3..9343bad5c 100755
--- a/main/bte_main.c
+++ b/main/bte_main.c
@@ -43,14 +43,14 @@
 #include "btu.h"
 #include "btsnoop.h"
 #include "bt_utils.h"
-#include "counter.h"
+#include "btcore/include/counter.h"
 #include "osi/include/fixed_queue.h"
 #include "osi/include/future.h"
 #include "gki.h"
 #include "osi/include/hash_functions.h"
 #include "osi/include/hash_map.h"
 #include "hci_layer.h"
-#include "module.h"
+#include "btcore/include/module.h"
 #include "osi/include/osi.h"
 #include "osi/include/log.h"
 #include "stack_config.h"
diff --git a/stack/btm/btm_devctl.c b/stack/btm/btm_devctl.c
index 8a24db9fd..03ed726f2 100644
--- a/stack/btm/btm_devctl.c
+++ b/stack/btm/btm_devctl.c
@@ -37,7 +37,7 @@
 #include "hci_layer.h"
 #include "hcimsgs.h"
 #include "l2c_int.h"
-#include "module.h"
+#include "btcore/include/module.h"
 #include "osi/include/thread.h"
 
 #if BLE_INCLUDED == TRUE
diff --git a/stack/btu/btu_task.c b/stack/btu/btu_task.c
index 458faa09f..e1e6db1c7 100644
--- a/stack/btu/btu_task.c
+++ b/stack/btu/btu_task.c
@@ -38,7 +38,7 @@
 #include "osi/include/hash_map.h"
 #include "hcimsgs.h"
 #include "l2c_int.h"
-#include "module.h"
+#include "btcore/include/module.h"
 #include "osi/include/osi.h"
 #include "osi/include/log.h"
 #include "sdpint.h"
diff --git a/stack/hcic/hcicmds.c b/stack/hcic/hcicmds.c
index e9a252f8c..13d755895 100644
--- a/stack/hcic/hcicmds.c
+++ b/stack/hcic/hcicmds.c
@@ -24,7 +24,7 @@
  ******************************************************************************/
 
 #include "bt_target.h"
-#include "counter.h"
+#include "btcore/include/counter.h"
 #include "gki.h"
 #include "hcidefs.h"
 #include "hcimsgs.h"
diff --git a/stack/l2cap/l2c_api.c b/stack/l2cap/l2c_api.c
index 041e1fb3b..f717b1e42 100644
--- a/stack/l2cap/l2c_api.c
+++ b/stack/l2cap/l2c_api.c
@@ -31,7 +31,7 @@
 
 #include "gki.h"
 #include "bt_types.h"
-#include "counter.h"
+#include "btcore/include/counter.h"
 #include "hcidefs.h"
 #include "hcimsgs.h"
 #include "l2cdefs.h"
diff --git a/stack/l2cap/l2c_link.c b/stack/l2cap/l2c_link.c
index 3bc064399..98d6803d9 100644
--- a/stack/l2cap/l2c_link.c
+++ b/stack/l2cap/l2c_link.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 
 #include "device/include/controller.h"
-#include "counter.h"
+#include "btcore/include/counter.h"
 #include "gki.h"
 #include "bt_types.h"
 #include "bt_utils.h"
diff --git a/stack/l2cap/l2c_main.c b/stack/l2cap/l2c_main.c
index daef35e1b..02f12a78b 100755
--- a/stack/l2cap/l2c_main.c
+++ b/stack/l2cap/l2c_main.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 #include "device/include/controller.h"
-#include "counter.h"
+#include "btcore/include/counter.h"
 #include "bt_target.h"
 #include "btm_int.h"
 #include "btu.h"
diff --git a/stack/l2cap/l2c_utils.c b/stack/l2cap/l2c_utils.c
index d358418ff..cc1190391 100644
--- a/stack/l2cap/l2c_utils.c
+++ b/stack/l2cap/l2c_utils.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 #include "device/include/controller.h"
-#include "counter.h"
+#include "btcore/include/counter.h"
 #include "gki.h"
 #include "bt_types.h"
 #include "hcimsgs.h"
diff --git a/stack/rfcomm/port_api.c b/stack/rfcomm/port_api.c
index bfd68bd3d..f1225c0d5 100644
--- a/stack/rfcomm/port_api.c
+++ b/stack/rfcomm/port_api.c
@@ -24,7 +24,7 @@
 
 #include <string.h>
 #include "bt_target.h"
-#include "counter.h"
+#include "btcore/include/counter.h"
 #include "gki.h"
 #include "rfcdefs.h"
 #include "port_api.h"
diff --git a/stack/rfcomm/rfc_l2cap_if.c b/stack/rfcomm/rfc_l2cap_if.c
index 3207a0345..ffcbfe94d 100644
--- a/stack/rfcomm/rfc_l2cap_if.c
+++ b/stack/rfcomm/rfc_l2cap_if.c
@@ -23,7 +23,7 @@
  ******************************************************************************/
 
 #include "bt_target.h"
-#include "counter.h"
+#include "btcore/include/counter.h"
 #include "gki.h"
 
 #include "rfcdefs.h"
diff --git a/stack/rfcomm/rfc_ts_frames.c b/stack/rfcomm/rfc_ts_frames.c
index 5addf4ad8..11fbae8c1 100644
--- a/stack/rfcomm/rfc_ts_frames.c
+++ b/stack/rfcomm/rfc_ts_frames.c
@@ -22,7 +22,7 @@
  *
  ******************************************************************************/
 #include "bt_target.h"
-#include "counter.h"
+#include "btcore/include/counter.h"
 #include "gki.h"
 #include "rfcdefs.h"
 #include "port_api.h"
diff --git a/utils/src/bt_utils.c b/utils/src/bt_utils.c
index d0ee1720c..3d5f0cf3e 100644
--- a/utils/src/bt_utils.c
+++ b/utils/src/bt_utils.c
@@ -39,7 +39,7 @@
 
 #include "bt_types.h"
 #include "bt_utils.h"
-#include "module.h"
+#include "btcore/include/module.h"
 #include "osi/include/log.h"
 
 /*******************************************************************************