diff --git a/libretro-common/file/file_extract.c b/libretro-common/file/file_extract.c
index e5a170755c..802c0c8e7e 100644
--- a/libretro-common/file/file_extract.c
+++ b/libretro-common/file/file_extract.c
@@ -55,12 +55,13 @@ struct zlib_file_backend
 #endif
 
 #ifdef HAVE_MMAP
-#include <sys/mman.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
 
+#include <sys/mman.h>
+#include <sys/stat.h>
+
 typedef struct
 {
    int fd;
diff --git a/libretro-common/file/file_list.c b/libretro-common/file/file_list.c
index 51c31832fe..49853aee80 100644
--- a/libretro-common/file/file_list.c
+++ b/libretro-common/file/file_list.c
@@ -25,7 +25,6 @@
 
 #include <file/file_list.h>
 #include <compat/strcasestr.h>
-#include <compat/posix_string.h>
 
 void file_list_push(file_list_t *list,
       const char *path, const char *label,
diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c
index 7d12109ad4..7b5d7f21ee 100644
--- a/libretro-common/file/file_path.c
+++ b/libretro-common/file/file_path.c
@@ -31,8 +31,6 @@
 #include <kernel/image.h>
 #endif
 
-#include <retro_stat.h>
-
 #include <file/file_path.h>
 
 #include <compat/strl.h>
diff --git a/libretro-common/file/retro_dirent.c b/libretro-common/file/retro_dirent.c
index c46fed808e..456ebe5f9f 100644
--- a/libretro-common/file/retro_dirent.c
+++ b/libretro-common/file/retro_dirent.c
@@ -1,4 +1,24 @@
-#include <retro_dirent.h>
+/* Copyright  (C) 2010-2015 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (retro_dirent.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 <stdlib.h>
 #include <stdio.h>
@@ -35,8 +55,8 @@
 #endif
 
 #include <boolean.h>
-#include <file/file_path.h>
 #include <retro_stat.h>
+#include <retro_dirent.h>
 
 struct RDIR
 {