diff --git a/libretro-common/file/memory_stream.c b/libretro-common/file/memory_stream.c
index 9e0de2dd3d..35a817723d 100644
--- a/libretro-common/file/memory_stream.c
+++ b/libretro-common/file/memory_stream.c
@@ -23,11 +23,11 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+
 #include <file/memory_stream.h>
 
-static uint8_t* g_buffer = NULL;
-static size_t g_size = 0;
-
+static uint8_t* g_buffer     = NULL;
+static size_t g_size         = 0;
 static size_t last_file_size = 0;
 
 struct memstream
diff --git a/libretro-common/file/retro_file.c b/libretro-common/file/retro_file.c
index 9f41b3fe5f..470e0f76ae 100644
--- a/libretro-common/file/retro_file.c
+++ b/libretro-common/file/retro_file.c
@@ -1,3 +1,24 @@
+/* Copyright  (C) 2010-2015 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (retro_file.c).
+ * ---------------------------------------------------------------------------------------
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libretro-common/file/retro_stat.c b/libretro-common/file/retro_stat.c
index efa5fcf722..63e33a42b9 100644
--- a/libretro-common/file/retro_stat.c
+++ b/libretro-common/file/retro_stat.c
@@ -21,6 +21,7 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #if defined(_WIN32)
@@ -60,10 +61,6 @@
 #endif
 
 #include <file/file_path.h>
-
-#include <compat/strl.h>
-#include <compat/posix_string.h>
-#include <retro_assert.h>
 #include <retro_miscellaneous.h>
 
 #if defined(__CELLOS_LV2__)