diff --git a/Android.bp b/Android.bp
index b1e6afd..ef4b3af 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,6 +28,8 @@
         "sdm/include",
         "gralloc",
     ],
+    header_libs: ["libhardware_headers"],
+    export_header_lib_headers: ["libhardware_headers"],
 }
 
 subdirs = [
diff --git a/liblight/Android.mk b/liblight/Android.mk
index 197a1a4..cf53b2c 100644
--- a/liblight/Android.mk
+++ b/liblight/Android.mk
@@ -23,6 +23,7 @@
 LOCAL_SRC_FILES := lights.c lights_prv.cpp
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SHARED_LIBRARIES := liblog libcutils libsdm-disp-vndapis
+LOCAL_HEADER_LIBRARIES := libhardware_headers
 LOCAL_CFLAGS := -DLOG_TAG=\"qdlights\"
 ifeq ($(LLVM_SA), true)
     LOCAL_CFLAGS += --compile-and-analyze --analyzer-perf --analyzer-Werror
diff --git a/libmemtrack/Android.mk b/libmemtrack/Android.mk
index d4014bb..10fd40a 100644
--- a/libmemtrack/Android.mk
+++ b/libmemtrack/Android.mk
@@ -24,6 +24,7 @@
 LOCAL_CFLAGS := -Wconversion -Wall -Werror -Wno-sign-conversion
 LOCAL_CLANG  := true
 LOCAL_SHARED_LIBRARIES := liblog
+LOCAL_HEADER_LIBRARIES := libhardware_headers
 LOCAL_SRC_FILES := memtrack_msm.c kgsl.c
 LOCAL_MODULE := memtrack.$(TARGET_BOARD_PLATFORM)
 include $(BUILD_SHARED_LIBRARY)
diff --git a/libqdutils/Android.bp b/libqdutils/Android.bp
index a32162f..24b0c77 100644
--- a/libqdutils/Android.bp
+++ b/libqdutils/Android.bp
@@ -2,6 +2,7 @@
     name: "libqdutils",
     vendor: true,
     defaults: ["display_defaults"],
+    header_libs: ["libhardware_headers"],
     shared_libs: [
         "libbinder",
         "libqservice",
diff --git a/libqservice/IQService.cpp b/libqservice/IQService.cpp
index 2d0cbfb..d45a141 100644
--- a/libqservice/IQService.cpp
+++ b/libqservice/IQService.cpp
@@ -25,8 +25,8 @@
 #include <binder/IBinder.h>
 #include <binder/IInterface.h>
 #include <binder/IPCThreadState.h>
+#include <cutils/android_filesystem_config.h>
 #include <utils/Errors.h>
-#include <private/android_filesystem_config.h>
 #include <IQService.h>
 
 #define QSERVICE_DEBUG 0