diff --git a/ipacm/Android.bp b/ipacm/Android.bp
index 0ce21f7..c2d25a2 100644
--- a/ipacm/Android.bp
+++ b/ipacm/Android.bp
@@ -3,7 +3,7 @@
     name: "ipacm",
 
     local_include_dirs: ["src"] + ["inc"],
-	header_libs: ["qti_kernel_headers"],
+	header_libs: ["generated_kernel_headers"],
 
     cflags: ["-v"] + ["-DFEATURE_IPA_ANDROID"] + ["-DFEATURE_IPACM_RESTART"] + [
         "-DFEATURE_IPACM_HAL",
diff --git a/ipanat/Android.bp b/ipanat/Android.bp
index 310304d..3c8f977 100644
--- a/ipanat/Android.bp
+++ b/ipanat/Android.bp
@@ -3,7 +3,7 @@
 cc_library_shared {
     name: "libipanat",
 
-    header_libs: ["qti_kernel_headers"],
+    header_libs: ["generated_kernel_headers"],
 
     srcs: [
         "src/ipa_nat_drv.c",
diff --git a/ipanat/test/Android.mk b/ipanat/test/Android.mk
index b8ae6a4..4c5f5a7 100644
--- a/ipanat/test/Android.mk
+++ b/ipanat/test/Android.mk
@@ -10,8 +10,7 @@
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ipanat/inc
 
-LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_HEADER_LIBRARIES := generated_kernel_headers
 
 LOCAL_MODULE := ipa_nat_test
 LOCAL_SRC_FILES := ipa_nat_test000.c \