Use fully qualified path for OSI includes.
diff --git a/btif/src/bluetooth.c b/btif/src/bluetooth.c
index e9c29b3..c6f550c 100644
--- a/btif/src/bluetooth.c
+++ b/btif/src/bluetooth.c
@@ -46,7 +46,7 @@
#include "btif_api.h"
#include "btsnoop.h"
#include "bt_utils.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/allocation_tracker.h"
#include "osi/include/log.h"
#include "stack_manager.h"
diff --git a/btif/src/btif_config.c b/btif/src/btif_config.c
index 71a7c07..7e8e58a 100644
--- a/btif/src/btif_config.c
+++ b/btif/src/btif_config.c
@@ -24,14 +24,14 @@
#include <stdio.h>
#include <string.h>
-#include "alarm.h"
+#include "osi/include/alarm.h"
#include "bdaddr.h"
#include "btif_config.h"
#include "btif_config_transcode.h"
#include "btif_util.h"
-#include "config.h"
+#include "osi/include/config.h"
#include "module.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
#include "bt_types.h"
diff --git a/btif/src/btif_core.c b/btif/src/btif_core.c
index 16db868..6bfed41 100644
--- a/btif/src/btif_core.c
+++ b/btif/src/btif_core.c
@@ -53,13 +53,13 @@
#include "btif_util.h"
#include "btu.h"
#include "device/include/controller.h"
-#include "fixed_queue.h"
-#include "future.h"
+#include "osi/include/fixed_queue.h"
+#include "osi/include/future.h"
#include "gki.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
#include "stack_manager.h"
-#include "thread.h"
+#include "osi/include/thread.h"
/************************************************************************************
** Constants & Macros
diff --git a/btif/src/btif_hl.c b/btif/src/btif_hl.c
index 2420fe8..1d7394d 100644
--- a/btif/src/btif_hl.c
+++ b/btif/src/btif_hl.c
@@ -68,7 +68,7 @@
#include "btif_util.h"
#include "btu.h"
#include "gki.h"
-#include "list.h"
+#include "osi/include/list.h"
#include "mca_api.h"
#include "osi/include/log.h"
diff --git a/btif/src/btif_media_task.c b/btif/src/btif_media_task.c
index 30ef3a4..2ff7664 100644
--- a/btif/src/btif_media_task.c
+++ b/btif/src/btif_media_task.c
@@ -41,7 +41,7 @@
#include <errno.h>
#include "bt_target.h"
-#include "fixed_queue.h"
+#include "osi/include/fixed_queue.h"
#include "gki.h"
#include "bta_api.h"
#include "btu.h"
diff --git a/btif/src/btif_pan.c b/btif/src/btif_pan.c
index d842d8a..678679b 100644
--- a/btif/src/btif_pan.c
+++ b/btif/src/btif_pan.c
@@ -59,7 +59,7 @@
#include "btif_sock_util.h"
#include "btif_pan_internal.h"
#include "gki.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
#define FORWARD_IGNORE 1
diff --git a/btif/src/btif_profile_queue.c b/btif/src/btif_profile_queue.c
index f2e428d..0d3e49e 100644
--- a/btif/src/btif_profile_queue.c
+++ b/btif/src/btif_profile_queue.c
@@ -31,7 +31,7 @@
#include "btif_common.h"
#include "btif_profile_queue.h"
#include "gki.h"
-#include "list.h"
+#include "osi/include/list.h"
#include "osi/include/allocator.h"
#include "stack_manager.h"
diff --git a/btif/src/btif_sm.c b/btif/src/btif_sm.c
index 03159fe..f8b4fea 100644
--- a/btif/src/btif_sm.c
+++ b/btif/src/btif_sm.c
@@ -29,7 +29,7 @@
#include <hardware/bluetooth.h>
-#include "allocator.h"
+#include "osi/include/allocator.h"
#include "btif_common.h"
#include "btif_sm.h"
#include "gki.h"
diff --git a/btif/src/btif_sock.c b/btif/src/btif_sock.c
index 3ab95c9..0721324 100644
--- a/btif/src/btif_sock.c
+++ b/btif/src/btif_sock.c
@@ -28,9 +28,9 @@
#include "btif_sock_sco.h"
#include "btif_sock_thread.h"
#include "btif_util.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
-#include "thread.h"
+#include "osi/include/thread.h"
static bt_status_t btsock_listen(btsock_type_t type, const char *service_name, const uint8_t *uuid, int channel, int *sock_fd, int flags);
static bt_status_t btsock_connect(const bt_bdaddr_t *bd_addr, btsock_type_t type, const uint8_t *uuid, int channel, int *sock_fd, int flags);
diff --git a/btif/src/btif_sock_rfc.c b/btif/src/btif_sock_rfc.c
index 5b2b775..50ed08d 100644
--- a/btif/src/btif_sock_rfc.c
+++ b/btif/src/btif_sock_rfc.c
@@ -40,8 +40,8 @@
#include "btu.h"
#include "gki.h"
#include "hcimsgs.h"
-#include "list.h"
-#include "osi.h"
+#include "osi/include/list.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
#include "port_api.h"
#include "sdp_api.h"
diff --git a/btif/src/btif_sock_sco.c b/btif/src/btif_sock_sco.c
index 9608e11..26d37dc 100644
--- a/btif/src/btif_sock_sco.c
+++ b/btif/src/btif_sock_sco.c
@@ -25,11 +25,11 @@
#include <sys/types.h>
#include "btif_common.h"
-#include "list.h"
-#include "osi.h"
+#include "osi/include/list.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
-#include "socket.h"
-#include "thread.h"
+#include "osi/include/socket.h"
+#include "osi/include/thread.h"
// This module provides a socket abstraction for SCO connections to a higher
// layer. It returns file descriptors representing two types of sockets:
diff --git a/btif/src/btif_storage.c b/btif/src/btif_storage.c
index 9a3bb55..47ef1d7 100644
--- a/btif/src/btif_storage.c
+++ b/btif/src/btif_storage.c
@@ -42,9 +42,9 @@
#include "btif_storage.h"
#include "btif_util.h"
#include "bdaddr.h"
-#include "config.h"
+#include "osi/include/config.h"
#include "gki.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "bta_hh_api.h"
#include "btif_hh.h"
#include "osi/include/log.h"
diff --git a/btif/src/stack_manager.c b/btif/src/stack_manager.c
index 13a3d42..836f1a4 100644
--- a/btif/src/stack_manager.c
+++ b/btif/src/stack_manager.c
@@ -24,11 +24,11 @@
#include "btif_common.h"
#include "device/include/controller.h"
#include "module.h"
-#include "osi.h"
+#include "osi/include/osi.h"
#include "osi/include/log.h"
-#include "semaphore.h"
+#include "osi/include/semaphore.h"
#include "stack_manager.h"
-#include "thread.h"
+#include "osi/include/thread.h"
// Temp includes
#include "btif_config.h"