diff --git a/apex/Android.bp b/apex/Android.bp
index 5bf078a..c97eb15 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -26,6 +26,9 @@
         "libc_malloc_debug",
         "libc_malloc_hooks",
     ],
+    binaries: [
+        "linkerconfig",
+    ],
     multilib: {
         both: {
             binaries: [
diff --git a/libc/kernel/tools/generate_uapi_headers.sh b/libc/kernel/tools/generate_uapi_headers.sh
index 4e7d2af..7e49cde 100755
--- a/libc/kernel/tools/generate_uapi_headers.sh
+++ b/libc/kernel/tools/generate_uapi_headers.sh
@@ -218,12 +218,11 @@
 fi
 
 if [[ ${SKIP_GENERATION} -eq 0 ]]; then
-  # Clean up any leftover headers.
-  make distclean
-
   # Build all of the generated headers.
   for arch in "${ARCH_LIST[@]}"; do
     echo "Generating headers for arch ${arch}"
+    # Clean up any leftover headers.
+    make ARCH=${arch} distclean
     make ARCH=${arch} headers_install
   done
 fi
@@ -269,3 +268,12 @@
                      "${ANDROID_KERNEL_DIR}/scsi" \
                      "${KERNEL_DIR}"
 echo "Headers updated."
+
+if [[ ${SKIP_GENERATION} -eq 0 ]]; then
+  cd "${KERNEL_DIR}"
+  # Clean all of the generated headers.
+  for arch in "${ARCH_LIST[@]}"; do
+    echo "Cleaning kernel files for arch ${arch}"
+    make ARCH=${arch} distclean
+  done
+fi