diff --git a/Android.bp b/Android.bp
index 06e9ee3..34dbbc3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -71,13 +71,9 @@
         "//apex_available:platform",
         "com.android.virt",
     ],
-}
-
-// 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"],
+    llndk: {
+        llndk_headers: true,
+    },
 }
 
 // This module makes Vulkan XML file available to vendor code.