diff --git a/Makefile.common b/Makefile.common
index 42653640f8..5b0d91ebd8 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -808,7 +808,7 @@ ifeq ($(HAVE_SHADERS_COMMON), 1)
 endif
 
 ifeq ($(HAVE_MENU_COMMON), 1)
-   OBJ += menu/gfx_display.o
+   OBJ += gfx/gfx_display.o
    OBJ += menu/menu_driver.o \
           menu/menu_setting.o \
           menu/widgets/menu_filebrowser.o \
@@ -834,7 +834,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
           menu/cbs/menu_cbs_down.o \
           menu/cbs/menu_cbs_contentlist_switch.o \
           menu/menu_displaylist.o \
-          menu/gfx_animation.o \
+          gfx/gfx_animation.o \
           menu/drivers/menu_generic.o \
           menu/menu_thumbnail_path.o \
           menu/menu_thumbnail.o
@@ -904,7 +904,7 @@ ifeq ($(HAVE_VITA2D), 1)
           $(DEPS_DIR)/libvita2d/shader/texture_tint_f_gxp.o
 
    ifeq ($(HAVE_MENU_COMMON),1)
-      OBJ += menu/drivers_display/gfx_display_vita2d.o
+      OBJ += gfx/drivers_display/gfx_display_vita2d.o
    endif
 
    OBJ += gfx/drivers/vita2d_gfx.o \
@@ -915,7 +915,7 @@ endif
 
 ifeq ($(TARGET), retroarch_3ds)
    OBJ += gfx/drivers/ctr_gfx.o \
-          menu/drivers_display/gfx_display_ctr.o \
+          gfx/drivers_display/gfx_display_ctr.o \
           input/drivers/ctr_input.o \
           input/drivers_joypad/ctr_joypad.o
 endif
@@ -936,7 +936,7 @@ endif
 ifeq ($(TARGET), retroarch_wiiu)
    OBJ +=  gfx/drivers/gx2_gfx.o \
 			  gfx/drivers_font/wiiu_font.o \
-			  menu/drivers_display/gfx_display_wiiu.o \
+			  gfx/drivers_display/gfx_display_wiiu.o \
 			  input/drivers/wiiu_input.o \
 			  input/drivers_joypad/wiiu_joypad.o \
 			  input/drivers_joypad/wiiu/wpad_driver.o \
@@ -961,7 +961,7 @@ endif
 
 ifeq ($(TARGET), retroarch_switch)
    ifeq ($(HAVE_LIBNX), 1)
-      OBJ += menu/drivers_display/gfx_display_switch.o \
+      OBJ += gfx/drivers_display/gfx_display_switch.o \
              gfx/drivers/switch_nx_gfx.o \
              audio/drivers/switch_libnx_audren_audio.o \
              audio/drivers/switch_libnx_audren_thread_audio.o
@@ -1167,7 +1167,7 @@ ifeq ($(HAVE_VITAGL), 1)
    OBJ += gfx/drivers/gl1.o \
           gfx/drivers_font/gl1_raster_font.o \
           gfx/drivers_context/vita_ctx.o \
-          menu/drivers_display/gfx_display_gl1.o
+          gfx/drivers_display/gfx_display_gl1.o
 endif
 
 ifeq ($(HAVE_GL_CONTEXT), 1)
@@ -1188,11 +1188,11 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
 
    ifeq ($(HAVE_MENU_COMMON), 1)
       ifeq ($(HAVE_GL_MODERN), 1)
-         OBJ += menu/drivers_display/gfx_display_gl.o
+         OBJ += gfx/drivers_display/gfx_display_gl.o
       endif
 
       ifeq ($(HAVE_OPENGL1), 1)
-         OBJ += menu/drivers_display/gfx_display_gl1.o
+         OBJ += gfx/drivers_display/gfx_display_gl1.o
       endif
    endif
 
@@ -1244,7 +1244,7 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
              gfx/drivers_font/metal_raster_font.o
 
       ifeq ($(HAVE_MENU_COMMON), 1)
-         OBJ += menu/drivers_display/gfx_display_metal.o
+         OBJ += gfx/drivers_display/gfx_display_metal.o
       endif
    endif
 
@@ -1351,7 +1351,7 @@ ifeq ($(HAVE_VULKAN), 1)
       OBJ += gfx/drivers_context/khr_display_ctx.o
    endif
    ifeq ($(HAVE_MENU_COMMON), 1)
-      OBJ += menu/drivers_display/gfx_display_vulkan.o
+      OBJ += gfx/drivers_display/gfx_display_vulkan.o
    endif
    NEED_CXX_LINKER = 1
    DEFINES += -DHAVE_VULKAN
@@ -1363,7 +1363,7 @@ ifeq ($(HAVE_OPENGL_CORE), 1)
           gfx/drivers_font/gl_core_raster_font.o \
 			 gfx/drivers_shader/shader_gl_core.o
    ifeq ($(HAVE_MENU_COMMON), 1)
-      OBJ += menu/drivers_display/gfx_display_gl_core.o
+      OBJ += gfx/drivers_display/gfx_display_gl_core.o
    endif
 
    DEFINES += -DHAVE_OPENGL_CORE
@@ -1433,7 +1433,7 @@ ifeq ($(HAVE_D3D10), 1)
           gfx/common/d3d10_common.o \
           gfx/drivers_font/d3d10_font.o
    ifeq ($(HAVE_MENU_COMMON), 1)
-      OBJ += menu/drivers_display/gfx_display_d3d10.o
+      OBJ += gfx/drivers_display/gfx_display_d3d10.o
    endif
    DEFINES += -DHAVE_D3D10
 endif
@@ -1444,7 +1444,7 @@ ifeq ($(HAVE_D3D11), 1)
           gfx/common/d3d11_common.o \
           gfx/drivers_font/d3d11_font.o
    ifeq ($(HAVE_MENU_COMMON), 1)
-      OBJ += menu/drivers_display/gfx_display_d3d11.o
+      OBJ += gfx/drivers_display/gfx_display_d3d11.o
    endif
    DEFINES += -DHAVE_D3D11
 endif
@@ -1455,7 +1455,7 @@ ifeq ($(HAVE_D3D12), 1)
           gfx/common/d3d12_common.o \
           gfx/drivers_font/d3d12_font.o
    ifeq ($(HAVE_MENU_COMMON), 1)
-      OBJ += menu/drivers_display/gfx_display_d3d12.o
+      OBJ += gfx/drivers_display/gfx_display_d3d12.o
    endif
    DEFINES += -DHAVE_D3D12
 endif
@@ -1496,7 +1496,7 @@ ifeq ($(HAVE_D3D8), 1)
    OBJ += gfx/common/d3d8_common.o
 
    ifeq ($(HAVE_MENU_COMMON), 1)
-      OBJ += menu/drivers_display/gfx_display_d3d8.o
+      OBJ += gfx/drivers_display/gfx_display_d3d8.o
    endif
 endif
 
@@ -1506,7 +1506,7 @@ ifeq ($(HAVE_D3D9), 1)
    OBJ += gfx/common/d3d9_common.o
 
    ifeq ($(HAVE_MENU_COMMON), 1)
-      OBJ += menu/drivers_display/gfx_display_d3d9.o
+      OBJ += gfx/drivers_display/gfx_display_d3d9.o
    endif
 endif
 
@@ -1982,7 +1982,7 @@ ifneq ($(findstring Win32,$(OS)),)
 				 gfx/drivers_font/gdi_font.o
 		LIBS += -lmsimg32
    ifeq ($(HAVE_MENU_COMMON), 1)
-      OBJ += menu/drivers_display/gfx_display_gdi.o
+      OBJ += gfx/drivers_display/gfx_display_gdi.o
    endif
    endif
    LIBS += -lhid -lsetupapi
diff --git a/config.def.h b/config.def.h
index 1ddc7cca46..e6f1092c8e 100644
--- a/config.def.h
+++ b/config.def.h
@@ -392,7 +392,7 @@
 
 #ifdef HAVE_MENU
 #include "menu/menu_driver.h"
-#include "menu/gfx_animation.h"
+#include "gfx/gfx_animation.h"
 
 #ifdef HAVE_LIBNX
 #define DEFAULT_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME true
diff --git a/menu/drivers_display/gfx_display_ctr.c b/gfx/drivers_display/gfx_display_ctr.c
similarity index 98%
rename from menu/drivers_display/gfx_display_ctr.c
rename to gfx/drivers_display/gfx_display_ctr.c
index b90c55b0a4..f49e30b715 100644
--- a/menu/drivers_display/gfx_display_ctr.c
+++ b/gfx/drivers_display/gfx_display_ctr.c
@@ -22,9 +22,9 @@
 #include "../gfx_display.h"
 
 #include "../../retroarch.h"
-#include "../../gfx/font_driver.h"
-#include "../../gfx/common/ctr_common.h"
-#include "../../gfx/drivers/ctr_gu.h"
+#include "../font_driver.h"
+#include "../common/ctr_common.h"
+#include "../drivers/ctr_gu.h"
 #include "../../ctr/gpu_old.h"
 
 static const float *gfx_display_ctr_get_default_vertices(void) { return NULL; }
diff --git a/menu/drivers_display/gfx_display_d3d10.c b/gfx/drivers_display/gfx_display_d3d10.c
similarity index 99%
rename from menu/drivers_display/gfx_display_d3d10.c
rename to gfx/drivers_display/gfx_display_d3d10.c
index 679fa464dc..1f10904ef1 100644
--- a/menu/drivers_display/gfx_display_d3d10.c
+++ b/gfx/drivers_display/gfx_display_d3d10.c
@@ -25,8 +25,8 @@
 #include "../gfx_display.h"
 
 #include "../../retroarch.h"
-#include "../../gfx/font_driver.h"
-#include "../../gfx/common/d3d10_common.h"
+#include "../font_driver.h"
+#include "../common/d3d10_common.h"
 
 static const float* gfx_display_d3d10_get_default_vertices(void)
 {
diff --git a/menu/drivers_display/gfx_display_d3d11.c b/gfx/drivers_display/gfx_display_d3d11.c
similarity index 99%
rename from menu/drivers_display/gfx_display_d3d11.c
rename to gfx/drivers_display/gfx_display_d3d11.c
index ef55a16a2c..55cde25d07 100644
--- a/menu/drivers_display/gfx_display_d3d11.c
+++ b/gfx/drivers_display/gfx_display_d3d11.c
@@ -24,8 +24,8 @@
 #include "../gfx_display.h"
 
 #include "../../retroarch.h"
-#include "../../gfx/font_driver.h"
-#include "../../gfx/common/d3d11_common.h"
+#include "../font_driver.h"
+#include "../common/d3d11_common.h"
 
 static const float* gfx_display_d3d11_get_default_vertices(void)
 {
diff --git a/menu/drivers_display/gfx_display_d3d12.c b/gfx/drivers_display/gfx_display_d3d12.c
similarity index 99%
rename from menu/drivers_display/gfx_display_d3d12.c
rename to gfx/drivers_display/gfx_display_d3d12.c
index bd3de1afe0..1d8de1045e 100644
--- a/menu/drivers_display/gfx_display_d3d12.c
+++ b/gfx/drivers_display/gfx_display_d3d12.c
@@ -24,8 +24,8 @@
 #include "../gfx_display.h"
 
 #include "../../retroarch.h"
-#include "../../gfx/font_driver.h"
-#include "../../gfx/common/d3d12_common.h"
+#include "../font_driver.h"
+#include "../common/d3d12_common.h"
 
 static const float* gfx_display_d3d12_get_default_vertices(void)
 {
diff --git a/menu/drivers_display/gfx_display_d3d8.c b/gfx/drivers_display/gfx_display_d3d8.c
similarity index 98%
rename from menu/drivers_display/gfx_display_d3d8.c
rename to gfx/drivers_display/gfx_display_d3d8.c
index 601c21806b..50bf4c54ee 100644
--- a/menu/drivers_display/gfx_display_d3d8.c
+++ b/gfx/drivers_display/gfx_display_d3d8.c
@@ -26,8 +26,8 @@
 #include "../gfx_display.h"
 
 #include "../../retroarch.h"
-#include "../../gfx/common/d3d_common.h"
-#include "../../gfx/common/d3d8_common.h"
+#include "../common/d3d_common.h"
+#include "../common/d3d8_common.h"
 
 static const float d3d8_vertexes[] = {
    0, 0,
diff --git a/menu/drivers_display/gfx_display_d3d9.c b/gfx/drivers_display/gfx_display_d3d9.c
similarity index 99%
rename from menu/drivers_display/gfx_display_d3d9.c
rename to gfx/drivers_display/gfx_display_d3d9.c
index e4f25c0bc8..97a91be476 100644
--- a/menu/drivers_display/gfx_display_d3d9.c
+++ b/gfx/drivers_display/gfx_display_d3d9.c
@@ -26,8 +26,8 @@
 #include "../gfx_display.h"
 
 #include "../../retroarch.h"
-#include "../../gfx/common/d3d_common.h"
-#include "../../gfx/common/d3d9_common.h"
+#include "../common/d3d_common.h"
+#include "../common/d3d9_common.h"
 
 static const float d3d9_vertexes[] = {
    0, 0,
diff --git a/menu/drivers_display/gfx_display_gdi.c b/gfx/drivers_display/gfx_display_gdi.c
similarity index 97%
rename from menu/drivers_display/gfx_display_gdi.c
rename to gfx/drivers_display/gfx_display_gdi.c
index 324b6978b1..ce77bab6b9 100644
--- a/menu/drivers_display/gfx_display_gdi.c
+++ b/gfx/drivers_display/gfx_display_gdi.c
@@ -21,15 +21,15 @@
 #include <retro_miscellaneous.h>
 
 #include "../../config.def.h"
-#include "../../gfx/font_driver.h"
+#include "../font_driver.h"
 #include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #include "../gfx_display.h"
 
 #if defined(_WIN32) && !defined(_XBOX)
-#include "../../gfx/common/win32_common.h"
-#include "../../gfx/common/gdi_common.h"
+#include "../common/win32_common.h"
+#include "../common/gdi_common.h"
 #endif
 
 static void *gfx_display_gdi_get_default_mvp(video_frame_info_t *video_info)
diff --git a/menu/drivers_display/gfx_display_gl.c b/gfx/drivers_display/gfx_display_gl.c
similarity index 99%
rename from menu/drivers_display/gfx_display_gl.c
rename to gfx/drivers_display/gfx_display_gl.c
index 8a115dcc9f..34e9082de5 100644
--- a/menu/drivers_display/gfx_display_gl.c
+++ b/gfx/drivers_display/gfx_display_gl.c
@@ -20,8 +20,8 @@
 #endif
 
 #include "../../retroarch.h"
-#include "../../gfx/font_driver.h"
-#include "../../gfx/common/gl_common.h"
+#include "../font_driver.h"
+#include "../common/gl_common.h"
 
 #include "../gfx_display.h"
 
diff --git a/menu/drivers_display/gfx_display_gl1.c b/gfx/drivers_display/gfx_display_gl1.c
similarity index 98%
rename from menu/drivers_display/gfx_display_gl1.c
rename to gfx/drivers_display/gfx_display_gl1.c
index a33f038cf1..95c6facd82 100644
--- a/menu/drivers_display/gfx_display_gl1.c
+++ b/gfx/drivers_display/gfx_display_gl1.c
@@ -21,10 +21,10 @@
 #endif
 
 #include "../../retroarch.h"
-#include "../../gfx/font_driver.h"
-#include "../../gfx/common/gl1_common.h"
+#include "../font_driver.h"
+#include "../common/gl1_common.h"
 
-#include "../menu_driver.h"
+#include "../gfx_display.h"
 
 #ifdef VITA
 static float *vertices3 = NULL;
diff --git a/menu/drivers_display/gfx_display_gl_core.c b/gfx/drivers_display/gfx_display_gl_core.c
similarity index 99%
rename from menu/drivers_display/gfx_display_gl_core.c
rename to gfx/drivers_display/gfx_display_gl_core.c
index fdc93319fa..9fe616876c 100644
--- a/menu/drivers_display/gfx_display_gl_core.c
+++ b/gfx/drivers_display/gfx_display_gl_core.c
@@ -23,9 +23,9 @@
 
 #include "../gfx_display.h"
 
-#include "../../gfx/font_driver.h"
+#include "../font_driver.h"
 #include "../../retroarch.h"
-#include "../../gfx/common/gl_core_common.h"
+#include "../common/gl_core_common.h"
 
 static const float gl_core_vertexes[] = {
    0, 0,
diff --git a/menu/drivers_display/gfx_display_metal.m b/gfx/drivers_display/gfx_display_metal.m
similarity index 98%
rename from menu/drivers_display/gfx_display_metal.m
rename to gfx/drivers_display/gfx_display_metal.m
index d05c4cd740..9b788b1445 100644
--- a/menu/drivers_display/gfx_display_metal.m
+++ b/gfx/drivers_display/gfx_display_metal.m
@@ -21,9 +21,9 @@
 
 #include "../gfx_display.h"
 
-#include "../../gfx/font_driver.h"
+#include "../font_driver.h"
 #include "../../retroarch.h"
-#import "../../gfx/common/metal_common.h"
+#import "../common/metal_common.h"
 
 static const float *gfx_display_metal_get_default_vertices(void)
 {
diff --git a/menu/drivers_display/gfx_display_switch.c b/gfx/drivers_display/gfx_display_switch.c
similarity index 98%
rename from menu/drivers_display/gfx_display_switch.c
rename to gfx/drivers_display/gfx_display_switch.c
index b18554026c..a2fa8c5fc2 100644
--- a/menu/drivers_display/gfx_display_switch.c
+++ b/gfx/drivers_display/gfx_display_switch.c
@@ -17,7 +17,7 @@
 #include <queues/message_queue.h>
 #include <retro_miscellaneous.h>
 
-#include "../../gfx/font_driver.h"
+#include "../font_driver.h"
 #include "../../retroarch.h"
 
 #include "../gfx_display.h"
diff --git a/menu/drivers_display/gfx_display_vita2d.c b/gfx/drivers_display/gfx_display_vita2d.c
similarity index 98%
rename from menu/drivers_display/gfx_display_vita2d.c
rename to gfx/drivers_display/gfx_display_vita2d.c
index 866f36ae7b..6f40b522f6 100644
--- a/menu/drivers_display/gfx_display_vita2d.c
+++ b/gfx/drivers_display/gfx_display_vita2d.c
@@ -24,8 +24,8 @@
 #include "../gfx_display.h"
 
 #include "../../retroarch.h"
-#include "../../gfx/font_driver.h"
-#include "../../gfx/common/vita2d_common.h"
+#include "../font_driver.h"
+#include "../common/vita2d_common.h"
 #include "../../defines/psp_defines.h"
 
 static const float vita2d_vertexes[] = {
diff --git a/menu/drivers_display/gfx_display_vulkan.c b/gfx/drivers_display/gfx_display_vulkan.c
similarity index 99%
rename from menu/drivers_display/gfx_display_vulkan.c
rename to gfx/drivers_display/gfx_display_vulkan.c
index b8637d4d41..3c9034df1b 100644
--- a/menu/drivers_display/gfx_display_vulkan.c
+++ b/gfx/drivers_display/gfx_display_vulkan.c
@@ -22,9 +22,9 @@
 
 #include "../gfx_display.h"
 
-#include "../../gfx/font_driver.h"
+#include "../font_driver.h"
 #include "../../retroarch.h"
-#include "../../gfx/common/vulkan_common.h"
+#include "../common/vulkan_common.h"
 
 /* Will do Y-flip later, but try to make it similar to GL. */
 static const float vk_vertexes[] = {
diff --git a/menu/drivers_display/gfx_display_wiiu.c b/gfx/drivers_display/gfx_display_wiiu.c
similarity index 99%
rename from menu/drivers_display/gfx_display_wiiu.c
rename to gfx/drivers_display/gfx_display_wiiu.c
index 2fee2de145..a63ca519c2 100644
--- a/menu/drivers_display/gfx_display_wiiu.c
+++ b/gfx/drivers_display/gfx_display_wiiu.c
@@ -23,8 +23,8 @@
 #include "../gfx_display.h"
 
 #include "../../retroarch.h"
-#include "../../gfx/font_driver.h"
-#include "../../gfx/common/gx2_common.h"
+#include "../font_driver.h"
+#include "../common/gx2_common.h"
 #include "../../wiiu/system/memory.h"
 #include "../../wiiu/wiiu_dbg.h"
 
diff --git a/menu/gfx_animation.c b/gfx/gfx_animation.c
similarity index 100%
rename from menu/gfx_animation.c
rename to gfx/gfx_animation.c
diff --git a/menu/gfx_animation.h b/gfx/gfx_animation.h
similarity index 99%
rename from menu/gfx_animation.h
rename to gfx/gfx_animation.h
index 1ec4bbbf00..05f6403398 100644
--- a/menu/gfx_animation.h
+++ b/gfx/gfx_animation.h
@@ -23,7 +23,7 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 
-#include "../gfx/font_driver.h"
+#include "font_driver.h"
 
 RETRO_BEGIN_DECLS
 
diff --git a/menu/gfx_display.c b/gfx/gfx_display.c
similarity index 96%
rename from menu/gfx_display.c
rename to gfx/gfx_display.c
index 63aeb453d7..1b10e9410a 100644
--- a/menu/gfx_display.c
+++ b/gfx/gfx_display.c
@@ -19,7 +19,7 @@
 
 #include "../configuration.h"
 #include "../frontend/frontend.h"
-#include "../gfx/video_coord_array.h"
+#include "video_coord_array.h"
 #include "../verbosity.h"
 
 #define PARTICLES_COUNT            100
diff --git a/menu/gfx_display.h b/gfx/gfx_display.h
similarity index 100%
rename from menu/gfx_display.h
rename to gfx/gfx_display.h
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 4d7f536e0d..974ec3d628 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1245,7 +1245,7 @@ MENU
 #endif
 
 #ifdef HAVE_MENU
-#include "../menu/gfx_display.c"
+#include "../gfx/gfx_display.c"
 #include "../menu/menu_driver.c"
 #include "../menu/menu_setting.c"
 #include "../menu/menu_cbs.c"
@@ -1279,67 +1279,67 @@ MENU
 #include "../menu/cbs/menu_cbs_down.c"
 #include "../menu/cbs/menu_cbs_contentlist_switch.c"
 #include "../menu/menu_displaylist.c"
-#include "../menu/gfx_animation.c"
+#include "../gfx/gfx_animation.c"
 #include "../menu/menu_thumbnail_path.c"
 #include "../menu/menu_thumbnail.c"
 
 #include "../menu/drivers/menu_generic.c"
 
 #if defined(HAVE_D3D8)
-#include "../menu/drivers_display/gfx_display_d3d8.c"
+#include "../gfx/drivers_display/gfx_display_d3d8.c"
 #endif
 
 #if defined(HAVE_D3D9)
-#include "../menu/drivers_display/gfx_display_d3d9.c"
+#include "../gfx/drivers_display/gfx_display_d3d9.c"
 #endif
 
 #if defined(HAVE_D3D10)
-#include "../menu/drivers_display/gfx_display_d3d10.c"
+#include "../gfx/drivers_display/gfx_display_d3d10.c"
 #endif
 
 #if defined(HAVE_D3D11)
-#include "../menu/drivers_display/gfx_display_d3d11.c"
+#include "../gfx/drivers_display/gfx_display_d3d11.c"
 #endif
 
 #if defined(HAVE_D3D12)
-#include "../menu/drivers_display/gfx_display_d3d12.c"
+#include "../gfx/drivers_display/gfx_display_d3d12.c"
 #endif
 
 #ifdef HAVE_OPENGL1
-#include "../menu/drivers_display/gfx_display_gl1.c"
+#include "../gfx/drivers_display/gfx_display_gl1.c"
 #endif
 
 #ifdef HAVE_OPENGL
-#include "../menu/drivers_display/gfx_display_gl.c"
+#include "../gfx/drivers_display/gfx_display_gl.c"
 #endif
 
 #ifdef HAVE_OPENGL_CORE
-#include "../menu/drivers_display/gfx_display_gl_core.c"
+#include "../gfx/drivers_display/gfx_display_gl_core.c"
 #endif
 
 #ifdef HAVE_VULKAN
-#include "../menu/drivers_display/gfx_display_vulkan.c"
+#include "../gfx/drivers_display/gfx_display_vulkan.c"
 #endif
 
 #ifdef HAVE_VITA2D
-#include "../menu/drivers_display/gfx_display_vita2d.c"
+#include "../gfx/drivers_display/gfx_display_vita2d.c"
 #endif
 
 #ifdef _3DS
-#include "../menu/drivers_display/gfx_display_ctr.c"
+#include "../gfx/drivers_display/gfx_display_ctr.c"
 #endif
 
 #ifdef WIIU
-#include "../menu/drivers_display/gfx_display_wiiu.c"
+#include "../gfx/drivers_display/gfx_display_wiiu.c"
 #endif
 
 #if defined(HAVE_LIBNX)
-#include "../menu/drivers_display/gfx_display_switch.c"
+#include "../gfx/drivers_display/gfx_display_switch.c"
 #endif
 
 #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
 #ifdef HAVE_GDI
-#include "../menu/drivers_display/gfx_display_gdi.c"
+#include "../gfx/drivers_display/gfx_display_gdi.c"
 #endif
 #endif
 
diff --git a/griffin/griffin_objc.m b/griffin/griffin_objc.m
index 47047106b1..a30e582489 100644
--- a/griffin/griffin_objc.m
+++ b/griffin/griffin_objc.m
@@ -74,6 +74,6 @@
 #import "../gfx/common/metal/MenuDisplay.m"
 #import "../gfx/common/metal_common.m"
 #import "../gfx/drivers/metal.m"
-#import "../menu/drivers_display/gfx_display_metal.m"
+#import "../gfx/drivers_display/gfx_display_metal.m"
 #import "../gfx/drivers_font/metal_raster_font.m"
 #endif
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 3b2dc5291d..f30758df77 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -23,7 +23,7 @@
 #endif
 
 #include "../menu_driver.h"
-#include "../gfx_animation.h"
+#include "../../gfx/gfx_animation.h"
 #include "../menu_cbs.h"
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
 #include "../menu_shader.h"
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 7b9822bb07..bc17ccdcb4 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -42,7 +42,7 @@
 #include "menu_generic.h"
 
 #include "../menu_driver.h"
-#include "../gfx_animation.h"
+#include "../../gfx/gfx_animation.h"
 #include "../menu_input.h"
 #include "../menu_thumbnail_path.h"
 #include "../menu_thumbnail.h"
diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c
index 29473207be..73509b3c9e 100644
--- a/menu/drivers/ozone/ozone.c
+++ b/menu/drivers/ozone/ozone.c
@@ -38,7 +38,8 @@
 #include "../menu_generic.h"
 
 #include "../../menu_driver.h"
-#include "../../gfx_animation.h"
+#include "../../../gfx/gfx_animation.h"
+#include "../../../gfx/gfx_display.h"
 #include "../../menu_input.h"
 #include "../../playlist.h"
 #include "../../runtime_file.h"
diff --git a/menu/drivers/ozone/ozone_display.c b/menu/drivers/ozone/ozone_display.c
index c25a0aaf39..fd124e6c48 100644
--- a/menu/drivers/ozone/ozone_display.c
+++ b/menu/drivers/ozone/ozone_display.c
@@ -28,7 +28,7 @@
 #include <features/features_cpu.h>
 
 #include "../../menu_input.h"
-#include "../../gfx_animation.h"
+#include "../../../gfx/gfx_animation.h"
 
 #include "../../widgets/menu_osk.h"
 
diff --git a/menu/drivers/ozone/ozone_entries.c b/menu/drivers/ozone/ozone_entries.c
index ec23b39ee2..f3655a80ad 100644
--- a/menu/drivers/ozone/ozone_entries.c
+++ b/menu/drivers/ozone/ozone_entries.c
@@ -26,7 +26,7 @@
 #include <encodings/utf.h>
 
 #include "../../menu_driver.h"
-#include "../../gfx_animation.h"
+#include "../../../gfx/gfx_animation.h"
 
 #include "../../../configuration.h"
 
diff --git a/menu/drivers/ozone/ozone_sidebar.c b/menu/drivers/ozone/ozone_sidebar.c
index 12dbe8fd21..7b4cab4ee4 100644
--- a/menu/drivers/ozone/ozone_sidebar.c
+++ b/menu/drivers/ozone/ozone_sidebar.c
@@ -27,7 +27,7 @@
 #include <file/file_path.h>
 #include <formats/image.h>
 
-#include "../../gfx_animation.h"
+#include "../../../gfx/gfx_animation.h"
 
 #include "../../../configuration.h"
 
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 094d248286..5d3f3acbd1 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -49,7 +49,7 @@
 #include "menu_generic.h"
 
 #include "../menu_driver.h"
-#include "../gfx_animation.h"
+#include "../../gfx/gfx_animation.h"
 
 #include "../widgets/menu_osk.h"
 
diff --git a/menu/drivers/stripes.c b/menu/drivers/stripes.c
index ff1fda5a23..432af46f9d 100644
--- a/menu/drivers/stripes.c
+++ b/menu/drivers/stripes.c
@@ -42,7 +42,7 @@
 #include "menu_generic.h"
 
 #include "../menu_driver.h"
-#include "../gfx_animation.h"
+#include "../../gfx/gfx_animation.h"
 #include "../menu_entries.h"
 #include "../menu_input.h"
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index f8f0e365a2..436d4de788 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -42,7 +42,7 @@
 #include "menu_generic.h"
 
 #include "../menu_driver.h"
-#include "../gfx_animation.h"
+#include "../../gfx/gfx_animation.h"
 #include "../menu_entries.h"
 #include "../menu_input.h"
 #include "../menu_thumbnail_path.h"
diff --git a/menu/drivers/xui.cpp b/menu/drivers/xui.cpp
index a0a15e9ca1..f2b8f64c66 100644
--- a/menu/drivers/xui.cpp
+++ b/menu/drivers/xui.cpp
@@ -34,7 +34,7 @@
 #include "menu_generic.h"
 
 #include "../menu_driver.h"
-#include "../gfx_animation.h"
+#include "../../gfx/gfx_animation.h"
 #include "../menu_entries.h"
 #include "../menu_input.h"
 #include "../menu_setting.h"
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index c96a537470..5517cef89f 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -32,7 +32,7 @@
 #include "menu_defines.h"
 #include "menu_input.h"
 #include "menu_entries.h"
-#include "gfx_display.h"
+#include "../gfx/gfx_display.h"
 
 #include "../gfx/font_driver.h"
 
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index b5449a4dcb..09dcf50af0 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -67,7 +67,7 @@
 #include "menu_setting.h"
 #include "menu_cbs.h"
 #include "menu_driver.h"
-#include "gfx_animation.h"
+#include "../gfx/gfx_animation.h"
 #include "menu_input.h"
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
 #include "menu_shader.h"
diff --git a/menu/menu_thumbnail.c b/menu/menu_thumbnail.c
index d256c037b6..cb10764d46 100644
--- a/menu/menu_thumbnail.c
+++ b/menu/menu_thumbnail.c
@@ -29,7 +29,7 @@
 #include <file/file_path.h>
 #include <string/stdstring.h>
 
-#include "gfx_animation.h"
+#include "../gfx/gfx_animation.h"
 #include "menu_driver.h"
 
 #include "menu_thumbnail.h"
diff --git a/menu/widgets/menu_widgets.c b/menu/widgets/menu_widgets.c
index 90f7d3ef2a..283be44e2b 100644
--- a/menu/widgets/menu_widgets.c
+++ b/menu/widgets/menu_widgets.c
@@ -38,8 +38,8 @@
 #include "../../tasks/task_content.h"
 #include "../../ui/ui_companion_driver.h"
 
-#include "../gfx_animation.h"
-#include "../gfx_display.h"
+#include "../../gfx/gfx_animation.h"
+#include "../../gfx/gfx_display.h"
 #include "../menu_driver.h"
 
 #include "../../gfx/font_driver.h"
diff --git a/retroarch.c b/retroarch.c
index 64ea28a728..f32ee85912 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -133,7 +133,8 @@
 
 #ifdef HAVE_MENU
 #include "menu/menu_driver.h"
-#include "menu/gfx_animation.h"
+#include "gfx/gfx_animation.h"
+#include "gfx/gfx_display.h"
 #include "menu/menu_input.h"
 #include "menu/widgets/menu_dialog.h"
 #include "menu/widgets/menu_input_bind_dialog.h"