diff --git a/libc/Android.bp b/libc/Android.bp
index cda9eaa..5a1c287 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2097,7 +2097,7 @@
 
 ndk_headers {
     name: "libc_kernel_android_scsi",
-    from: "kernel/android/scsi",
+    from: "kernel/android/scsi/scsi",
     to: "scsi",
     srcs: ["kernel/android/scsi/**/*.h"],
     license: "NOTICE",
diff --git a/libc/kernel/android/scsi/scsi.h b/libc/kernel/android/scsi/scsi/scsi.h
similarity index 100%
rename from libc/kernel/android/scsi/scsi.h
rename to libc/kernel/android/scsi/scsi/scsi.h
diff --git a/libc/kernel/android/scsi/scsi_ioctl.h b/libc/kernel/android/scsi/scsi/scsi_ioctl.h
similarity index 100%
rename from libc/kernel/android/scsi/scsi_ioctl.h
rename to libc/kernel/android/scsi/scsi/scsi_ioctl.h
diff --git a/libc/kernel/android/scsi/scsi_proto.h b/libc/kernel/android/scsi/scsi/scsi_proto.h
similarity index 100%
rename from libc/kernel/android/scsi/scsi_proto.h
rename to libc/kernel/android/scsi/scsi/scsi_proto.h
diff --git a/libc/kernel/android/scsi/sg.h b/libc/kernel/android/scsi/scsi/sg.h
similarity index 100%
rename from libc/kernel/android/scsi/sg.h
rename to libc/kernel/android/scsi/scsi/sg.h
diff --git a/libc/kernel/tools/update_all.py b/libc/kernel/tools/update_all.py
index e5a07f8..0f30ecd 100755
--- a/libc/kernel/tools/update_all.py
+++ b/libc/kernel/tools/update_all.py
@@ -95,6 +95,6 @@
 processFiles(updater, original_dir, modified_dir, "uapi", "uapi"),
 
 # Now process the special files.
-processFiles(updater, original_dir, modified_dir, "scsi", os.path.join("android", "scsi"))
+processFiles(updater, original_dir, modified_dir, "scsi", os.path.join("android", "scsi", "scsi"))
 
 updater.updateGitFiles()