diff --git a/media/libaudioclient/AidlConversion.cpp b/media/libaudioclient/AidlConversion.cpp
index 14fce0a..8fb836d 100644
--- a/media/libaudioclient/AidlConversion.cpp
+++ b/media/libaudioclient/AidlConversion.cpp
@@ -16,7 +16,6 @@
 
 #define LOG_TAG "AidlConversion"
 //#define LOG_NDEBUG 0
-#include <system/audio.h>
 #include <utils/Log.h>
 
 #include "media/AidlConversion.h"
diff --git a/media/libaudioclient/Android.bp b/media/libaudioclient/Android.bp
index cb53cda..f6aa867 100644
--- a/media/libaudioclient/Android.bp
+++ b/media/libaudioclient/Android.bp
@@ -161,6 +161,9 @@
     vendor_available: true,
     double_loadable: true,
     min_sdk_version: "29",
+    header_libs: [
+        "libaudio_system_headers",
+    ],
     shared_libs: [
         "audioclient-types-aidl-unstable-cpp",
         "libbase",