diff --git a/Android.bp b/Android.bp
index 0de7e1c..a55e070 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+cc_library_headers {
+    name: "drm_hwcomposer_headers",
+    vendor: true,
+    export_include_dirs: ["."],
+}
+
 // =====================
 // libdrmhwc_utils.a
 // =====================
@@ -20,7 +26,7 @@
 
     srcs: ["utils/Worker.cpp"],
 
-    include_dirs: ["external/drm_hwcomposer"],
+    header_libs: ["drm_hwcomposer_headers"],
 
     cflags: [
         "-Wall",
@@ -48,9 +54,8 @@
         "libutils",
     ],
 
-    include_dirs: ["external/drm_hwcomposer"],
-
     static_libs: ["libdrmhwc_utils"],
+    header_libs: ["drm_hwcomposer_headers"],
 
     cflags: [
         "-Wall",
diff --git a/tests/Android.bp b/tests/Android.bp
index c48c86a..e3dc13b 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -25,10 +25,12 @@
     srcs: ["worker_test.cpp"],
 
     vendor: true,
-    header_libs: ["libhardware_headers"],
+    header_libs: [
+        "drm_hwcomposer_headers",
+        "libhardware_headers",
+    ],
     static_libs: ["libdrmhwc_utils"],
     shared_libs: ["hwcomposer.drm"],
-    include_dirs: ["external/drm_hwcomposer"],
 }
 
 // Tool for listening and dumping uevents
@@ -38,9 +40,9 @@
     srcs: ["uevent_print.cpp"],
 
     vendor: true,
-    header_libs: ["libhardware_headers"],
-    shared_libs: ["liblog"],
-    include_dirs: [
-        "external/drm_hwcomposer",
+    header_libs: [
+        "drm_hwcomposer_headers",
+        "libhardware_headers",
     ],
+    shared_libs: ["liblog"],
 }