diff --git a/database_info.c b/database_info.c
index 0a39bd8df4..64380f1d12 100644
--- a/database_info.c
+++ b/database_info.c
@@ -15,11 +15,12 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "file_ext.h"
-#include "dir_list_special.h"
 #include <file/file_extract.h>
 #include <rhash.h>
 
+#include "file_ext.h"
+#include "dir_list_special.h"
+
 #include "database_info.h"
 #include "file_ops.h"
 #include "general.h"
diff --git a/menu/menu.c b/menu/menu.c
index 272b729baf..8fd7b3984e 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -14,6 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <file/file_path.h>
+
 #include "menu.h"
 #include "menu_display.h"
 #include "menu_entry.h"
@@ -22,7 +24,6 @@
 #include "../frontend/frontend.h"
 #include "../../retroarch.h"
 #include "../../performance.h"
-#include <file/file_path.h>
 
 static void menu_environment_get(int *argc, char *argv[],
       void *args, void *params_data)