diff --git a/Android.bp b/Android.bp
index 739cb6d..f3426e8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,6 +2,9 @@
 
 cc_library_headers {
     name: "libhardware_headers",
+    header_libs: ["libsystem_headers"],
+    export_header_lib_headers: ["libsystem_headers"],
+
     export_include_dirs: ["include"],
     vendor_available: true,
 }
@@ -15,9 +18,11 @@
         "liblog",
         "libdl",
     ],
-    header_libs: ["libsystem_headers"],
     cflags: ["-DQEMU_HARDWARE"],
-    export_include_dirs: ["include"],
+
+    header_libs: ["libhardware_headers"],
+    export_header_lib_headers: ["libhardware_headers"],
+
     vendor_available: true,
 }