diff --git a/ChangeLog b/ChangeLog
index d59af9668f..76a55e2c53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6191,4 +6191,6 @@
 	  (2013-12-10).
 	* include/nuttx/fs/smart.h:  Move smart.h to include/fs/smart.h
 	  (2013-12-10).
+	* include/nuttx/fs/ramdisk.h:  Move ramdisk.h to include/fs/ramdisk.h
+	  (2013012-10).
 
diff --git a/arch/sim/src/up_blockdevice.c b/arch/sim/src/up_blockdevice.c
index edcb6f3774..abfda4a6ab 100644
--- a/arch/sim/src/up_blockdevice.c
+++ b/arch/sim/src/up_blockdevice.c
@@ -44,7 +44,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <nuttx/ramdisk.h>
+#include <nuttx/fs/ramdisk.h>
 
 #include "up_internal.h"
 
diff --git a/configs/ea3131/src/up_usbmsc.c b/configs/ea3131/src/up_usbmsc.c
index 80f8eee9bb..66bdda6f66 100644
--- a/configs/ea3131/src/up_usbmsc.c
+++ b/configs/ea3131/src/up_usbmsc.c
@@ -49,7 +49,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/mkfatfs.h>
-#include <nuttx/ramdisk.h>
+#include <nuttx/fs/ramdisk.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/configs/ea3152/src/up_usbmsc.c b/configs/ea3152/src/up_usbmsc.c
index 66fb116942..6a358ca1d7 100644
--- a/configs/ea3152/src/up_usbmsc.c
+++ b/configs/ea3152/src/up_usbmsc.c
@@ -49,7 +49,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/mkfatfs.h>
-#include <nuttx/ramdisk.h>
+#include <nuttx/fs/ramdisk.h>
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 878d8120dd..2d244723c5 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -41,7 +41,7 @@ config RAMDISK
 	---help---
 		Can be used to set up a block of memory or (read-only) FLASH as
 		a block driver that can be mounted as a files system.  See
-		include/nuttx/ramdisk.h.
+		include/nuttx/fs/ramdisk.h.
 
 menuconfig CAN
 	bool "CAN Driver Support"
diff --git a/drivers/README.txt b/drivers/README.txt
index d4c3982e32..df5d13fefb 100644
--- a/drivers/README.txt
+++ b/drivers/README.txt
@@ -34,7 +34,7 @@ pwm.c
 ramdisk.c
   Can be used to set up a block of memory or (read-only) FLASH as
   a block driver that can be mounted as a files system.  See
-  include/nuttx/ramdisk.h.
+  include/nuttx/fs/ramdisk.h.
 
 ramlog.c
   This is a driver that was intended to support debugging output,
diff --git a/drivers/ramdisk.c b/drivers/ramdisk.c
index 91912b25c2..7d5d871a1b 100644
--- a/drivers/ramdisk.c
+++ b/drivers/ramdisk.c
@@ -51,7 +51,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/ramdisk.h>
+#include <nuttx/fs/ramdisk.h>
 
 /****************************************************************************
  * Private Definitions
diff --git a/include/nuttx/ramdisk.h b/include/nuttx/fs/ramdisk.h
similarity index 94%
rename from include/nuttx/ramdisk.h
rename to include/nuttx/fs/ramdisk.h
index 7d4017c119..d00a0e2d52 100644
--- a/include/nuttx/ramdisk.h
+++ b/include/nuttx/fs/ramdisk.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * include/nuttx/ramdisk.h
+ * include/nuttx/fs/ramdisk.h
  *
- *   Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_RAMDISK_H
-#define __INCLUDE_NUTTX_RAMDISK_H
+#ifndef __INCLUDE_NUTTX_FS_RAMDISK_H
+#define __INCLUDE_NUTTX_FS_RAMDISK_H
 
 /****************************************************************************
  * Included Files
@@ -96,4 +96,4 @@ EXTERN int romdisk_register(int minor, FAR uint8_t *buffer, uint32_t nsectors,
 }
 #endif
 
-#endif /* __INCLUDE_NUTTX_RAMDISK_H */
+#endif /* __INCLUDE_NUTTX_FS_RAMDISK_H */
diff --git a/include/nuttx/fs/smart.h b/include/nuttx/fs/smart.h
index 7ec7de5583..6553e34172 100644
--- a/include/nuttx/fs/smart.h
+++ b/include/nuttx/fs/smart.h
@@ -86,7 +86,7 @@ struct smart_read_write_s
   uint16_t logsector;     /* The logical sector number */
   uint16_t offset;        /* Offset within the sector to write to */
   uint16_t count;         /* Number of bytes to write */
-  const uint8_t *buffer;        /* Pointer to the data to write */
+  const uint8_t *buffer;  /* Pointer to the data to write */
 };
 
 /****************************************************************************