diff --git a/libretro-common/include/vfs/vfs_implementation.h b/libretro-common/include/vfs/vfs_implementation.h
index 0bf4a5cbe0..c981cf72f7 100644
--- a/libretro-common/include/vfs/vfs_implementation.h
+++ b/libretro-common/include/vfs/vfs_implementation.h
@@ -29,10 +29,6 @@
 #include <retro_environment.h>
 #include <vfs/vfs.h>
 
-#ifdef HAVE_CDROM
-#include <vfs/vfs_implementation_cdrom.h>
-#endif
-
 RETRO_BEGIN_DECLS
 
 libretro_vfs_implementation_file *retro_vfs_file_open_impl(const char *path, unsigned mode, unsigned hints);
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 234c19b2c6..2262d98d1d 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -26,6 +26,11 @@
 #include "../../config.h"
 #endif
 
+#include <vfs/vfs_implementation.h>
+#ifdef HAVE_CDROM
+#include <vfs/vfs_implementation_cdrom.h>
+#endif
+
 #ifdef HAVE_DISCORD
 #include "../../discord/discord.h"
 #endif
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 2a0e7b463f..5cb0d93fc3 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -36,6 +36,10 @@
 #include "../config.h"
 #endif
 
+#ifdef HAVE_CDROM
+#include <vfs/vfs_implementation_cdrom.h>
+#endif
+
 #include "../config.def.h"
 #include "../config.def.keybinds.h"
 
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 188901aaca..00ac97bad4 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -57,6 +57,11 @@
 #include <file/archive_file.h>
 #include <string/stdstring.h>
 
+#include <vfs/vfs_implementation.h>
+#ifdef HAVE_CDROM
+#include <vfs/vfs_implementation_cdrom.h>
+#endif
+
 #include <retro_miscellaneous.h>
 #include <streams/file_stream.h>
 #include <retro_assert.h>