summaryrefslogtreecommitdiff
path: root/nuttx/fs
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/fs')
-rw-r--r--nuttx/fs/fat/fs_configfat.c6
-rw-r--r--nuttx/fs/fat/fs_fat32.c6
-rw-r--r--nuttx/fs/fat/fs_fat32.h2
-rw-r--r--nuttx/fs/fat/fs_fat32attrib.c4
-rw-r--r--nuttx/fs/fat/fs_fat32dirent.c4
-rw-r--r--nuttx/fs/fat/fs_fat32util.c4
-rw-r--r--nuttx/fs/fat/fs_mkfatfs.c6
-rw-r--r--nuttx/fs/fat/fs_writefat.c6
-rw-r--r--nuttx/fs/fs_close.c2
-rw-r--r--nuttx/fs/fs_closeblockdriver.c2
-rw-r--r--nuttx/fs/fs_closedir.c4
-rw-r--r--nuttx/fs/fs_dup.c2
-rw-r--r--nuttx/fs/fs_fcntl.c2
-rw-r--r--nuttx/fs/fs_fdopen.c2
-rw-r--r--nuttx/fs/fs_filedup.c2
-rw-r--r--nuttx/fs/fs_files.c2
-rw-r--r--nuttx/fs/fs_findblockdriver.c2
-rw-r--r--nuttx/fs/fs_fsync.c2
-rw-r--r--nuttx/fs/fs_inode.c2
-rw-r--r--nuttx/fs/fs_inodeaddref.c2
-rw-r--r--nuttx/fs/fs_inodefind.c2
-rw-r--r--nuttx/fs/fs_inoderelease.c2
-rw-r--r--nuttx/fs/fs_inoderemove.c2
-rw-r--r--nuttx/fs/fs_inodereserve.c2
-rw-r--r--nuttx/fs/fs_internal.h2
-rw-r--r--nuttx/fs/fs_mkdir.c2
-rw-r--r--nuttx/fs/fs_mount.c2
-rw-r--r--nuttx/fs/fs_open.c2
-rw-r--r--nuttx/fs/fs_openblockdriver.c2
-rw-r--r--nuttx/fs/fs_opendir.c4
-rw-r--r--nuttx/fs/fs_poll.c2
-rw-r--r--nuttx/fs/fs_readdir.c4
-rw-r--r--nuttx/fs/fs_registerblockdriver.c2
-rw-r--r--nuttx/fs/fs_registerdriver.c2
-rw-r--r--nuttx/fs/fs_rename.c2
-rw-r--r--nuttx/fs/fs_rewinddir.c4
-rw-r--r--nuttx/fs/fs_rmdir.c2
-rw-r--r--nuttx/fs/fs_seekdir.c4
-rw-r--r--nuttx/fs/fs_select.c2
-rw-r--r--nuttx/fs/fs_umount.c2
-rw-r--r--nuttx/fs/fs_unlink.c2
-rw-r--r--nuttx/fs/fs_unregisterblockdriver.c2
-rw-r--r--nuttx/fs/fs_unregisterdriver.c2
-rw-r--r--nuttx/fs/nxffs/nxffs.h4
-rw-r--r--nuttx/fs/nxffs/nxffs_dirent.c4
-rw-r--r--nuttx/fs/nxffs/nxffs_dump.c2
-rw-r--r--nuttx/fs/nxffs/nxffs_initialize.c4
-rw-r--r--nuttx/fs/nxffs/nxffs_ioctl.c4
-rw-r--r--nuttx/fs/nxffs/nxffs_open.c2
-rw-r--r--nuttx/fs/nxffs/nxffs_read.c2
-rw-r--r--nuttx/fs/nxffs/nxffs_stat.c2
-rw-r--r--nuttx/fs/nxffs/nxffs_unlink.c2
-rw-r--r--nuttx/fs/nxffs/nxffs_write.c2
-rw-r--r--nuttx/fs/romfs/fs_romfs.c6
-rw-r--r--nuttx/fs/romfs/fs_romfs.h2
-rw-r--r--nuttx/fs/romfs/fs_romfsutil.c4
56 files changed, 79 insertions, 79 deletions
diff --git a/nuttx/fs/fat/fs_configfat.c b/nuttx/fs/fat/fs_configfat.c
index 9ec7573a7..3a55a5215 100644
--- a/nuttx/fs/fat/fs_configfat.c
+++ b/nuttx/fs/fat/fs_configfat.c
@@ -44,9 +44,9 @@
#include <debug.h>
#include <errno.h>
-#include <nuttx/fs.h>
-#include <nuttx/fat.h>
-#include <nuttx/mkfatfs.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/fat.h>
+#include <nuttx/fs/mkfatfs.h>
#include "fs_internal.h"
#include "fs_fat32.h"
diff --git a/nuttx/fs/fat/fs_fat32.c b/nuttx/fs/fat/fs_fat32.c
index 909d5a2dc..2c98368a1 100644
--- a/nuttx/fs/fat/fs_fat32.c
+++ b/nuttx/fs/fat/fs_fat32.c
@@ -59,9 +59,9 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
-#include <nuttx/fat.h>
-#include <nuttx/dirent.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/fat.h>
+#include <nuttx/fs/dirent.h>
#include "fs_internal.h"
#include "fs_fat32.h"
diff --git a/nuttx/fs/fat/fs_fat32.h b/nuttx/fs/fat/fs_fat32.h
index dfdc6bef2..5b82ff701 100644
--- a/nuttx/fs/fat/fs_fat32.h
+++ b/nuttx/fs/fat/fs_fat32.h
@@ -48,7 +48,7 @@
#include <semaphore.h>
#include <time.h>
-#include <nuttx/dirent.h>
+#include <nuttx/fs/dirent.h>
/****************************************************************************
* Definitions
diff --git a/nuttx/fs/fat/fs_fat32attrib.c b/nuttx/fs/fat/fs_fat32attrib.c
index 73fd1c081..f58ed81bb 100644
--- a/nuttx/fs/fat/fs_fat32attrib.c
+++ b/nuttx/fs/fat/fs_fat32attrib.c
@@ -42,8 +42,8 @@
#include <stdint.h>
#include <errno.h>
-#include <nuttx/fs.h>
-#include <nuttx/fat.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/fat.h>
#include "fs_internal.h"
#include "fs_fat32.h"
diff --git a/nuttx/fs/fat/fs_fat32dirent.c b/nuttx/fs/fat/fs_fat32dirent.c
index 814bc3d82..742fa1eeb 100644
--- a/nuttx/fs/fat/fs_fat32dirent.c
+++ b/nuttx/fs/fat/fs_fat32dirent.c
@@ -80,8 +80,8 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/fs.h>
-#include <nuttx/fat.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/fat.h>
#include "fs_internal.h"
#include "fs_fat32.h"
diff --git a/nuttx/fs/fat/fs_fat32util.c b/nuttx/fs/fat/fs_fat32util.c
index 8324ef598..397467c41 100644
--- a/nuttx/fs/fat/fs_fat32util.c
+++ b/nuttx/fs/fat/fs_fat32util.c
@@ -57,8 +57,8 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
-#include <nuttx/fat.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/fat.h>
#include "fs_internal.h"
#include "fs_fat32.h"
diff --git a/nuttx/fs/fat/fs_mkfatfs.c b/nuttx/fs/fat/fs_mkfatfs.c
index 14d661f93..7a8b2ab92 100644
--- a/nuttx/fs/fat/fs_mkfatfs.c
+++ b/nuttx/fs/fat/fs_mkfatfs.c
@@ -45,9 +45,9 @@
#include <debug.h>
#include <errno.h>
-#include <nuttx/fs.h>
-#include <nuttx/fat.h>
-#include <nuttx/mkfatfs.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/fat.h>
+#include <nuttx/fs/mkfatfs.h>
#include "fs_internal.h"
#include "fs_fat32.h"
diff --git a/nuttx/fs/fat/fs_writefat.c b/nuttx/fs/fat/fs_writefat.c
index 714ad389e..02d55d625 100644
--- a/nuttx/fs/fat/fs_writefat.c
+++ b/nuttx/fs/fat/fs_writefat.c
@@ -44,9 +44,9 @@
#include <string.h>
#include <errno.h>
-#include <nuttx/fs.h>
-#include <nuttx/fat.h>
-#include <nuttx/mkfatfs.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/fat.h>
+#include <nuttx/fs/mkfatfs.h>
#include "fs_internal.h"
#include "fs_fat32.h"
diff --git a/nuttx/fs/fs_close.c b/nuttx/fs/fs_close.c
index d6f8bf54a..ce506725a 100644
--- a/nuttx/fs/fs_close.c
+++ b/nuttx/fs/fs_close.c
@@ -42,7 +42,7 @@
#include <unistd.h>
#include <sched.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0
# include <nuttx/net/net.h>
diff --git a/nuttx/fs/fs_closeblockdriver.c b/nuttx/fs/fs_closeblockdriver.c
index ae80f9532..c6900ee80 100644
--- a/nuttx/fs/fs_closeblockdriver.c
+++ b/nuttx/fs/fs_closeblockdriver.c
@@ -41,7 +41,7 @@
#include <debug.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_closedir.c b/nuttx/fs/fs_closedir.c
index d88bc3347..572be4053 100644
--- a/nuttx/fs/fs_closedir.c
+++ b/nuttx/fs/fs_closedir.c
@@ -43,8 +43,8 @@
#include <errno.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
-#include <nuttx/dirent.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/dirent.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_dup.c b/nuttx/fs/fs_dup.c
index df4e1affa..a72509595 100644
--- a/nuttx/fs/fs_dup.c
+++ b/nuttx/fs/fs_dup.c
@@ -43,7 +43,7 @@
#include <sched.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
/****************************************************************************
diff --git a/nuttx/fs/fs_fcntl.c b/nuttx/fs/fs_fcntl.c
index 686b83319..f0102ce8e 100644
--- a/nuttx/fs/fs_fcntl.c
+++ b/nuttx/fs/fs_fcntl.c
@@ -43,7 +43,7 @@
#include <fcntl.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/net/net.h>
#include <nuttx/sched.h>
diff --git a/nuttx/fs/fs_fdopen.c b/nuttx/fs/fs_fdopen.c
index 8201ebbae..4d3f79894 100644
--- a/nuttx/fs/fs_fdopen.c
+++ b/nuttx/fs/fs_fdopen.c
@@ -46,7 +46,7 @@
#include <errno.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/net/net.h>
/****************************************************************************
diff --git a/nuttx/fs/fs_filedup.c b/nuttx/fs/fs_filedup.c
index 84431b9b1..746c3aa61 100644
--- a/nuttx/fs/fs_filedup.c
+++ b/nuttx/fs/fs_filedup.c
@@ -42,7 +42,7 @@
#include <sched.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_files.c b/nuttx/fs/fs_files.c
index 066c9a4ef..d4dec1992 100644
--- a/nuttx/fs/fs_files.c
+++ b/nuttx/fs/fs_files.c
@@ -46,7 +46,7 @@
#include <sched.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/kmalloc.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_findblockdriver.c b/nuttx/fs/fs_findblockdriver.c
index bfe59b21d..63178a0db 100644
--- a/nuttx/fs/fs_findblockdriver.c
+++ b/nuttx/fs/fs_findblockdriver.c
@@ -42,7 +42,7 @@
#include <sys/mount.h>
#include <debug.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_fsync.c b/nuttx/fs/fs_fsync.c
index 08d47e578..6e6d81591 100644
--- a/nuttx/fs/fs_fsync.c
+++ b/nuttx/fs/fs_fsync.c
@@ -42,7 +42,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/sched.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_inode.c b/nuttx/fs/fs_inode.c
index a03448a0e..a2b9d27d8 100644
--- a/nuttx/fs/fs_inode.c
+++ b/nuttx/fs/fs_inode.c
@@ -44,7 +44,7 @@
#include <errno.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_inodeaddref.c b/nuttx/fs/fs_inodeaddref.c
index c5dea2e4c..c43f23479 100644
--- a/nuttx/fs/fs_inodeaddref.c
+++ b/nuttx/fs/fs_inodeaddref.c
@@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
/****************************************************************************
diff --git a/nuttx/fs/fs_inodefind.c b/nuttx/fs/fs_inodefind.c
index c4cbeab9e..22b8d9861 100644
--- a/nuttx/fs/fs_inodefind.c
+++ b/nuttx/fs/fs_inodefind.c
@@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_inoderelease.c b/nuttx/fs/fs_inoderelease.c
index 58aaf3659..27b36985a 100644
--- a/nuttx/fs/fs_inoderelease.c
+++ b/nuttx/fs/fs_inoderelease.c
@@ -42,7 +42,7 @@
#include <errno.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_inoderemove.c b/nuttx/fs/fs_inoderemove.c
index cdc61f66a..314596e38 100644
--- a/nuttx/fs/fs_inoderemove.c
+++ b/nuttx/fs/fs_inoderemove.c
@@ -42,7 +42,7 @@
#include <errno.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_inodereserve.c b/nuttx/fs/fs_inodereserve.c
index f1a899244..e48b2793a 100644
--- a/nuttx/fs/fs_inodereserve.c
+++ b/nuttx/fs/fs_inodereserve.c
@@ -43,7 +43,7 @@
#include <errno.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_internal.h b/nuttx/fs/fs_internal.h
index af5cd615a..326a4f8b5 100644
--- a/nuttx/fs/fs_internal.h
+++ b/nuttx/fs/fs_internal.h
@@ -46,7 +46,7 @@
#include <stdint.h>
#include <dirent.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/compiler.h>
/****************************************************************************
diff --git a/nuttx/fs/fs_mkdir.c b/nuttx/fs/fs_mkdir.c
index af5c406b5..3564ba7f6 100644
--- a/nuttx/fs/fs_mkdir.c
+++ b/nuttx/fs/fs_mkdir.c
@@ -41,7 +41,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_mount.c b/nuttx/fs/fs_mount.c
index d2e0dc961..cdb60592a 100644
--- a/nuttx/fs/fs_mount.c
+++ b/nuttx/fs/fs_mount.c
@@ -45,7 +45,7 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#ifdef CONFIG_APPS_BINDIR
# include <apps/apps.h>
diff --git a/nuttx/fs/fs_open.c b/nuttx/fs/fs_open.c
index 467eef858..1bbae2f02 100644
--- a/nuttx/fs/fs_open.c
+++ b/nuttx/fs/fs_open.c
@@ -45,7 +45,7 @@
#ifdef CONFIG_FILE_MODE
#include <stdarg.h>
#endif
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
/****************************************************************************
diff --git a/nuttx/fs/fs_openblockdriver.c b/nuttx/fs/fs_openblockdriver.c
index cd5759b45..62b33bee7 100644
--- a/nuttx/fs/fs_openblockdriver.c
+++ b/nuttx/fs/fs_openblockdriver.c
@@ -41,7 +41,7 @@
#include <debug.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_opendir.c b/nuttx/fs/fs_opendir.c
index 2783da097..f070115c4 100644
--- a/nuttx/fs/fs_opendir.c
+++ b/nuttx/fs/fs_opendir.c
@@ -46,8 +46,8 @@
#include <errno.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
-#include <nuttx/dirent.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/dirent.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_poll.c b/nuttx/fs/fs_poll.c
index b81a4d3c6..f7795a170 100644
--- a/nuttx/fs/fs_poll.c
+++ b/nuttx/fs/fs_poll.c
@@ -47,7 +47,7 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/sched.h>
#include <nuttx/clock.h>
diff --git a/nuttx/fs/fs_readdir.c b/nuttx/fs/fs_readdir.c
index 3be669abb..a1cbfb89b 100644
--- a/nuttx/fs/fs_readdir.c
+++ b/nuttx/fs/fs_readdir.c
@@ -43,8 +43,8 @@
#include <dirent.h>
#include <errno.h>
-#include <nuttx/fs.h>
-#include <nuttx/dirent.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/dirent.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_registerblockdriver.c b/nuttx/fs/fs_registerblockdriver.c
index bd5c08be4..fb5e462c2 100644
--- a/nuttx/fs/fs_registerblockdriver.c
+++ b/nuttx/fs/fs_registerblockdriver.c
@@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
/****************************************************************************
diff --git a/nuttx/fs/fs_registerdriver.c b/nuttx/fs/fs_registerdriver.c
index 053c80061..4e76adc2c 100644
--- a/nuttx/fs/fs_registerdriver.c
+++ b/nuttx/fs/fs_registerdriver.c
@@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
/****************************************************************************
diff --git a/nuttx/fs/fs_rename.c b/nuttx/fs/fs_rename.c
index 119115595..83e0ac368 100644
--- a/nuttx/fs/fs_rename.c
+++ b/nuttx/fs/fs_rename.c
@@ -41,7 +41,7 @@
#include <stdio.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_rewinddir.c b/nuttx/fs/fs_rewinddir.c
index a53da7725..271132010 100644
--- a/nuttx/fs/fs_rewinddir.c
+++ b/nuttx/fs/fs_rewinddir.c
@@ -42,8 +42,8 @@
#include <dirent.h>
#include <errno.h>
-#include <nuttx/fs.h>
-#include <nuttx/dirent.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/dirent.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_rmdir.c b/nuttx/fs/fs_rmdir.c
index 53342f4de..4a45e42ba 100644
--- a/nuttx/fs/fs_rmdir.c
+++ b/nuttx/fs/fs_rmdir.c
@@ -41,7 +41,7 @@
#include <unistd.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_seekdir.c b/nuttx/fs/fs_seekdir.c
index 6443ecd35..fa304545e 100644
--- a/nuttx/fs/fs_seekdir.c
+++ b/nuttx/fs/fs_seekdir.c
@@ -43,8 +43,8 @@
#include <dirent.h>
#include <errno.h>
-#include <nuttx/fs.h>
-#include <nuttx/dirent.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/dirent.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_select.c b/nuttx/fs/fs_select.c
index 14ccfe287..f87697310 100644
--- a/nuttx/fs/fs_select.c
+++ b/nuttx/fs/fs_select.c
@@ -49,7 +49,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_umount.c b/nuttx/fs/fs_umount.c
index d085ac4d0..05865d28e 100644
--- a/nuttx/fs/fs_umount.c
+++ b/nuttx/fs/fs_umount.c
@@ -41,7 +41,7 @@
#include <sys/mount.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_unlink.c b/nuttx/fs/fs_unlink.c
index 013718dc8..c2842ce4d 100644
--- a/nuttx/fs/fs_unlink.c
+++ b/nuttx/fs/fs_unlink.c
@@ -41,7 +41,7 @@
#include <unistd.h>
#include <errno.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_unregisterblockdriver.c b/nuttx/fs/fs_unregisterblockdriver.c
index 23860205b..ccf5a2aa9 100644
--- a/nuttx/fs/fs_unregisterblockdriver.c
+++ b/nuttx/fs/fs_unregisterblockdriver.c
@@ -39,7 +39,7 @@
#include <nuttx/config.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/fs_unregisterdriver.c b/nuttx/fs/fs_unregisterdriver.c
index 159816a6e..c891c7d02 100644
--- a/nuttx/fs/fs_unregisterdriver.c
+++ b/nuttx/fs/fs_unregisterdriver.c
@@ -39,7 +39,7 @@
#include <nuttx/config.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include "fs_internal.h"
diff --git a/nuttx/fs/nxffs/nxffs.h b/nuttx/fs/nxffs/nxffs.h
index 426bd6316..616dc7197 100644
--- a/nuttx/fs/nxffs/nxffs.h
+++ b/nuttx/fs/nxffs/nxffs.h
@@ -50,7 +50,7 @@
#include <semaphore.h>
#include <nuttx/mtd.h>
-#include <nuttx/nxffs.h>
+#include <nuttx/fs/nxffs.h>
/****************************************************************************
* Pre-processor Definitions
@@ -1038,7 +1038,7 @@ extern int nxffs_pack(FAR struct nxffs_volume_s *volume);
* Standard mountpoint operation methods
*
* Description:
- * See include/nuttx/fs.h
+ * See include/nuttx/fs/fs.h
*
* - nxffs_open() and nxffs_close() are defined in nxffs_open.c
* - nxffs_read() is defined in nxffs_read.c
diff --git a/nuttx/fs/nxffs/nxffs_dirent.c b/nuttx/fs/nxffs/nxffs_dirent.c
index 40ae8662f..562a5320b 100644
--- a/nuttx/fs/nxffs/nxffs_dirent.c
+++ b/nuttx/fs/nxffs/nxffs_dirent.c
@@ -47,9 +47,9 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/mtd.h>
-#include <nuttx/dirent.h>
+#include <nuttx/fs/dirent.h>
#include "nxffs.h"
diff --git a/nuttx/fs/nxffs/nxffs_dump.c b/nuttx/fs/nxffs/nxffs_dump.c
index 938b1276d..d816ba6ca 100644
--- a/nuttx/fs/nxffs/nxffs_dump.c
+++ b/nuttx/fs/nxffs/nxffs_dump.c
@@ -47,7 +47,7 @@
#include <crc32.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
#include <nuttx/mtd.h>
#include "nxffs.h"
diff --git a/nuttx/fs/nxffs/nxffs_initialize.c b/nuttx/fs/nxffs/nxffs_initialize.c
index da729302f..6d93a318a 100644
--- a/nuttx/fs/nxffs/nxffs_initialize.c
+++ b/nuttx/fs/nxffs/nxffs_initialize.c
@@ -48,8 +48,8 @@
#include <nuttx/kmalloc.h>
#include <nuttx/mtd.h>
-#include <nuttx/fs.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/ioctl.h>
#include "nxffs.h"
diff --git a/nuttx/fs/nxffs/nxffs_ioctl.c b/nuttx/fs/nxffs/nxffs_ioctl.c
index a70dba87c..41fabfbee 100644
--- a/nuttx/fs/nxffs/nxffs_ioctl.c
+++ b/nuttx/fs/nxffs/nxffs_ioctl.c
@@ -46,8 +46,8 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/fs.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/ioctl.h>
#include <nuttx/mtd.h>
#include "nxffs.h"
diff --git a/nuttx/fs/nxffs/nxffs_open.c b/nuttx/fs/nxffs/nxffs_open.c
index c00e2ea6d..339e25edc 100644
--- a/nuttx/fs/nxffs/nxffs_open.c
+++ b/nuttx/fs/nxffs/nxffs_open.c
@@ -50,7 +50,7 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/mtd.h>
#include "nxffs.h"
diff --git a/nuttx/fs/nxffs/nxffs_read.c b/nuttx/fs/nxffs/nxffs_read.c
index 02f7e528b..6ba49ca72 100644
--- a/nuttx/fs/nxffs/nxffs_read.c
+++ b/nuttx/fs/nxffs/nxffs_read.c
@@ -48,7 +48,7 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/mtd.h>
#include "nxffs.h"
diff --git a/nuttx/fs/nxffs/nxffs_stat.c b/nuttx/fs/nxffs/nxffs_stat.c
index be38c018f..afb18093c 100644
--- a/nuttx/fs/nxffs/nxffs_stat.c
+++ b/nuttx/fs/nxffs/nxffs_stat.c
@@ -49,7 +49,7 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/mtd.h>
#include "nxffs.h"
diff --git a/nuttx/fs/nxffs/nxffs_unlink.c b/nuttx/fs/nxffs/nxffs_unlink.c
index f2295a966..9d0d5b49e 100644
--- a/nuttx/fs/nxffs/nxffs_unlink.c
+++ b/nuttx/fs/nxffs/nxffs_unlink.c
@@ -46,7 +46,7 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/mtd.h>
#include "nxffs.h"
diff --git a/nuttx/fs/nxffs/nxffs_write.c b/nuttx/fs/nxffs/nxffs_write.c
index 02c9c5c5c..bf32b0fb4 100644
--- a/nuttx/fs/nxffs/nxffs_write.c
+++ b/nuttx/fs/nxffs/nxffs_write.c
@@ -48,7 +48,7 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
#include <nuttx/mtd.h>
#include "nxffs.h"
diff --git a/nuttx/fs/romfs/fs_romfs.c b/nuttx/fs/romfs/fs_romfs.c
index ca420939c..8a2e69665 100644
--- a/nuttx/fs/romfs/fs_romfs.c
+++ b/nuttx/fs/romfs/fs_romfs.c
@@ -56,9 +56,9 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/fs.h>
-#include <nuttx/ioctl.h>
-#include <nuttx/dirent.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/ioctl.h>
+#include <nuttx/fs/dirent.h>
#include "fs_romfs.h"
diff --git a/nuttx/fs/romfs/fs_romfs.h b/nuttx/fs/romfs/fs_romfs.h
index 111006788..f89196ff7 100644
--- a/nuttx/fs/romfs/fs_romfs.h
+++ b/nuttx/fs/romfs/fs_romfs.h
@@ -47,7 +47,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include <nuttx/dirent.h>
+#include <nuttx/fs/dirent.h>
#include "../fs_internal.h"
diff --git a/nuttx/fs/romfs/fs_romfsutil.c b/nuttx/fs/romfs/fs_romfsutil.c
index d441c0c8b..ec009da89 100644
--- a/nuttx/fs/romfs/fs_romfsutil.c
+++ b/nuttx/fs/romfs/fs_romfsutil.c
@@ -51,8 +51,8 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/ioctl.h>
-#include <nuttx/dirent.h>
+#include <nuttx/fs/ioctl.h>
+#include <nuttx/fs/dirent.h>
#include "fs_romfs.h"