diff --git a/configs/cloudctrl/src/up_w25.c b/configs/cloudctrl/src/up_w25.c
index e4df22a1732..b9e018a9008 100644
--- a/configs/cloudctrl/src/up_w25.c
+++ b/configs/cloudctrl/src/up_w25.c
@@ -50,7 +50,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
 
diff --git a/configs/ea3131/src/up_fillpage.c b/configs/ea3131/src/up_fillpage.c
index eaed9a8a2c9..35ba2065670 100644
--- a/configs/ea3131/src/up_fillpage.c
+++ b/configs/ea3131/src/up_fillpage.c
@@ -66,7 +66,7 @@
 #  include <sys/ioctl.h>
 #  include <nuttx/fs/ioctl.h>
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 /****************************************************************************
diff --git a/configs/ea3152/src/up_fillpage.c b/configs/ea3152/src/up_fillpage.c
index 9f470ee320e..3b9f02a8840 100644
--- a/configs/ea3152/src/up_fillpage.c
+++ b/configs/ea3152/src/up_fillpage.c
@@ -66,7 +66,7 @@
 #  include <sys/ioctl.h>
 #  include <nuttx/fs/ioctl.h>
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 /****************************************************************************
diff --git a/configs/fire-stm32v2/src/up_w25.c b/configs/fire-stm32v2/src/up_w25.c
index 56bbde63440..bfd27cd1f32 100644
--- a/configs/fire-stm32v2/src/up_w25.c
+++ b/configs/fire-stm32v2/src/up_w25.c
@@ -49,7 +49,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
 
diff --git a/configs/hymini-stm32v/src/up_nsh.c b/configs/hymini-stm32v/src/up_nsh.c
index e8019ae0871..a28ffb0e96e 100644
--- a/configs/hymini-stm32v/src/up_nsh.c
+++ b/configs/hymini-stm32v/src/up_nsh.c
@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_STM32_SDIO
diff --git a/configs/lpc4330-xplorer/src/up_nsh.c b/configs/lpc4330-xplorer/src/up_nsh.c
index a09acd771c5..3a7fa83cd4e 100644
--- a/configs/lpc4330-xplorer/src/up_nsh.c
+++ b/configs/lpc4330-xplorer/src/up_nsh.c
@@ -47,7 +47,7 @@
 #include "chip.h"
 
 #ifdef CONFIG_LPC43_SPIFI
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include "lpc43_spifi.h"
 
 #  ifdef CONFIG_SPFI_NXFFS
diff --git a/configs/mikroe-stm32f4/src/up_nsh.c b/configs/mikroe-stm32f4/src/up_nsh.c
index cfb41a28382..9abd860540b 100644
--- a/configs/mikroe-stm32f4/src/up_nsh.c
+++ b/configs/mikroe-stm32f4/src/up_nsh.c
@@ -52,7 +52,7 @@
 #endif
 
 #ifdef CONFIG_MTD_M25P
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_SYSTEM_USBMONITOR
diff --git a/configs/mirtoo/src/up_nsh.c b/configs/mirtoo/src/up_nsh.c
index 482e91445c4..f81104c2bd0 100644
--- a/configs/mirtoo/src/up_nsh.c
+++ b/configs/mirtoo/src/up_nsh.c
@@ -49,7 +49,7 @@
 
 #ifdef CONFIG_PIC32MX_SPI2
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
 
diff --git a/configs/sama5d3x-ek/src/sam_at24.c b/configs/sama5d3x-ek/src/sam_at24.c
index 961b3d78796..e935672cab7 100644
--- a/configs/sama5d3x-ek/src/sam_at24.c
+++ b/configs/sama5d3x-ek/src/sam_at24.c
@@ -65,7 +65,7 @@
 #include <debug.h>
 
 #include <nuttx/i2c.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/nxffs.h>
 
 #include "sama5d3x-ek.h"
diff --git a/configs/sama5d3x-ek/src/sam_at25.c b/configs/sama5d3x-ek/src/sam_at25.c
index 680c11c0fc2..4ecef3cf137 100644
--- a/configs/sama5d3x-ek/src/sam_at25.c
+++ b/configs/sama5d3x-ek/src/sam_at25.c
@@ -47,7 +47,7 @@
 #include <debug.h>
 
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/nxffs.h>
 
 #include "sam_spi.h"
diff --git a/configs/shenzhou/src/up_w25.c b/configs/shenzhou/src/up_w25.c
index dfbb18ef990..6dcfe093af0 100644
--- a/configs/shenzhou/src/up_w25.c
+++ b/configs/shenzhou/src/up_w25.c
@@ -49,7 +49,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
 
diff --git a/configs/spark/src/up_composite.c b/configs/spark/src/up_composite.c
index 8cb3470571d..a82ad75dc81 100644
--- a/configs/spark/src/up_composite.c
+++ b/configs/spark/src/up_composite.c
@@ -50,7 +50,7 @@
 
 #ifdef CONFIG_MTD_SST25
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <sys/mount.h>
 #endif
 
diff --git a/configs/spark/src/up_nsh.c b/configs/spark/src/up_nsh.c
index 1fb2b4846ab..45bd8f5e4d7 100644
--- a/configs/spark/src/up_nsh.c
+++ b/configs/spark/src/up_nsh.c
@@ -50,7 +50,7 @@
 
 #ifdef CONFIG_MTD_SST25
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <sys/mount.h>
 #endif
 
diff --git a/configs/stm3210e-eval/src/up_nsh.c b/configs/stm3210e-eval/src/up_nsh.c
index 95f919fac3d..6caa12dbdf9 100644
--- a/configs/stm3210e-eval/src/up_nsh.c
+++ b/configs/stm3210e-eval/src/up_nsh.c
@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_STM32_SDIO
diff --git a/configs/stm3220g-eval/src/up_nsh.c b/configs/stm3220g-eval/src/up_nsh.c
index afdd0179819..37becd242c2 100644
--- a/configs/stm3220g-eval/src/up_nsh.c
+++ b/configs/stm3220g-eval/src/up_nsh.c
@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_STM32_SDIO
diff --git a/configs/stm3240g-eval/src/up_nsh.c b/configs/stm3240g-eval/src/up_nsh.c
index 3b1038747d6..a0add13b484 100644
--- a/configs/stm3240g-eval/src/up_nsh.c
+++ b/configs/stm3240g-eval/src/up_nsh.c
@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_STM32_SDIO