10 files changed, 14 insertions, 14 deletions
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"