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()
diff --git a/tests/Android.bp b/tests/Android.bp
index 4605267..a03f1a6 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -91,6 +91,7 @@
         "regex_test.cpp",
         "resolv_test.cpp",
         "sched_test.cpp",
+        "scsi_sg_test.cpp",
         "search_test.cpp",
         "semaphore_test.cpp",
         "setjmp_test.cpp",
diff --git a/tests/scsi_sg_test.cpp b/tests/scsi_sg_test.cpp
new file mode 100644
index 0000000..d1774ae
--- /dev/null
+++ b/tests/scsi_sg_test.cpp
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// This test is just "does it compile?" because the scsi headers come from a special set.
+#include <sys/types.h>
+#include <scsi/sg.h>