diff --git a/libc/Android.bp b/libc/Android.bp
index 9ffc4fe..8922621 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1642,7 +1642,6 @@
     ],
     name: "libc",
     static_ndk_lib: true,
-    llndk_stubs: "libc.llndk",
     product_variables: {
         platform_sdk_version: {
             asflags: ["-DPLATFORM_SDK_VERSION=%d"],
@@ -1766,7 +1765,12 @@
             "current",
         ],
     },
-
+    llndk: {
+        symbol_file: "libc.map.txt",
+        export_headers_as_system: true,
+        export_preprocessed_headers: ["include"],
+        export_llndk_headers: ["libc_llndk_headers"],
+    },
     apex_available: [
         "//apex_available:platform",
         "com.android.runtime",
@@ -1857,13 +1861,11 @@
 }
 
 cc_library_headers {
-    // Internal lib for use in libc_headers. Since we cannot intersect arch{}
-    // and target{} in the same module, this one specifies the arch-dependent
-    // include paths, and then libc_headers filters by target so that the
-    // headers only are included for Bionic targets.
-    name: "libc_headers_arch",
+    name: "libc_llndk_headers",
     visibility: ["//visibility:private"],
-
+    llndk: {
+        llndk_headers: true,
+    },
     host_supported: true,
     vendor_available: true,
     product_available: true,
@@ -1891,7 +1893,6 @@
     sdk_version: "1",
 
     export_system_include_dirs: [
-        "include",
         "kernel/uapi",
         "kernel/android/scsi",
         "kernel/android/uapi",
@@ -1954,12 +1955,14 @@
 
     target: {
         android: {
-            header_libs: ["libc_headers_arch"],
-            export_header_lib_headers: ["libc_headers_arch"],
+            export_system_include_dirs: ["include"],
+            header_libs: ["libc_llndk_headers"],
+            export_header_lib_headers: ["libc_llndk_headers"],
         },
         linux_bionic: {
-            header_libs: ["libc_headers_arch"],
-            export_header_lib_headers: ["libc_headers_arch"],
+            export_system_include_dirs: ["include"],
+            header_libs: ["libc_llndk_headers"],
+            export_header_lib_headers: ["libc_llndk_headers"],
         },
     },
     bazel_module: { bp2build_available: true },
@@ -2299,41 +2302,6 @@
     first_version: "9",
 }
 
-llndk_library {
-    name: "libc.llndk",
-    symbol_file: "libc.map.txt",
-    export_headers_as_system: true,
-    export_preprocessed_headers: ["include"],
-    native_bridge_supported: true,
-    export_include_dirs: [
-        "kernel/uapi",
-        "kernel/android/scsi",
-        "kernel/android/uapi",
-    ],
-    arch: {
-        arm: {
-            export_include_dirs: [
-                "kernel/uapi/asm-arm",
-            ],
-        },
-        arm64: {
-            export_include_dirs: [
-                "kernel/uapi/asm-arm64",
-            ],
-        },
-        x86: {
-            export_include_dirs: [
-                "kernel/uapi/asm-x86",
-            ],
-        },
-        x86_64: {
-            export_include_dirs: [
-                "kernel/uapi/asm-x86",
-            ],
-        },
-    },
-}
-
 ndk_library {
     name: "libstdc++",
     symbol_file: "libstdc++.map.txt",
diff --git a/libdl/Android.bp b/libdl/Android.bp
index 3004671..750a6e2 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -56,7 +56,6 @@
     recovery_available: true,
     native_bridge_supported: true,
     static_ndk_lib: true,
-    llndk_stubs: "libdl.llndk",
 
     defaults: ["linux_bionic_supported"],
 
@@ -137,6 +136,9 @@
             "current",
         ],
     },
+    llndk: {
+        symbol_file: "libdl.map.txt",
+    },
 
     apex_available: [
         "//apex_available:platform",
@@ -235,12 +237,6 @@
     first_version: "9",
 }
 
-llndk_library {
-    name: "libdl.llndk",
-    native_bridge_supported: true,
-    symbol_file: "libdl.map.txt",
-}
-
 genrule {
     name: "libdl.arm.map",
     out: ["libdl.arm.map"],
diff --git a/libm/Android.bp b/libm/Android.bp
index 10f794a..6c3abd1 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -26,7 +26,6 @@
     vendor_ramdisk_available: true,
     recovery_available: true,
     static_ndk_lib: true,
-    llndk_stubs: "libm.llndk",
 
     whole_static_libs: ["libarm-optimized-routines-math"],
 
@@ -528,6 +527,10 @@
         ],
     },
 
+    llndk: {
+        symbol_file: "libm.map.txt",
+    },
+
     apex_available: [
         "//apex_available:platform",
         "com.android.runtime",
@@ -544,12 +547,6 @@
     first_version: "9",
 }
 
-llndk_library {
-    name: "libm.llndk",
-    native_bridge_supported: true,
-    symbol_file: "libm.map.txt",
-}
-
 genrule {
     name: "libm.arm.map",
     out: ["libm.arm.map"],