diff --git a/configs/ea3131/src/up_fillpage.c b/configs/ea3131/src/up_fillpage.c
index 531675aa012..356ea599a93 100644
--- a/configs/ea3131/src/up_fillpage.c
+++ b/configs/ea3131/src/up_fillpage.c
@@ -64,7 +64,7 @@
 
 #if defined(CONFIG_PAGING_M25PX) || defined(CONFIG_PAGING_AT45DB)
 #  include <sys/ioctl.h>
-#  include <nuttx/ioctl.h>
+#  include <nuttx/fs/ioctl.h>
 #  include <nuttx/spi.h>
 #  include <nuttx/mtd.h>
 #endif
diff --git a/configs/ea3131/src/up_usbmsc.c b/configs/ea3131/src/up_usbmsc.c
index 422ff36038e..b1d07ac55f9 100644
--- a/configs/ea3131/src/up_usbmsc.c
+++ b/configs/ea3131/src/up_usbmsc.c
@@ -46,8 +46,8 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include <nuttx/fs.h>
-#include <nuttx/mkfatfs.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/mkfatfs.h>
 #include <nuttx/ramdisk.h>
 
 /****************************************************************************
diff --git a/configs/ea3152/src/up_fillpage.c b/configs/ea3152/src/up_fillpage.c
index d1de9a69943..019dd940c6e 100644
--- a/configs/ea3152/src/up_fillpage.c
+++ b/configs/ea3152/src/up_fillpage.c
@@ -64,7 +64,7 @@
 
 #if defined(CONFIG_PAGING_M25PX) || defined(CONFIG_PAGING_AT45DB)
 #  include <sys/ioctl.h>
-#  include <nuttx/ioctl.h>
+#  include <nuttx/fs/ioctl.h>
 #  include <nuttx/spi.h>
 #  include <nuttx/mtd.h>
 #endif
diff --git a/configs/ea3152/src/up_usbmsc.c b/configs/ea3152/src/up_usbmsc.c
index db92e5b9e7e..2c3356b4e75 100644
--- a/configs/ea3152/src/up_usbmsc.c
+++ b/configs/ea3152/src/up_usbmsc.c
@@ -46,8 +46,8 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include <nuttx/fs.h>
-#include <nuttx/mkfatfs.h>
+#include <nuttx/fs/fs.h>
+#include <nuttx/fs/mkfatfs.h>
 #include <nuttx/ramdisk.h>
 
 /****************************************************************************
diff --git a/configs/stm3210e-eval/RIDE/nuttx.rdb b/configs/stm3210e-eval/RIDE/nuttx.rdb
index 5a4c7145cef..935e97e4535 100755
Binary files a/configs/stm3210e-eval/RIDE/nuttx.rdb and b/configs/stm3210e-eval/RIDE/nuttx.rdb differ
diff --git a/configs/vsn/src/sif.c b/configs/vsn/src/sif.c
index e185d8d0df0..0269ebcab24 100644
--- a/configs/vsn/src/sif.c
+++ b/configs/vsn/src/sif.c
@@ -69,7 +69,7 @@
  **/
 
 #include <nuttx/config.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <semaphore.h>
 #include <nuttx/clock.h>
 #include <nuttx/time.h>