diff --git a/Makefile b/Makefile
index 1a8029a913..3606780c11 100644
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ ifneq ($(findstring Linux,$(OS)),)
 endif
 
 ifeq ($(HAVE_RGUI), 1)
-   OBJ += frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/menu_settings.o frontend/menu/menu_context.o file_list.o frontend/menu/disp/rgui.o frontend/menu/history.o
+   OBJ += frontend/menu/menu_common.o frontend/menu/menu_navigation.o frontend/menu/menu_settings.o frontend/menu/menu_context.o frontend/menu/file_list.o frontend/menu/disp/rgui.o frontend/menu/history.o
    DEFINES += -DHAVE_MENU
 ifeq ($(HAVE_LAKKA), 1)
    OBJ += frontend/menu/disp/lakka.o
diff --git a/Makefile.emscripten b/Makefile.emscripten
index b68a694df5..0f1c48a8b2 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -70,7 +70,7 @@ endif
 
 ifeq ($(HAVE_RGUI), 1)
    DEFINES += -DHAVE_MENU -DHAVE_RGUI
-   OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_navigation.o frontend/menu/menu_context.o file_list.o frontend/menu/disp/rgui.o frontend/menu/history.o
+   OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_navigation.o frontend/menu/menu_context.o frontend/menu/file_list.o frontend/menu/disp/rgui.o frontend/menu/history.o
 endif
 
 ifeq ($(HAVE_SDL), 1)
diff --git a/Makefile.win b/Makefile.win
index b53419e5b2..6ea9ffd980 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -114,7 +114,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_navigation.o frontend/menu/menu_context.o file_list.o frontend/menu/disp/rgui.o frontend/menu/history.o
+   OBJ += frontend/menu/menu_common.o frontend/menu/menu_settings.o frontend/menu/menu_navigation.o frontend/menu/menu_context.o frontend/menu/file_list.o frontend/menu/disp/rgui.o frontend/menu/history.o
 endif
 
 ifeq ($(HAVE_SDL), 1)
diff --git a/frontend/menu/disp/lakka.c b/frontend/menu/disp/lakka.c
index fb3e5b17cb..01beaa63a3 100644
--- a/frontend/menu/disp/lakka.c
+++ b/frontend/menu/disp/lakka.c
@@ -23,7 +23,7 @@
 
 #include "../menu_common.h"
 #include "../menu_context.h"
-#include "../../../file_list.h"
+#include "../file_list.h"
 #include "../../../general.h"
 #include "../../../gfx/gfx_common.h"
 #include "../../../gfx/gl_common.h"
diff --git a/frontend/menu/disp/rgui.c b/frontend/menu/disp/rgui.c
index 59082ee441..8cce159e0d 100644
--- a/frontend/menu/disp/rgui.c
+++ b/frontend/menu/disp/rgui.c
@@ -23,7 +23,7 @@
 
 #include "../menu_common.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/disp/rmenu.c b/frontend/menu/disp/rmenu.c
index 89bad12e19..565d6455ba 100644
--- a/frontend/menu/disp/rmenu.c
+++ b/frontend/menu/disp/rmenu.c
@@ -23,7 +23,7 @@
 
 #include "../menu_common.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/file_list.c b/frontend/menu/file_list.c
similarity index 100%
rename from file_list.c
rename to frontend/menu/file_list.c
diff --git a/file_list.h b/frontend/menu/file_list.h
similarity index 100%
rename from file_list.h
rename to frontend/menu/file_list.h
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index de520c1611..32855d26b5 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -39,7 +39,7 @@
 extern "C" {
 #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/griffin/griffin.c b/griffin/griffin.c
index 2710aa2f03..3688316896 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -575,8 +575,7 @@ MENU
 #include "../frontend/menu/menu_context.c"
 #include "../frontend/menu/menu_settings.c"
 #include "../frontend/menu/history.c"
-
-#include "../file_list.c"
+#include "../frontend/menu/file_list.c"
 
 #ifdef HAVE_RMENU
 #include "../frontend/menu/disp/rmenu.c"
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index 2e5d3da2ef..49898d1120 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -217,7 +217,7 @@
     <ClCompile Include="..\..\deps\rzlib\zutil.c" />
     <ClCompile Include="..\..\file_extract.c" />
     <ClCompile Include="..\..\frontend\menu\history.c" />
-    <ClCompile Include="..\..\file_list.c" />
+    <ClCompile Include="..\..\frontend\menu\file_list.c" />
     <ClCompile Include="..\..\frontend\menu\disp\rgui.c" />
     <ClCompile Include="..\..\frontend\menu\menu_common.c" />
     <ClCompile Include="..\..\frontend\menu\menu_navigation.c" />
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
index e58f7ea23a..354911fd4f 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
@@ -7,7 +7,7 @@
     <ClCompile Include="..\..\core_options.c" />
     <ClCompile Include="..\..\file_extract.c" />
     <ClCompile Include="..\..\frontend\menu\history.c" />
-    <ClCompile Include="..\..\file_list.c" />
+    <ClCompile Include="..\..\frontend\menu\file_list.c" />
     <ClCompile Include="..\..\performance.c" />
     <ClCompile Include="..\..\command.c" />
     <ClCompile Include="..\..\conf\config_file.c" />
@@ -288,4 +288,4 @@
       <UniqueIdentifier>{cf7c2fb9-ca3c-468e-af4f-74c652b3e5fe}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>