diff --git a/system/bta/ag/bta_ag_cmd.cc b/system/bta/ag/bta_ag_cmd.cc
index fccbb91e7f22da12e119a235732ea9b8465e7655..175f79416a04c85ac299ade472815af1f6eb37eb 100644
--- a/system/bta/ag/bta_ag_cmd.cc
+++ b/system/bta/ag/bta_ag_cmd.cc
@@ -29,7 +29,7 @@
 #include "bta/include/utl.h"
 
 #ifdef __ANDROID__
-#include "bta/le_audio/devices.h"
+#include "bta_le_audio_api.h"
 #endif
 
 #include "device/include/interop.h"
diff --git a/system/bta/le_audio/codec_manager.h b/system/bta/le_audio/codec_manager.h
index 8e2a51b0156893d1b6955a2352d20686903cf0ec..f79fb618da07ef97ef78e7926e432b5b5dd18db0 100644
--- a/system/bta/le_audio/codec_manager.h
+++ b/system/bta/le_audio/codec_manager.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include "hardware/bt_le_audio.h"
 #include "le_audio_types.h"
 
 namespace le_audio {
diff --git a/system/bta/le_audio/le_audio_types.h b/system/bta/le_audio/le_audio_types.h
index e46a3ca3b154a0288e7f5eebcdf1c073276a8df8..932b4403d66f1f9f762505fd07014b6762a262e4 100644
--- a/system/bta/le_audio/le_audio_types.h
+++ b/system/bta/le_audio/le_audio_types.h
@@ -31,8 +31,6 @@
 #include <variant>
 #include <vector>
 
-#include "bta_groups.h"
-#include "bta_le_audio_api.h"
 #include "bta_le_audio_uuids.h"
 #include "btm_iso_api_types.h"