diff --git a/Makefile b/Makefile
index d66150787c..f972d38b68 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 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/disp/rgui.o frontend/menu/history.o
 	DEFINES += -DHAVE_MENU
 endif
 
diff --git a/Makefile.emscripten b/Makefile.emscripten
index 3bb5c77d9f..171d37b912 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -67,7 +67,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_context.o 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/disp/rgui.o frontend/menu/history.o
 endif
 
 ifeq ($(HAVE_SDL), 1)
diff --git a/Makefile.win b/Makefile.win
index 6c0addfa32..6b2fad4cbb 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 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/disp/rgui.o frontend/menu/history.o
 endif
 
 ifeq ($(HAVE_SDL), 1)
diff --git a/frontend/menu/rgui.c b/frontend/menu/disp/rgui.c
similarity index 97%
rename from frontend/menu/rgui.c
rename to frontend/menu/disp/rgui.c
index 5747d41ff5..c6ebc08e65 100644
--- a/frontend/menu/rgui.c
+++ b/frontend/menu/disp/rgui.c
@@ -21,25 +21,21 @@
 #include <string.h>
 #include <limits.h>
 
-#include "menu_common.h"
-#include "menu_context.h"
-#include "../../file_list.h"
-#include "../../general.h"
-#include "../../gfx/gfx_common.h"
-#include "../../config.def.h"
-#include "../../file.h"
-#include "../../dynamic.h"
-#include "../../compat/posix_string.h"
-#include "../../gfx/shader_parse.h"
-#include "../../performance.h"
-#include "../../input/input_common.h"
+#include "../menu_common.h"
+#include "../menu_context.h"
+#include "../../../file_list.h"
+#include "../../../general.h"
+#include "../../../gfx/gfx_common.h"
+#include "../../../config.def.h"
+#include "../../../file.h"
+#include "../../../dynamic.h"
+#include "../../../compat/posix_string.h"
+#include "../../../gfx/shader_parse.h"
+#include "../../../performance.h"
+#include "../../../input/input_common.h"
 
-#ifdef HAVE_OPENGL
-#include "../../gfx/gl_common.h"
-#endif
-
-#include "../../screenshot.h"
-#include "../../gfx/fonts/bitmap.h"
+#include "../../../screenshot.h"
+#include "../../../gfx/fonts/bitmap.h"
 
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
 #define HAVE_SHADER_MANAGER
diff --git a/frontend/menu/rmenu_disp.c b/frontend/menu/disp/rmenu.c
similarity index 96%
rename from frontend/menu/rmenu_disp.c
rename to frontend/menu/disp/rmenu.c
index b1ef6429a4..057ecc8835 100644
--- a/frontend/menu/rmenu_disp.c
+++ b/frontend/menu/disp/rmenu.c
@@ -21,25 +21,21 @@
 #include <string.h>
 #include <limits.h>
 
-#include "rgui.h"
-#include "menu_context.h"
-#include "../../file_list.h"
-#include "../../general.h"
-#include "../../gfx/gfx_common.h"
-#include "../../config.def.h"
-#include "../../file.h"
-#include "../../dynamic.h"
-#include "../../compat/posix_string.h"
-#include "../../gfx/shader_parse.h"
-#include "../../performance.h"
-#include "../../input/input_common.h"
+#include "../menu_common.h"
+#include "../menu_context.h"
+#include "../../../file_list.h"
+#include "../../../general.h"
+#include "../../../gfx/gfx_common.h"
+#include "../../../config.def.h"
+#include "../../../file.h"
+#include "../../../dynamic.h"
+#include "../../../compat/posix_string.h"
+#include "../../../gfx/shader_parse.h"
+#include "../../../performance.h"
+#include "../../../input/input_common.h"
 
-#ifdef HAVE_OPENGL
-#include "../../gfx/gl_common.h"
-#endif
-
-#include "../../screenshot.h"
-#include "../../gfx/fonts/bitmap.h"
+#include "../../../screenshot.h"
+#include "../../../gfx/fonts/bitmap.h"
 
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
 #define HAVE_SHADER_MANAGER
diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c
index ffda797bf6..4b57aafffb 100644
--- a/frontend/platform/platform_ps3.c
+++ b/frontend/platform/platform_ps3.c
@@ -18,6 +18,7 @@
 
 #include "../../ps3/sdk_defines.h"
 #include "../../ps3/ps3_input.h"
+#include "../menu/menu_common.h"
 
 #include "../../console/rarch_console.h"
 #include "../../conf/config_file.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 805fc953ac..21ba9664d9 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -526,9 +526,9 @@ MENU
 #include "../file_list.c"
 
 #if defined(HAVE_RMENU)
-#include "../frontend/menu/rmenu_disp.c"
+#include "../frontend/menu/disp/rmenu.c"
 #elif defined(HAVE_RGUI)
-#include "../frontend/menu/rgui.c"
+#include "../frontend/menu/disp/rgui.c"
 #elif defined(HAVE_RMENU_XUI)
 #include "../frontend/menu/rmenu_xui.cpp"
 #endif
diff --git a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index 13d68d9faa..43836ba00a 100644
--- a/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -189,7 +189,7 @@
     <ClCompile Include="..\..\file_extract.c" />
     <ClCompile Include="..\..\frontend\menu\history.c" />
     <ClCompile Include="..\..\file_list.c" />
-    <ClCompile Include="..\..\frontend\menu\rgui.c" />
+    <ClCompile Include="..\..\frontend\menu\disp\rgui.c" />
     <ClCompile Include="..\..\frontend\menu\menu_common.c" />
     <ClCompile Include="..\..\frontend\menu\menu_settings.c" />
     <ClCompile Include="..\..\frontend\menu\menu_context.c" />