diff --git a/audio/aidl/default/Android.bp b/audio/aidl/default/Android.bp
index c48777f810..2baaad9a84 100644
--- a/audio/aidl/default/Android.bp
+++ b/audio/aidl/default/Android.bp
@@ -21,6 +21,9 @@ cc_defaults {
         "android.hardware.common-V2-ndk",
         "android.hardware.common.fmq-V1-ndk",
     ],
+    header_libs: [
+        "libaudioaidl_headers",
+    ],
 }
 
 cc_library_static {
@@ -109,3 +112,10 @@ cc_binary {
     ],
     srcs: ["EffectMain.cpp"],
 }
+
+cc_library_headers {
+    name: "libaudioaidl_headers",
+    export_include_dirs: ["include"],
+    vendor: true,
+    host_supported: true,
+}
diff --git a/audio/aidl/default/equalizer/Android.bp b/audio/aidl/default/equalizer/Android.bp
index 9c11347941..2a2ddbc92c 100644
--- a/audio/aidl/default/equalizer/Android.bp
+++ b/audio/aidl/default/equalizer/Android.bp
@@ -36,10 +36,6 @@ cc_library_shared {
         "latest_android_media_audio_common_types_ndk_shared",
         "latest_android_hardware_audio_effect_ndk_shared",
     ],
-    include_dirs: [
-        "hardware/interfaces/audio/aidl/default/include",
-        "system/media/audio/include",
-    ],
     srcs: [
         "Equalizer.cpp",
         ":effectCommonFile",