diff --git a/audio/2.0/default/Android.mk b/audio/2.0/default/Android.mk
index 93f7ad080b..621853cb0e 100644
--- a/audio/2.0/default/Android.mk
+++ b/audio/2.0/default/Android.mk
@@ -43,6 +43,12 @@ LOCAL_SHARED_LIBRARIES := \
     android.hardware.audio.common@2.0 \
     android.hardware.audio.common@2.0-util \
 
+LOCAL_HEADER_LIBRARIES := \
+    libaudioclient_headers \
+    libaudio_system_headers \
+    libhardware_headers \
+    libmedia_headers \
+
 LOCAL_WHOLE_STATIC_LIBRARIES := libmedia_helper
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/audio/common/2.0/default/Android.bp b/audio/common/2.0/default/Android.bp
index e39a908b41..0486a5c723 100644
--- a/audio/common/2.0/default/Android.bp
+++ b/audio/common/2.0/default/Android.bp
@@ -24,9 +24,14 @@ cc_library_shared {
     export_include_dirs: ["."],
 
     shared_libs: [
+        "liblog",
         "libutils",
         "libhidlbase",
         "android.hardware.audio.common@2.0",
     ],
 
+    header_libs: [
+        "libaudio_system_headers",
+        "libhardware_headers",
+    ],
 }
diff --git a/audio/effect/2.0/default/Android.mk b/audio/effect/2.0/default/Android.mk
index bbcf2984b6..f89d4f7bc5 100644
--- a/audio/effect/2.0/default/Android.mk
+++ b/audio/effect/2.0/default/Android.mk
@@ -36,4 +36,11 @@ LOCAL_SHARED_LIBRARIES := \
     android.hardware.audio.effect@2.0 \
     android.hidl.memory@1.0 \
 
+LOCAL_HEADER_LIBRARIES := \
+    libaudio_system_headers \
+    libaudioclient_headers \
+    libeffects_headers \
+    libhardware_headers \
+    libmedia_headers \
+
 include $(BUILD_SHARED_LIBRARY)