diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c
index 46ee65a9d5..dbdf4e98ca 100644
--- a/drivers/mmcsd/mmcsd_sdio.c
+++ b/drivers/mmcsd/mmcsd_sdio.c
@@ -61,7 +61,7 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/clock.h>
 #include <nuttx/arch.h>
-#include <nuttx/rwbuffer.h>
+#include <nuttx/drivers/rwbuffer.h>
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index 7fa0c5f4a0..13f832c351 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -53,7 +53,7 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/mtd/mtd.h>
-#include <nuttx/rwbuffer.h>
+#include <nuttx/drivers/rwbuffer.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/drivers/mtd/mtd_rwbuffer.c b/drivers/mtd/mtd_rwbuffer.c
index c152bc5f75..8d2ffc2d47 100644
--- a/drivers/mtd/mtd_rwbuffer.c
+++ b/drivers/mtd/mtd_rwbuffer.c
@@ -52,7 +52,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/rwbuffer.h>
+#include <nuttx/drivers/rwbuffer.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/mtd/mtd.h>
 
diff --git a/drivers/rwbuffer.c b/drivers/rwbuffer.c
index fd5b6e53ee..a7db82e156 100644
--- a/drivers/rwbuffer.c
+++ b/drivers/rwbuffer.c
@@ -52,7 +52,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/rwbuffer.h>
+#include <nuttx/drivers/rwbuffer.h>
 
 #if defined(CONFIG_DRVR_WRITEBUFFER) || defined(CONFIG_DRVR_READAHEAD)
 
diff --git a/include/nuttx/rwbuffer.h b/include/nuttx/drivers/rwbuffer.h
similarity index 97%
rename from include/nuttx/rwbuffer.h
rename to include/nuttx/drivers/rwbuffer.h
index c658117b68..ebb45ab8a4 100644
--- a/include/nuttx/rwbuffer.h
+++ b/include/nuttx/drivers/rwbuffer.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/rwbuffer.h
+ * include/nuttx/drivers/rwbuffer.h
  *
  *   Copyright (C) 2009, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_RWBUFFER_H
-#define __INCLUDE_NUTTX_RWBUFFER_H
+#ifndef __INCLUDE_NUTTX_DRIVERS_RWBUFFER_H
+#define __INCLUDE_NUTTX_DRIVERS_RWBUFFER_H
 
 /****************************************************************************
  * Included Files
@@ -208,4 +208,4 @@ int rwb_invalidate(FAR struct rwbuffer_s *rwb,
 #endif
 
 #endif /* CONFIG_DRVR_WRITEBUFFER || CONFIG_DRVR_READAHEAD */
-#endif /* __INCLUDE_NUTTX_RWBUFFER_H */
+#endif /* __INCLUDE_NUTTX_DRIVERS_RWBUFFER_H */