diff --git a/ipacm/Android.bp b/ipacm/Android.bp
index 0ce21f7..c6ed74b 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: ["device_kernel_headers"]+["qti_kernel_headers"],
 
     cflags: ["-v"] + ["-DFEATURE_IPA_ANDROID"] + ["-DFEATURE_IPACM_RESTART"] + [
         "-DFEATURE_IPACM_HAL",
diff --git a/ipacm/inc/IPACM_Netlink.h b/ipacm/inc/IPACM_Netlink.h
index 81f1968..c413f45 100644
--- a/ipacm/inc/IPACM_Netlink.h
+++ b/ipacm/inc/IPACM_Netlink.h
@@ -53,7 +53,10 @@
 #include <sys/socket.h>
 #include <linux/socket.h>
 #include <inaddr.h>
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0))
 #define sockaddr_storage __kernel_sockaddr_storage
+#endif
 #include <linux/if.h>
 #include <linux/if_addr.h>
 #include <linux/rtnetlink.h>
diff --git a/ipacm_vendor_product.mk b/ipacm_vendor_product.mk
index f225a30..57b7dc3 100644
--- a/ipacm_vendor_product.mk
+++ b/ipacm_vendor_product.mk
@@ -40,11 +40,9 @@
 
 ifneq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true)
 ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
-ifneq (, $(filter aarch64 arm arm64, $(TARGET_ARCH)))
 
 PRODUCT_PACKAGES += $(IPACM_DATA)
 
-endif # $(TARGET_ARCH)
 endif
 endif
 endif
diff --git a/ipanat/Android.bp b/ipanat/Android.bp
index 424dd54..1bf8ff9 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: ["device_kernel_headers"]+["qti_kernel_headers"],
 
     srcs: [
         "src/ipa_nat_map.cpp",