diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index e6c1c67..f873eeb 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -100,13 +100,14 @@
         "android_media_Utils.cpp",
     ],
 
+    header_libs: [
+        "libgui_headers",
+    ],
+
     shared_libs: [
         "liblog",
-        "libgui",
-        "libnativewindow",
         "libui",
         "libutils",
-        "android.hidl.token@1.0-utils",
     ],
 
     include_dirs: [