diff --git a/arch/8051/src/up_initialize.c b/arch/8051/src/up_initialize.c
index 4252dd617bf..8e74921476e 100644
--- a/arch/8051/src/up_initialize.c
+++ b/arch/8051/src/up_initialize.c
@@ -42,7 +42,7 @@
 #include <stdint.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include "up_internal.h"
 
diff --git a/arch/arm/include/serial.h b/arch/arm/include/serial.h
index d539d27339d..80eefb2b4ac 100644
--- a/arch/arm/include/serial.h
+++ b/arch/arm/include/serial.h
@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <sys/types.h>
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 
 /****************************************************************************
  * Definitions
diff --git a/arch/arm/include/watchdog.h b/arch/arm/include/watchdog.h
index 263795eb3c8..f70b8d2e9a6 100644
--- a/arch/arm/include/watchdog.h
+++ b/arch/arm/include/watchdog.h
@@ -40,7 +40,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 
 /****************************************************************************
  * Definitions
diff --git a/arch/arm/src/c5471/c5471_watchdog.c b/arch/arm/src/c5471/c5471_watchdog.c
index 164cbbe2361..20b5be97c83 100644
--- a/arch/arm/src/c5471/c5471_watchdog.c
+++ b/arch/arm/src/c5471/c5471_watchdog.c
@@ -46,7 +46,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/irq.h>
 #include <arch/watchdog.h>
 
diff --git a/arch/arm/src/common/up_exit.c b/arch/arm/src/common/up_exit.c
index 926d21509bc..6f6d54f767a 100644
--- a/arch/arm/src/common/up_exit.c
+++ b/arch/arm/src/common/up_exit.c
@@ -47,7 +47,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c
index 8bf530fda8d..20c23ef677c 100644
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramlog.h>
 
 #include <arch/board/board.h>
diff --git a/arch/avr/src/common/up_exit.c b/arch/avr/src/common/up_exit.c
index d7104c5da4e..1c41b7496c6 100644
--- a/arch/avr/src/common/up_exit.c
+++ b/arch/avr/src/common/up_exit.c
@@ -47,7 +47,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c
index 58d243ee5fd..3b86fd05825 100644
--- a/arch/avr/src/common/up_initialize.c
+++ b/arch/avr/src/common/up_initialize.c
@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramlog.h>
 
 #include <arch/board/board.h>
diff --git a/arch/hc/src/common/up_exit.c b/arch/hc/src/common/up_exit.c
index 77c627b4a44..5b85ffe68ea 100644
--- a/arch/hc/src/common/up_exit.c
+++ b/arch/hc/src/common/up_exit.c
@@ -47,7 +47,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c
index 5481ed7bc72..a2cf078e93f 100755
--- a/arch/hc/src/common/up_initialize.c
+++ b/arch/hc/src/common/up_initialize.c
@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramlog.h>
 
 #include "up_arch.h"
diff --git a/arch/mips/src/common/up_exit.c b/arch/mips/src/common/up_exit.c
index f82b4733043..876b486b63a 100644
--- a/arch/mips/src/common/up_exit.c
+++ b/arch/mips/src/common/up_exit.c
@@ -49,7 +49,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c
index 11bd979f0ef..fa8e5cf5dcc 100644
--- a/arch/mips/src/common/up_initialize.c
+++ b/arch/mips/src/common/up_initialize.c
@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramlog.h>
 
 #include <arch/board/board.h>
diff --git a/arch/rgmp/src/bridge.c b/arch/rgmp/src/bridge.c
index 7dcaf90f171..96280a7bf6c 100644
--- a/arch/rgmp/src/bridge.c
+++ b/arch/rgmp/src/bridge.c
@@ -39,7 +39,7 @@
 
 #include <sys/types.h>
 #include <stdbool.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/kmalloc.h>
 #include <fs_internal.h>
 #include <queue.h>
diff --git a/arch/sh/include/serial.h b/arch/sh/include/serial.h
index 5cb942c1cee..09073e14495 100644
--- a/arch/sh/include/serial.h
+++ b/arch/sh/include/serial.h
@@ -40,7 +40,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 
 /****************************************************************************
  * Definitions
diff --git a/arch/sh/src/common/up_exit.c b/arch/sh/src/common/up_exit.c
index 29213ce9d51..fc1991db13e 100644
--- a/arch/sh/src/common/up_exit.c
+++ b/arch/sh/src/common/up_exit.c
@@ -48,7 +48,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/sh/src/common/up_initialize.c b/arch/sh/src/common/up_initialize.c
index 837b218a042..ffdfbb4eee4 100644
--- a/arch/sh/src/common/up_initialize.c
+++ b/arch/sh/src/common/up_initialize.c
@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramlog.h>
 
 #include "up_arch.h"
diff --git a/arch/sim/src/up_devconsole.c b/arch/sim/src/up_devconsole.c
index afc0c0481f2..a2406f232b5 100644
--- a/arch/sim/src/up_devconsole.c
+++ b/arch/sim/src/up_devconsole.c
@@ -42,7 +42,7 @@
 #include <sys/types.h>
 #include <stdbool.h>
 
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include "up_internal.h"
 
diff --git a/arch/sim/src/up_initialize.c b/arch/sim/src/up_initialize.c
index 66fb11b9aa8..3e2f0695886 100644
--- a/arch/sim/src/up_initialize.c
+++ b/arch/sim/src/up_initialize.c
@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramlog.h>
 
 #include "up_internal.h"
diff --git a/arch/sim/src/up_touchscreen.c b/arch/sim/src/up_touchscreen.c
index 55f060d3fd6..f89371cbfb4 100644
--- a/arch/sim/src/up_touchscreen.c
+++ b/arch/sim/src/up_touchscreen.c
@@ -54,7 +54,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 
 #include <nuttx/input/touchscreen.h>
 
diff --git a/arch/x86/src/common/up_exit.c b/arch/x86/src/common/up_exit.c
index ceca72c878d..840464da162 100644
--- a/arch/x86/src/common/up_exit.c
+++ b/arch/x86/src/common/up_exit.c
@@ -47,7 +47,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c
index eb0cdccc19a..f58fd00a6b4 100644
--- a/arch/x86/src/common/up_initialize.c
+++ b/arch/x86/src/common/up_initialize.c
@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/ramlog.h>
 
 #include <arch/board/board.h>
diff --git a/arch/z16/src/common/up_exit.c b/arch/z16/src/common/up_exit.c
index 512dcd747f0..be5411b1f95 100644
--- a/arch/z16/src/common/up_exit.c
+++ b/arch/z16/src/common/up_exit.c
@@ -49,7 +49,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c
index 165f0ead365..968e8e8f0ad 100644
--- a/arch/z16/src/common/up_initialize.c
+++ b/arch/z16/src/common/up_initialize.c
@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/mm.h>
 #include <nuttx/ramlog.h>
 
diff --git a/arch/z80/include/serial.h b/arch/z80/include/serial.h
index 0a54e5849ee..91a0184c4ff 100644
--- a/arch/z80/include/serial.h
+++ b/arch/z80/include/serial.h
@@ -40,7 +40,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/ioctl.h>
+#include <nuttx/fs/ioctl.h>
 
 /****************************************************************************
  * Definitions
diff --git a/arch/z80/src/common/up_exit.c b/arch/z80/src/common/up_exit.c
index da49ce37741..f57fd442c7d 100644
--- a/arch/z80/src/common/up_exit.c
+++ b/arch/z80/src/common/up_exit.c
@@ -50,7 +50,7 @@
 #include "up_internal.h"
 
 #ifdef CONFIG_DUMP_ON_EXIT
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #endif
 
 /****************************************************************************
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index a4659a2e93c..1ae92783189 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -42,7 +42,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/fs.h>
+#include <nuttx/fs/fs.h>
 #include <nuttx/mm.h>
 #include <arch/board/board.h>