diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index c87b95d16367a31b1986a219e17d750ff9425cee..b434799a1ab17247d7b7d17ece30fb0078498ab7 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -13,7 +13,7 @@ cc_defaults {
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/hci/include",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/stack/btm",
         "packages/modules/Bluetooth/system/udrv/include",
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 9471486d5987729810e16d15277ed0c9fa121a2e..b31dd1b8fef0b1c6c77239aeab397fcc3ad7eb88 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -7,7 +7,7 @@ btifCommonIncludes = [
     "packages/modules/Bluetooth/system/bta/dm",
     "packages/modules/Bluetooth/system/btcore/include",
     "packages/modules/Bluetooth/system/device/include",
-    "packages/modules/Bluetooth/system/include",
+    "packages/modules/Bluetooth/system/internal_include",
     "packages/modules/Bluetooth/system/stack/include",
     "packages/modules/Bluetooth/system/stack/l2cap",
     "packages/modules/Bluetooth/system/stack/a2dp",
diff --git a/system/btif/src/btif_debug.cc b/system/btif/src/btif_debug.cc
index a26c30130b8be789a5c1a34414c645a89c5d4b18..43735316b0f066ff128ff52d424b3a35c338c430 100644
--- a/system/btif/src/btif_debug.cc
+++ b/system/btif/src/btif_debug.cc
@@ -21,7 +21,7 @@
 
 #include "btif/include/btif_debug.h"
 #include "btif/include/btif_debug_btsnoop.h"
-#include "include/bt_target.h"
+#include "internal_include/bt_target.h"
 
 void btif_debug_init(void) {
 #if (BTSNOOP_MEM == TRUE)
diff --git a/system/btif/src/btif_debug_btsnoop.cc b/system/btif/src/btif_debug_btsnoop.cc
index 668240c6d43e56f492c6c6a6e93187834e4817bd..6ea7f3977b79665a92286221c558aefa56c54b80 100644
--- a/system/btif/src/btif_debug_btsnoop.cc
+++ b/system/btif/src/btif_debug_btsnoop.cc
@@ -25,7 +25,7 @@
 #include "btif/include/btif_debug.h"
 #include "btif/include/btif_debug_btsnoop.h"
 #include "hci/include/btsnoop_mem.h"
-#include "include/bt_target.h"
+#include "internal_include/bt_target.h"
 #include "osi/include/ringbuffer.h"
 #include "osi/include/time.h"
 
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index 888f032dda704e81282b3b49ad24ac187596f56a..55a7c111e4f01d172745c8c9753596e6e01f1afa 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -59,7 +59,7 @@
 #include "btu.h"
 #include "device/include/controller.h"
 #include "device/include/interop.h"
-#include "include/stack_config.h"
+#include "internal_include/stack_config.h"
 #include "osi/include/allocator.h"
 #include "osi/include/log.h"
 #include "osi/include/metrics.h"
diff --git a/system/device/Android.bp b/system/device/Android.bp
index a1c90bef59d6c829a187ebdc5df3e6d9a987b2fd..60e9fef306f13c4c87369d98fb87ee080109a580 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -10,7 +10,7 @@ cc_library_static {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/hci/include",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
diff --git a/system/embdrv/sbc/encoder/Android.bp b/system/embdrv/sbc/encoder/Android.bp
index edbebe98eb761e236ea30899d5da3d0a934e3655..2556fcb07d6b98aa18493168372b10619b5f1a72 100644
--- a/system/embdrv/sbc/encoder/Android.bp
+++ b/system/embdrv/sbc/encoder/Android.bp
@@ -17,7 +17,7 @@ cc_library_static {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
     ],
 }
diff --git a/system/hci/Android.bp b/system/hci/Android.bp
index 8d51a9dd92f0d2e9a6f4bfe4c07558ae0b8da43f..9c9e70ce1c0eef1b6eb90b841ce1d539ee789720 100644
--- a/system/hci/Android.bp
+++ b/system/hci/Android.bp
@@ -31,7 +31,7 @@ cc_library_static {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/utils/include",
@@ -51,7 +51,7 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/osi/test",
         "packages/modules/Bluetooth/system/stack/include",
diff --git a/system/include/bt_common.h b/system/internal_include/bt_common.h
similarity index 100%
rename from system/include/bt_common.h
rename to system/internal_include/bt_common.h
diff --git a/system/include/bt_target.h b/system/internal_include/bt_target.h
similarity index 100%
rename from system/include/bt_target.h
rename to system/internal_include/bt_target.h
diff --git a/system/include/bt_trace.h b/system/internal_include/bt_trace.h
similarity index 100%
rename from system/include/bt_trace.h
rename to system/internal_include/bt_trace.h
diff --git a/system/include/bte.h b/system/internal_include/bte.h
similarity index 100%
rename from system/include/bte.h
rename to system/internal_include/bte.h
diff --git a/system/include/bte_appl.h b/system/internal_include/bte_appl.h
similarity index 100%
rename from system/include/bte_appl.h
rename to system/internal_include/bte_appl.h
diff --git a/system/include/stack_config.h b/system/internal_include/stack_config.h
similarity index 100%
rename from system/include/stack_config.h
rename to system/internal_include/stack_config.h
diff --git a/system/main/Android.bp b/system/main/Android.bp
index e9a6279fca66eccf52dccc7200ca9f3c403d7832..994ea034ce7a41cafa1b1fbde7a722c4b2c47e1d 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -19,7 +19,7 @@ cc_library_shared {
         "packages/modules/Bluetooth/system/bta/sys",
         "packages/modules/Bluetooth/system/bta/dm",
         "packages/modules/Bluetooth/system/btcore/include",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/stack/l2cap",
         "packages/modules/Bluetooth/system/stack/a2dp",
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index 16b39fe97a0f46a9f02a00136a59ba101eb54a45..fc18d0c8f5884929f3aae97a5e98949921f2a69c 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -3,7 +3,7 @@ cc_defaults {
     defaults: ["fluoride_defaults"],
     include_dirs: [
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/osi/src/protos",
         "packages/modules/Bluetooth/system/utils/include",
         "packages/modules/Bluetooth/system/stack/include",
diff --git a/system/osi/src/alarm.cc b/system/osi/src/alarm.cc
index e1c87fc400263bca5ba3f482411a8c9df7720771..2c6db3ff1783dcdb54350f9ae35bf42a625179da 100644
--- a/system/osi/src/alarm.cc
+++ b/system/osi/src/alarm.cc
@@ -16,7 +16,7 @@
  *
  ******************************************************************************/
 
-#include "include/bt_target.h"
+#include "internal_include/bt_target.h"
 
 #define LOG_TAG "bt_osi_alarm"
 
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 5b63527dbd7b19704262947eb5ac1a5cf720d8c6..ebd3836e9ed04e69a9d1c35ca8e328863fdfec6a 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -30,7 +30,7 @@ cc_library_static {
         "packages/modules/Bluetooth/system/vnd/ble",
         "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/hci/include",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/udrv/include",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/sys",
@@ -189,7 +189,7 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
     ],
     srcs: ["test/stack_a2dp_test.cc"],
     shared_libs: [
@@ -217,7 +217,7 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/hci/include",
         "packages/modules/Bluetooth/system/utils/include",
@@ -252,10 +252,10 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/hci/include",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/utils/include",
     ],
     srcs: [
@@ -301,7 +301,7 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system/",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/btcore/include",
         "packages/modules/Bluetooth/system/bta/include",
     ],
diff --git a/system/stack/smp/smp_act.cc b/system/stack/smp/smp_act.cc
index 650330338ea545ef5da15787d93e2b42ea43d104..cf77b7cbf6d48c9595ee7422245f902fb25c54b0 100644
--- a/system/stack/smp/smp_act.cc
+++ b/system/stack/smp/smp_act.cc
@@ -19,7 +19,7 @@
 #include <string.h>
 #include "btif_common.h"
 #include "device/include/interop.h"
-#include "include/bt_target.h"
+#include "internal_include/bt_target.h"
 #include "stack/btm/btm_int.h"
 #include "stack/include/l2c_api.h"
 #include "stack/smp/smp_int.h"
diff --git a/system/test/rootcanal/Android.bp b/system/test/rootcanal/Android.bp
index 068d3066ce41168ece263a55f0413c0721c10cdb..b478a25644f99fc66a187a9e0e7c377a92054d02 100644
--- a/system/test/rootcanal/Android.bp
+++ b/system/test/rootcanal/Android.bp
@@ -50,7 +50,7 @@ cc_binary {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/hci/include",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     init_rc: ["android.hardware.bluetooth@1.0-service.sim.rc"],
@@ -90,7 +90,7 @@ cc_library_shared {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/hci/include",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
     ],
 }
diff --git a/system/tools/mcap_tool/Android.bp b/system/tools/mcap_tool/Android.bp
index 5c833fd6f85c42ea1f826758ed048d7bb233854e..cb3b3b320adfa7012a914a1d1abdf8a2c4395ecd 100644
--- a/system/tools/mcap_tool/Android.bp
+++ b/system/tools/mcap_tool/Android.bp
@@ -25,7 +25,7 @@ cc_binary {
     ],
     include_dirs: [
       "packages/modules/Bluetooth/system",
-      "packages/modules/Bluetooth/system/include",
+      "packages/modules/Bluetooth/system/internal_include",
       "packages/modules/Bluetooth/system/stack/include",
       "packages/modules/Bluetooth/system/btcore/include",
     ],
diff --git a/system/udrv/Android.bp b/system/udrv/Android.bp
index f2d41a7788209411e0cee9f1f8db55b5567db013..8b2afcf1cf3d6b041c0d228abd6ec55db07142b8 100644
--- a/system/udrv/Android.bp
+++ b/system/udrv/Android.bp
@@ -6,7 +6,7 @@ cc_library_static {
     ],
     include_dirs: [
       "packages/modules/Bluetooth/system",
-      "packages/modules/Bluetooth/system/include",
+      "packages/modules/Bluetooth/system/internal_include",
       "packages/modules/Bluetooth/system/utils/include",
       "packages/modules/Bluetooth/system/stack/include",
     ],
diff --git a/system/vendor_libs/test_vendor_lib/Android.bp b/system/vendor_libs/test_vendor_lib/Android.bp
index a1938b13e3dce34afed0082ce78343f4a1193a86..e15f7236acdf7a885108b548276001a8d6841014 100644
--- a/system/vendor_libs/test_vendor_lib/Android.bp
+++ b/system/vendor_libs/test_vendor_lib/Android.bp
@@ -41,7 +41,7 @@ cc_library_static {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/utils/include",
         "packages/modules/Bluetooth/system/hci/include",
-        "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     shared_libs: [