diff --git a/libretro-common/include/file/memory_stream.h b/libretro-common/include/streams/memory_stream.h
similarity index 100%
rename from libretro-common/include/file/memory_stream.h
rename to libretro-common/include/streams/memory_stream.h
diff --git a/libretro-common/file/memory_stream.c b/libretro-common/streams/memory_stream.c
similarity index 97%
rename from libretro-common/file/memory_stream.c
rename to libretro-common/streams/memory_stream.c
index 35a817723d..745ae7e086 100644
--- a/libretro-common/file/memory_stream.c
+++ b/libretro-common/streams/memory_stream.c
@@ -1,4 +1,4 @@
-/* Copyright  (C) 2010-2015 The RetroArch team
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
  * ---------------------------------------------------------------------------------------
  * The following license statement only applies to this file (memory_stream.c).
@@ -20,11 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include <file/memory_stream.h>
+#include <streams/memory_stream.h>
 
 static uint8_t* g_buffer     = NULL;
 static size_t g_size         = 0;