diff --git a/gfx/gfx_display.h b/gfx/gfx_display.h
index 8137863362..9b43b9c56f 100644
--- a/gfx/gfx_display.h
+++ b/gfx/gfx_display.h
@@ -30,7 +30,6 @@
 #include <gfx/math/matrix_4x4.h>
 
 #include "../retroarch.h"
-#include "../file_path_special.h"
 #include "../gfx/font_driver.h"
 
 RETRO_BEGIN_DECLS
diff --git a/gfx/gfx_widgets.c b/gfx/gfx_widgets.c
index e040af1dc1..9a00444211 100644
--- a/gfx/gfx_widgets.c
+++ b/gfx/gfx_widgets.c
@@ -33,6 +33,7 @@
 #include "font_driver.h"
 
 #include "../configuration.h"
+#include "../file_path_special.h"
 #include "../msg_hash.h"
 
 #include "../tasks/task_content.h"
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 65a1b25cc4..c69c51c82f 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -43,6 +43,7 @@
 #include "../../config.def.h"
 #include "../../config.def.keybinds.h"
 #include "../../driver.h"
+#include "../../file_path_special.h"
 
 #include "../menu_driver.h"
 #include "../menu_cbs.h"
diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index 87c8f099b0..bdd5ca6053 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "../../configuration.h"
+#include "../../file_path_special.h"
 #include "../../core.h"
 #include "../../core_info.h"
 #include "../../core_option_manager.h"
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index 1aa4c79639..9830e7bac0 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -22,8 +22,9 @@
 #include "../menu_driver.h"
 #include "../menu_cbs.h"
 
-#include "../../retroarch.h"
 #include "../../configuration.h"
+#include "../../file_path_special.h"
+#include "../../retroarch.h"
 #include "../../core_option_manager.h"
 #include "../../core_info.h"
 
diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c
index 60ecb26950..377b050451 100644
--- a/menu/drivers/ozone.c
+++ b/menu/drivers/ozone.c
@@ -34,6 +34,7 @@
 #include <array/rhmap.h>
 
 #include "../../config.def.h"
+#include "../../file_path_special.h"
 
 #if 0
 #include "../../discord/discord.h"
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 647530abe9..74d1a21ab6 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -51,6 +51,7 @@
 #include "../../input/input_osk.h"
 
 #include "../../configuration.h"
+#include "../../file_path_special.h"
 #include "../../gfx/drivers_font_renderer/bitmap.h"
 
 #ifdef HAVE_LANGEXTRA
diff --git a/menu/menu_contentless_cores.c b/menu/menu_contentless_cores.c
index dc3759a39e..4adbad1a10 100644
--- a/menu/menu_contentless_cores.c
+++ b/menu/menu_contentless_cores.c
@@ -23,6 +23,7 @@
 
 #include "menu_driver.h"
 #include "menu_displaylist.h"
+#include "../file_path_special.h"
 #include "../retroarch.h"
 #include "../core_info.h"
 #include "../configuration.h"
diff --git a/menu/menu_explore.c b/menu/menu_explore.c
index 749a1c602a..5762e1607a 100644
--- a/menu/menu_explore.c
+++ b/menu/menu_explore.c
@@ -15,18 +15,21 @@
  */
 
 #include <stddef.h>
-#include "menu_driver.h"
-#include "menu_cbs.h"
-#include "../retroarch.h"
-#include "../configuration.h"
-#include "../playlist.h"
-#include "../libretro-db/libretrodb.h"
-#include "../tasks/tasks_internal.h"
+
 #include <compat/strcasestr.h>
 #include <compat/strl.h>
 #include <array/rbuf.h>
 #include <array/rhmap.h>
 
+#include "menu_driver.h"
+#include "menu_cbs.h"
+#include "../retroarch.h"
+#include "../configuration.h"
+#include "../file_path_special.h"
+#include "../playlist.h"
+#include "../libretro-db/libretrodb.h"
+#include "../tasks/tasks_internal.h"
+
 #define EX_ARENA_ALIGNMENT 8
 #define EX_ARENA_BLOCK_SIZE (64 * 1024)
 #define EX_ARENA_ALIGN_UP(n, a) (((n) + (a) - 1) & ~((a) - 1))