diff --git a/examples/configdata/configdata_main.c b/examples/configdata/configdata_main.c
index d20bffd38..e9e730889 100644
--- a/examples/configdata/configdata_main.c
+++ b/examples/configdata/configdata_main.c
@@ -49,7 +49,7 @@
 #include <crc32.h>
 #include <debug.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/configdata.h>
 #include <nuttx/fs/ioctl.h>
 #include <sys/ioctl.h>
diff --git a/examples/flash_test/flash_test.c b/examples/flash_test/flash_test.c
index 105950557..e6c339990 100644
--- a/examples/flash_test/flash_test.c
+++ b/examples/flash_test/flash_test.c
@@ -45,7 +45,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/smart.h>
 #include <nuttx/fs/ioctl.h>
 
diff --git a/examples/mtdpart/mtdpart_main.c b/examples/mtdpart/mtdpart_main.c
index 9fcd2a76d..3c1e98437 100644
--- a/examples/mtdpart/mtdpart_main.c
+++ b/examples/mtdpart/mtdpart_main.c
@@ -46,7 +46,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
 
diff --git a/examples/nxffs/nxffs_main.c b/examples/nxffs/nxffs_main.c
index 23b02cc16..a52afea39 100644
--- a/examples/nxffs/nxffs_main.c
+++ b/examples/nxffs/nxffs_main.c
@@ -52,7 +52,7 @@
 #include <crc32.h>
 #include <debug.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/nxffs.h>
 
 /****************************************************************************
diff --git a/examples/smart/smart_main.c b/examples/smart/smart_main.c
index ce303caa7..114fb041a 100644
--- a/examples/smart/smart_main.c
+++ b/examples/smart/smart_main.c
@@ -52,7 +52,7 @@
 #include <crc32.h>
 #include <debug.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/smart.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/fs/mksmartfs.h>
diff --git a/system/flash_eraseall/flash_eraseall.c b/system/flash_eraseall/flash_eraseall.c
index e6eebad0c..824360c33 100644
--- a/system/flash_eraseall/flash_eraseall.c
+++ b/system/flash_eraseall/flash_eraseall.c
@@ -44,7 +44,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/system/ramtron/ramtron.c b/system/ramtron/ramtron.c
index 46915db46..2e1632cf1 100644
--- a/system/ramtron/ramtron.c
+++ b/system/ramtron/ramtron.c
@@ -45,7 +45,7 @@
 #include <string.h>
 
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 FAR struct mtd_dev_s *ramtron_initialize(FAR struct spi_dev_s *dev);