diff --git a/Makefile b/Makefile
index 14ed31ebbd..6b50978777 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@ ifneq ($(findstring Linux,$(OS)),)
 endif
 
 ifeq ($(HAVE_RGUI), 1)
-   OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_context.o frontend/menu/file_list.o frontend/menu/rgui.o frontend/menu/history.o
+   OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_context.o file_list.o frontend/menu/rgui.o frontend/menu/history.o
 	DEFINES += -DHAVE_MENU
 endif
 
diff --git a/Makefile.emscripten b/Makefile.emscripten
index dae7328b91..8a7944930e 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -67,7 +67,7 @@ endif
 
 ifeq ($(HAVE_RGUI), 1)
    DEFINES += -DHAVE_RGUI
-   OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_context.o frontend/menu/file_list.o frontend/menu/rgui.o frontend/menu/history.o
+   OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_context.o file_list.o frontend/menu/rgui.o frontend/menu/history.o
 endif
 
 ifeq ($(HAVE_SDL), 1)
diff --git a/Makefile.win b/Makefile.win
index f89322431c..6c0addfa32 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -102,7 +102,7 @@ JLIBS =
 
 ifeq ($(HAVE_RGUI), 1)
    DEFINES += -DHAVE_RGUI -DHAVE_MENU
-   OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_context.o frontend/menu/file_list.o frontend/menu/rgui.o frontend/menu/history.o
+   OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_context.o file_list.o frontend/menu/rgui.o frontend/menu/history.o
 endif
 
 ifeq ($(HAVE_SDL), 1)
diff --git a/frontend/menu/file_list.c b/file_list.c
similarity index 100%
rename from frontend/menu/file_list.c
rename to file_list.c
diff --git a/frontend/menu/file_list.h b/file_list.h
similarity index 100%
rename from frontend/menu/file_list.h
rename to file_list.h
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index 252ca2ffb7..e7866bf5f8 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -41,7 +41,7 @@ extern "C" {
 #ifdef HAVE_FILEBROWSER
 #include "file_browser.h"
 #endif
-#include "file_list.h"
+#include "../../file_list.h"
 
 #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL)
 #define HAVE_SHADER_MANAGER
diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c
index 9aca604048..d60c1ba01e 100644
--- a/frontend/menu/rgui.c
+++ b/frontend/menu/rgui.c
@@ -23,7 +23,7 @@
 
 #include "rgui.h"
 #include "menu_context.h"
-#include "file_list.h"
+#include "../../file_list.h"
 #include "../../general.h"
 #include "../../gfx/gfx_common.h"
 #include "../../config.def.h"
diff --git a/frontend/menu/rmenu_disp.c b/frontend/menu/rmenu_disp.c
index d7bee0e9bf..c51943bb7e 100644
--- a/frontend/menu/rmenu_disp.c
+++ b/frontend/menu/rmenu_disp.c
@@ -23,7 +23,7 @@
 
 #include "rgui.h"
 #include "menu_context.h"
-#include "file_list.h"
+#include "../../file_list.h"
 #include "../../general.h"
 #include "../../gfx/gfx_common.h"
 #include "../../config.def.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index bf3bdd4711..fce3d465f7 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -526,7 +526,7 @@ MENU
 #ifdef HAVE_FILEBROWSER
 #include "../frontend/menu/file_browser.c"
 #endif
-#include "../frontend/menu/file_list.c"
+#include "../file_list.c"
 
 #if defined(HAVE_RMENU)
 #include "../frontend/menu/rmenu_disp.c"
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index 77b7cfb3da..13d68d9faa 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -188,7 +188,7 @@
     <ClCompile Include="..\..\deps\miniz\miniz.c" />
     <ClCompile Include="..\..\file_extract.c" />
     <ClCompile Include="..\..\frontend\menu\history.c" />
-    <ClCompile Include="..\..\frontend\menu\file_list.c" />
+    <ClCompile Include="..\..\file_list.c" />
     <ClCompile Include="..\..\frontend\menu\rgui.c" />
     <ClCompile Include="..\..\frontend\menu\menu_common.c" />
     <ClCompile Include="..\..\frontend\menu\menu_settings.c" />