diff --git a/command_event.c b/command_event.c
index f724535f78..888906d07a 100644
--- a/command_event.c
+++ b/command_event.c
@@ -16,6 +16,7 @@
 #include <ctype.h>
 
 #include <compat/strl.h>
+#include <file/file_path.h>
 #include <file/dir_list.h>
 #include <string/stdstring.h>
 
diff --git a/dir_list_special.h b/dir_list_special.h
index 6e28b983c2..8ed3f969dd 100644
--- a/dir_list_special.h
+++ b/dir_list_special.h
@@ -19,8 +19,6 @@
 
 #include <stdint.h>
 
-#include <file/file_path.h>
-
 #include <string/string_list.h>
 
 enum dir_list_type
@@ -34,6 +32,7 @@ enum dir_list_type
    DIR_LIST_SHADERS
 };
 
-struct string_list *dir_list_new_special(const char *input_dir, enum dir_list_type type, const char *filter);
+struct string_list *dir_list_new_special(const char *input_dir,
+      enum dir_list_type type, const char *filter);
 
 #endif
diff --git a/tasks/task_database.c b/tasks/task_database.c
index 7be4bc252d..c38c79cd22 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -18,7 +18,7 @@
 #include <retro_endianness.h>
 #include <string/stdstring.h>
 #include <file/dir_list.h>
-
+#include <file/file_path.h>
 #include <queues/message_queue.h>
 
 #include "tasks.h"
diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c
index f079b351fd..22c1effec1 100644
--- a/tasks/task_database_cue.c
+++ b/tasks/task_database_cue.c
@@ -19,6 +19,7 @@
 
 #include <compat/strcasestr.h>
 #include <compat/strl.h>
+#include <file/file_path.h>
 #include <retro_endianness.h>
 #include <retro_file.h>
 #include <string/stdstring.h>