diff --git a/[refs] b/[refs]
index dc10f69fa23c..bc6c737596da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f670ff8eb4cb3e9e6ae0c0c6976faa0a4503751
+refs/heads/master: cf02820041668b14cbfa0fbd2bab45ac79bd6174
diff --git a/trunk/include/scsi/fc/Kbuild b/trunk/include/scsi/fc/Kbuild
index 56603813c6cd..e69de29bb2d1 100644
--- a/trunk/include/scsi/fc/Kbuild
+++ b/trunk/include/scsi/fc/Kbuild
@@ -1,4 +0,0 @@
-header-y += fc_els.h
-header-y += fc_fs.h
-header-y += fc_gs.h
-header-y += fc_ns.h
diff --git a/trunk/include/uapi/scsi/fc/Kbuild b/trunk/include/uapi/scsi/fc/Kbuild
index aafaa5aa54d4..5ead9fac265c 100644
--- a/trunk/include/uapi/scsi/fc/Kbuild
+++ b/trunk/include/uapi/scsi/fc/Kbuild
@@ -1 +1,5 @@
 # UAPI Header export list
+header-y += fc_els.h
+header-y += fc_fs.h
+header-y += fc_gs.h
+header-y += fc_ns.h
diff --git a/trunk/include/scsi/fc/fc_els.h b/trunk/include/uapi/scsi/fc/fc_els.h
similarity index 100%
rename from trunk/include/scsi/fc/fc_els.h
rename to trunk/include/uapi/scsi/fc/fc_els.h
diff --git a/trunk/include/scsi/fc/fc_fs.h b/trunk/include/uapi/scsi/fc/fc_fs.h
similarity index 100%
rename from trunk/include/scsi/fc/fc_fs.h
rename to trunk/include/uapi/scsi/fc/fc_fs.h
diff --git a/trunk/include/scsi/fc/fc_gs.h b/trunk/include/uapi/scsi/fc/fc_gs.h
similarity index 100%
rename from trunk/include/scsi/fc/fc_gs.h
rename to trunk/include/uapi/scsi/fc/fc_gs.h
diff --git a/trunk/include/scsi/fc/fc_ns.h b/trunk/include/uapi/scsi/fc/fc_ns.h
similarity index 100%
rename from trunk/include/scsi/fc/fc_ns.h
rename to trunk/include/uapi/scsi/fc/fc_ns.h