diff --git a/gen_headers_arm64_auto.bp b/gen_headers_arm64_auto.bp
index 0b412bce3c93..bd89319dc2a1 100644
--- a/gen_headers_arm64_auto.bp
+++ b/gen_headers_arm64_auto.bp
@@ -384,7 +384,6 @@ gen_headers_out_arm64 = [
     "linux/msm_ion_ids.h",
     "linux/msm_ipa.h",
     "linux/msm_kgsl.h",
-    "linux/msm_npu.h",
     "linux/msm_rmnet.h",
     "linux/mtio.h",
     "linux/n_r3964.h",
@@ -640,7 +639,6 @@ gen_headers_out_arm64 = [
     "linux/zorro_ids.h",
     "linux/hab_ioctl.h",
     "linux/habmmid.h",
-    "linux/hgsl.h",
     "media/msm_cvp_private.h",
     "media/radio-iris-commands.h",
     "media/radio-iris.h",
@@ -1030,6 +1028,9 @@ gen_headers_out_arm64 = [
     "vidc/media/msm_media_info.h",
     "vidc/media/msm_vidc_utils.h",
     "vidc/media/msm_vidc_private.h",
+    "linux/netfilter_ipv4/ipt_NATTYPE.h",
+    "linux/mhi.h",
+    "linux/esoc_ctrl.h",
 ]
 
 genrule {
diff --git a/gen_headers_arm_auto.bp b/gen_headers_arm_auto.bp
index 4d1a8d0f827b..02401177be4f 100644
--- a/gen_headers_arm_auto.bp
+++ b/gen_headers_arm_auto.bp
@@ -389,7 +389,6 @@ gen_headers_out_arm = [
     "linux/msm_ion_ids.h",
     "linux/msm_ipa.h",
     "linux/msm_kgsl.h",
-    "linux/msm_npu.h",
     "linux/msm_rmnet.h",
     "linux/mtio.h",
     "linux/n_r3964.h",
@@ -645,7 +644,6 @@ gen_headers_out_arm = [
     "linux/zorro_ids.h",
     "linux/hab_ioctl.h",
     "linux/habmmid.h",
-    "linux/hgsl.h",
     "media/msm_cvp_private.h",
     "media/radio-iris-commands.h",
     "media/radio-iris.h",
@@ -1034,6 +1032,9 @@ gen_headers_out_arm = [
     "vidc/media/msm_media_info.h",
     "vidc/media/msm_vidc_utils.h",
     "vidc/media/msm_vidc_private.h",
+    "linux/netfilter_ipv4/ipt_NATTYPE.h",
+    "linux/esoc_ctrl.h",
+    "linux/mhi.h",
 ]
 
 genrule {