diff --git a/audio/dsp_filter.c b/audio/dsp_filter.c
index 22bf59a8f7..2990cdea2f 100644
--- a/audio/dsp_filter.c
+++ b/audio/dsp_filter.c
@@ -22,6 +22,7 @@
 #include "filters/dspfilter.h"
 #include "../file_path.h"
 #include "../file_ext.h"
+#include "../dir_list.h"
 #include <compat/posix_string.h>
 
 #include <stdlib.h>
diff --git a/file_extract.c b/file_extract.c
index 5ab5dcfee5..709ae40383 100644
--- a/file_extract.c
+++ b/file_extract.c
@@ -16,6 +16,7 @@
 #include "file_extract.h"
 #include "file_path.h"
 #include <compat/strl.h>
+#include <retro_miscellaneous.h>
 #include "retroarch_logger.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/file_path.h b/file_path.h
index 55eb9c0290..13fe75b7d6 100644
--- a/file_path.h
+++ b/file_path.h
@@ -23,7 +23,6 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include "string_list.h"
-#include "dir_list.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c
index 9ee3c73a93..f83f41d860 100644
--- a/frontend/menu/disp/lakka.c
+++ b/frontend/menu/disp/lakka.c
@@ -27,6 +27,7 @@
 #include "menu_display.h"
 #include "../../../general.h"
 #include "../../../file_path.h"
+#include "../../../dir_list.h"
 #include "../../../gfx/gl_common.h"
 #include "../../../gfx/video_thread_wrapper.h"
 #include <compat/posix_string.h>
diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c
index 16c84f3407..1cebb8d6ca 100644
--- a/frontend/menu/menu_entries.c
+++ b/frontend/menu/menu_entries.c
@@ -18,6 +18,7 @@
 #include "menu_action.h"
 #include "menu_list.h"
 #include "../../file_path.h"
+#include "../../dir_list.h"
 #include "../../settings_data.h"
 #include "../../performance.h"
 
diff --git a/gfx/context/drm_egl_ctx.c b/gfx/context/drm_egl_ctx.c
index 7e633a827d..38bb126864 100644
--- a/gfx/context/drm_egl_ctx.c
+++ b/gfx/context/drm_egl_ctx.c
@@ -21,6 +21,7 @@
 #include "../gfx_context.h"
 #include "../gl_common.h"
 #include "../gfx_common.h"
+#include "../../dir_list.h"
 #include "../../file_path.h"
 
 #ifdef HAVE_CONFIG_H
diff --git a/gfx/filter.c b/gfx/filter.c
index 22e4820eef..9110cbe220 100644
--- a/gfx/filter.c
+++ b/gfx/filter.c
@@ -20,6 +20,7 @@
 #include "../general.h"
 #include "../file_path.h"
 #include "../file_ext.h"
+#include "../dir_list.h"
 #include "../performance.h"
 #include <stdlib.h>
 
diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c
index 432189fbbe..28af262eb3 100644
--- a/gfx/video_thread_wrapper.c
+++ b/gfx/video_thread_wrapper.c
@@ -15,6 +15,7 @@
 
 #include "video_thread_wrapper.h"
 #include "../performance.h"
+#include "../dir_list.h"
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
diff --git a/gfx/video_thread_wrapper.h b/gfx/video_thread_wrapper.h
index d36db968cb..7bd62b51a4 100644
--- a/gfx/video_thread_wrapper.h
+++ b/gfx/video_thread_wrapper.h
@@ -17,9 +17,9 @@
 #define RARCH_VIDEO_THREAD_H__
 
 #include "../driver.h"
+#include "../general.h"
 #include <boolean.h>
 #include <rthreads/rthreads.h>
-#include "../general.h"
 
 /* Starts a video driver in a new thread.
  * Access to video driver will be mediated through this driver. */
diff --git a/retroarch.c b/retroarch.c
index 53d0dc2592..7e445add0d 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -26,6 +26,7 @@
 #include "driver.h"
 #include "file.h"
 #include "file_path.h"
+#include "dir_list.h"
 #include "general.h"
 #include "dynamic.h"
 #include <compat/strl.h>