diff --git a/Android.bp b/Android.bp
index f093c56..739cb6d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,11 @@
 // Copyright 2006 The Android Open Source Project
 
+cc_library_headers {
+    name: "libhardware_headers",
+    export_include_dirs: ["include"],
+    vendor_available: true,
+}
+
 cc_library_shared {
     name: "libhardware",
 
@@ -9,7 +15,10 @@
         "liblog",
         "libdl",
     ],
+    header_libs: ["libsystem_headers"],
     cflags: ["-DQEMU_HARDWARE"],
+    export_include_dirs: ["include"],
+    vendor_available: true,
 }
 
 subdirs = [
diff --git a/hardware.c b/hardware.c
index 5394787..7e4debe 100644
--- a/hardware.c
+++ b/hardware.c
@@ -23,9 +23,11 @@
 #include <pthread.h>
 #include <errno.h>
 #include <limits.h>
+#include <stdio.h>
+#include <unistd.h>
 
 #define LOG_TAG "HAL"
-#include <utils/Log.h>
+#include <log/log.h>
 
 /** Base path of the hal modules */
 #if defined(__LP64__)
diff --git a/include/hardware/sensors.h b/include/hardware/sensors.h
index 8c5fa16..92a8fd9 100644
--- a/include/hardware/sensors.h
+++ b/include/hardware/sensors.h
@@ -701,7 +701,7 @@
             int sensor_handle, int channel_handle, const struct sensors_direct_cfg_t *config);
 
     /*
-     * Reserved for future use.
+     * Reserved for future use, must be zero.
      */
     void (*reserved_procs[5])(void);
 
diff --git a/modules/nfc/Android.bp b/modules/nfc/Android.bp
index 5f174f4..10dc2c1 100644
--- a/modules/nfc/Android.bp
+++ b/modules/nfc/Android.bp
@@ -19,6 +19,5 @@
     srcs: ["nfc_pn544_example.c"],
     shared_libs: [
         "liblog",
-        "libcutils",
     ],
 }