diff --git a/vulkan/Android.bp b/vulkan/Android.bp
index b15bed9..ad4e300 100644
--- a/vulkan/Android.bp
+++ b/vulkan/Android.bp
@@ -12,8 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// This module defines which headers are included in the NDK sysroot during
+// the NDK build process.
 ndk_headers {
-    name: "libvulkan_headers",
+    name: "ndk_vulkan_headers",
     from: "include",
     to: "",
     srcs: [
@@ -25,8 +27,28 @@
     license: "include/vulkan/NOTICE",
 }
 
+// This module makes Vulkan headers available to other modules without
+// having to link against libvulkan.so, e.g. for the Vulkan loader and
+// drivers, or things that dlopen libvulkan.so. It's available to system
+// modules, as part of the VNDK, and to unbundled modules.
 cc_library_headers {
     name: "vulkan_headers",
+    export_include_dirs: ["include"],
+    vendor_available: true,
+    sdk_version: "24",
+}
+
+// This module makes Vulkan headers available to vendor code that is
+// restricted to LLNDK dependencies.
+llndk_headers {
+    name: "vulkan_headers_llndk",
+    export_include_dirs: ["include"],
+}
+
+// This module makes the Vulkan libhardware HAL headers available, for
+// the loader and for HAL/driver implementations.
+cc_library_headers {
+    name: "hwvulkan_headers",
     vendor_available: true,
     header_libs: [
         "libcutils_headers",
@@ -39,18 +61,6 @@
     export_include_dirs: ["include"],
 }
 
-cc_library_headers {
-    name: "vulkan_headers_ndk",
-    export_include_dirs: ["include"],
-    sdk_version: "24",
-}
-
-llndk_library {
-    name: "libvulkan",
-    symbol_file: "libvulkan/libvulkan.map.txt",
-    export_include_dirs: ["include"],
-}
-
 subdirs = [
     "nulldrv",
     "libvulkan",
diff --git a/vulkan/libvulkan/Android.bp b/vulkan/libvulkan/Android.bp
index 71a120a..e1a1ebc 100644
--- a/vulkan/libvulkan/Android.bp
+++ b/vulkan/libvulkan/Android.bp
@@ -20,6 +20,14 @@
     unversioned_until: "current",
 }
 
+llndk_library {
+    name: "libvulkan",
+    symbol_file: "libvulkan.map.txt",
+    export_llndk_headers: [
+        "vulkan_headers_llndk",
+    ],
+}
+
 cc_library_shared {
     name: "libvulkan",
     clang: true,
@@ -65,10 +73,11 @@
         "swapchain.cpp",
     ],
 
-    export_header_lib_headers: ["vulkan_headers"],
     header_libs: [
+        "hwvulkan_headers",
         "vulkan_headers",
     ],
+    export_header_lib_headers: ["vulkan_headers"],
     shared_libs: [
         "android.hardware.configstore@1.0",
         "android.hardware.configstore-utils",
diff --git a/vulkan/nulldrv/Android.bp b/vulkan/nulldrv/Android.bp
index 7be9c66..dedf419 100644
--- a/vulkan/nulldrv/Android.bp
+++ b/vulkan/nulldrv/Android.bp
@@ -41,6 +41,9 @@
         "null_driver_gen.cpp",
     ],
 
-    header_libs: ["vulkan_headers"],
+    header_libs: [
+        "hwvulkan_headers",
+        "vulkan_headers",
+    ],
     shared_libs: ["liblog"],
 }
diff --git a/vulkan/vkjson/Android.bp b/vulkan/vkjson/Android.bp
index 78d6694..a626e48 100644
--- a/vulkan/vkjson/Android.bp
+++ b/vulkan/vkjson/Android.bp
@@ -45,7 +45,7 @@
         "libjsoncpp_ndk",
     ],
     header_libs: [
-        "vulkan_headers_ndk",
+        "vulkan_headers",
     ],
     sdk_version: "24",
     stl: "libc++_static",