diff --git a/gen_headers_arm.bp b/gen_headers_arm.bp
index 1446700ba42f..56e3dfb0fbe3 100644
--- a/gen_headers_arm.bp
+++ b/gen_headers_arm.bp
@@ -974,6 +974,27 @@ gen_headers_out_arm = [
 
     // From techpack/*/include/uapi/*/**/*.h
 
+    "linux/avtimer.h",
+    "linux/mfd/wcd9xxx/wcd9xxx_registers.h",
+    "linux/mfd/wcd9xxx/wcd9320_registers.h",
+    "linux/msm_audio.h",
+    "linux/msm_audio_aac.h",
+    "linux/msm_audio_ac3.h",
+    "linux/msm_audio_alac.h",
+    "linux/msm_audio_amrnb.h",
+    "linux/msm_audio_amrwb.h",
+    "linux/msm_audio_amrwbplus.h",
+    "linux/msm_audio_ape.h",
+    "linux/msm_audio_calibration.h",
+    "linux/msm_audio_g711.h",
+    "linux/msm_audio_g711_dec.h",
+    "linux/msm_audio_mvs.h",
+    "linux/msm_audio_qcp.h",
+    "linux/msm_audio_sbc.h",
+    "linux/msm_audio_voicememo.h",
+    "linux/msm_audio_wma.h",
+    "linux/msm_audio_wmapro.h",
+    "linux/wcd-spi-ac-params.h",
     "media/cam_cpas.h",
     "media/cam_custom.h",
     "media/cam_defs.h",
@@ -990,6 +1011,13 @@ gen_headers_out_arm = [
     "media/cam_sensor.h",
     "media/cam_sync.h",
     "media/cam_tfe.h",
+    "sound/audio_effects.h",
+    "sound/audio_slimslave.h",
+    "sound/devdep_params.h",
+    "sound/lsm_params.h",
+    "sound/msmcal-hwdep.h",
+    "sound/voice_params.h",
+    "sound/wcd-dsp-glink.h",
 ]
 
 genrule {
diff --git a/gen_headers_arm64.bp b/gen_headers_arm64.bp
index d73e96d1d767..3ba660913d53 100644
--- a/gen_headers_arm64.bp
+++ b/gen_headers_arm64.bp
@@ -968,6 +968,27 @@ gen_headers_out_arm64 = [
 
     // From techpack/*/include/uapi/*/**/*.h
 
+    "linux/avtimer.h",
+    "linux/mfd/wcd9xxx/wcd9xxx_registers.h",
+    "linux/mfd/wcd9xxx/wcd9320_registers.h",
+    "linux/msm_audio.h",
+    "linux/msm_audio_aac.h",
+    "linux/msm_audio_ac3.h",
+    "linux/msm_audio_alac.h",
+    "linux/msm_audio_amrnb.h",
+    "linux/msm_audio_amrwb.h",
+    "linux/msm_audio_amrwbplus.h",
+    "linux/msm_audio_ape.h",
+    "linux/msm_audio_calibration.h",
+    "linux/msm_audio_g711.h",
+    "linux/msm_audio_g711_dec.h",
+    "linux/msm_audio_mvs.h",
+    "linux/msm_audio_qcp.h",
+    "linux/msm_audio_sbc.h",
+    "linux/msm_audio_voicememo.h",
+    "linux/msm_audio_wma.h",
+    "linux/msm_audio_wmapro.h",
+    "linux/wcd-spi-ac-params.h",
     "media/cam_cpas.h",
     "media/cam_custom.h",
     "media/cam_defs.h",
@@ -984,6 +1005,13 @@ gen_headers_out_arm64 = [
     "media/cam_sensor.h",
     "media/cam_sync.h",
     "media/cam_tfe.h",
+    "sound/audio_effects.h",
+    "sound/audio_slimslave.h",
+    "sound/devdep_params.h",
+    "sound/lsm_params.h",
+    "sound/msmcal-hwdep.h",
+    "sound/voice_params.h",
+    "sound/wcd-dsp-glink.h",
 ]
 
 genrule {