diff --git a/bpfloader/Android.bp b/bpfloader/Android.bp
index d88108d..beff687 100644
--- a/bpfloader/Android.bp
+++ b/bpfloader/Android.bp
@@ -39,7 +39,7 @@
         memtag_heap: true,
     },
     clang: true,
-    header_libs: ["bpf_map_utils"],
+    header_libs: ["bpf_headers"],
     shared_libs: [
         "libcutils",
         "libbpf_android",
diff --git a/libbpf_android/Android.bp b/libbpf_android/Android.bp
index ca46510..3b58c00 100644
--- a/libbpf_android/Android.bp
+++ b/libbpf_android/Android.bp
@@ -61,12 +61,12 @@
         "libbpf_bcc",
     ],
     header_libs: [
-        "bpf_map_utils",
+        "bpf_headers",
         "libbpf_android_headers",
     ],
     export_header_lib_headers: [
         "libbpf_android_headers",
-        "bpf_map_utils",
+        "bpf_headers",
     ],
     export_shared_lib_headers: ["libbpf_bcc"],
     local_include_dirs: ["include"],
@@ -81,7 +81,7 @@
 
 cc_test {
     name: "libbpf_load_test",
-    header_libs: ["bpf_map_utils"],
+    header_libs: ["bpf_headers"],
     srcs: [
         "BpfLoadTest.cpp",
     ],