diff --git a/system/stack/avdt/avdt_ad.cc b/system/stack/avdt/avdt_ad.cc
index f643b02e1714bbaf9aba1de83d848a103d480859..5d72382b80c26efe8cd9474045d20ab53cefd873 100644
--- a/system/stack/avdt/avdt_ad.cc
+++ b/system/stack/avdt/avdt_ad.cc
@@ -27,14 +27,12 @@
 
 #include "avdt_api.h"
 #include "avdt_int.h"
-#include "avdtc_api.h"
-#include "bt_target.h"
+#include "internal_include/bt_target.h"
 #include "l2c_api.h"
 #include "l2cdefs.h"
 #include "osi/include/allocator.h"
-#include "osi/include/osi.h"
-#include "stack/btm/btm_sec.h"
 #include "stack/include/bt_hdr.h"
+#include "stack/include/btm_sec_api_types.h"
 
 AvdtpScb* AvdtpAdaptationLayer::LookupAvdtpScb(
     const AvdtpTransportChannel& tc) {
diff --git a/system/stack/avdt/avdt_api.cc b/system/stack/avdt/avdt_api.cc
index 04016e3fd06b6da25b9f7a13fa917dbc6018d983..60518de3c7b35aae1aa781a7696447229fc1f48a 100644
--- a/system/stack/avdt/avdt_api.cc
+++ b/system/stack/avdt/avdt_api.cc
@@ -29,13 +29,10 @@
 
 #include "avdt_int.h"
 #include "avdtc_api.h"
-#include "bt_target.h"
 #include "bta/include/bta_sec_api.h"
-#include "btm_api.h"
+#include "internal_include/bt_target.h"
 #include "l2c_api.h"
-#include "main/shim/dumpsys.h"
-#include "osi/include/log.h"
-#include "stack/btm/btm_sec.h"
+#include "os/log.h"
 #include "stack/include/a2dp_codec_api.h"
 #include "stack/include/bt_hdr.h"
 #include "types/raw_address.h"
diff --git a/system/stack/avdt/avdt_ccb.cc b/system/stack/avdt/avdt_ccb.cc
index 5c7bc1370971d14c92f2232be5108a512e13d4a4..2083b3888f9a15b171d0b73ae10cf073b689d6a8 100644
--- a/system/stack/avdt/avdt_ccb.cc
+++ b/system/stack/avdt/avdt_ccb.cc
@@ -23,17 +23,14 @@
  *
  ******************************************************************************/
 
+#include <base/logging.h>  // VLOG
 #include <string.h>
 
-#include "avdt_api.h"
 #include "avdt_int.h"
-#include "avdtc_api.h"
-#include "bt_target.h"
+#include "internal_include/bt_target.h"
 #include "osi/include/osi.h"
 #include "types/raw_address.h"
 
-#include <base/logging.h>
-
 /*****************************************************************************
  * state machine constants and types
  ****************************************************************************/
diff --git a/system/stack/avdt/avdt_int.h b/system/stack/avdt/avdt_int.h
index a3f949d139690fb71f82acb35224360299e951d0..0d476bc8c202249445c600d4c44df6d5d2d8d746 100644
--- a/system/stack/avdt/avdt_int.h
+++ b/system/stack/avdt/avdt_int.h
@@ -29,7 +29,7 @@
 #include "avdt_api.h"
 #include "avdt_defs.h"
 #include "avdtc_api.h"
-#include "btm_api.h"
+#include "internal_include/bt_target.h"
 #include "l2c_api.h"
 #include "osi/include/alarm.h"
 #include "osi/include/fixed_queue.h"
diff --git a/system/stack/avdt/avdt_msg.cc b/system/stack/avdt/avdt_msg.cc
index 7f74b4f3bc8eafaa80e10dda4a4c638f4e4c8c4c..29e566234b459aeb975abe40bad0e08e77821d7c 100644
--- a/system/stack/avdt/avdt_msg.cc
+++ b/system/stack/avdt/avdt_msg.cc
@@ -33,9 +33,9 @@
 #include "avdt_api.h"
 #include "avdt_int.h"
 #include "avdtc_api.h"
-#include "bt_target.h"
+#include "internal_include/bt_target.h"
+#include "os/log.h"
 #include "osi/include/allocator.h"
-#include "osi/include/log.h"
 #include "osi/include/osi.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/bt_types.h"
diff --git a/system/stack/avdt/avdt_scb.cc b/system/stack/avdt/avdt_scb.cc
index 9ed77925e163d7c2434e245b598abee68f67833e..bd0b682295c59666f8ba7c038157d9a954227fe6 100644
--- a/system/stack/avdt/avdt_scb.cc
+++ b/system/stack/avdt/avdt_scb.cc
@@ -24,10 +24,11 @@
  ******************************************************************************/
 
 #include <string.h>
+
 #include "avdt_api.h"
 #include "avdt_int.h"
 #include "avdtc_api.h"
-#include "bt_target.h"
+#include "internal_include/bt_target.h"
 #include "osi/include/osi.h"
 
 /*****************************************************************************
diff --git a/system/stack/avdt/avdt_scb_act.cc b/system/stack/avdt/avdt_scb_act.cc
index cbcabbf5534f5cfb18f9e796c69f03d9864456f7..9920f016d42f279cf6e26f14f2f12c15bf71ed02 100644
--- a/system/stack/avdt/avdt_scb_act.cc
+++ b/system/stack/avdt/avdt_scb_act.cc
@@ -30,10 +30,9 @@
 #include "a2dp_codec_api.h"
 #include "avdt_api.h"
 #include "avdt_int.h"
-#include "avdtc_api.h"
-#include "bt_target.h"
+#include "internal_include/bt_target.h"
+#include "os/log.h"
 #include "osi/include/allocator.h"
-#include "osi/include/log.h"
 #include "osi/include/osi.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/bt_types.h"