diff --git a/Makefile.common b/Makefile.common
index e757100883..199df260db 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -376,7 +376,9 @@ ifeq ($(HAVE_WINXINPUT), 1)
 endif
 
 ifeq ($(HAVE_X11), 1)
-   OBJ += input/drivers/x11_input.o gfx/drivers_context/x11_common.o input/keyboard_event_x11.o
+   OBJ += input/drivers/x11_input.o \
+			 gfx/drivers_wm/x11_common.o \
+			 input/keyboard_event_x11.o
    LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS)
    DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
 endif
@@ -486,7 +488,7 @@ ifeq ($(HAVE_OPENGL), 1)
       else ifneq ($(findstring Win32,$(OS)),)
          LIBS += -lopengl32 -lgdi32 -lcomdlg32 -lcomctl32
          OBJ += gfx/drivers_context/wgl_ctx.o
-         OBJ += gfx/drivers_context/wgl_shader_dlg.o
+         OBJ += gfx/drivers_wm/win32_shader_dlg.o
       else
          LIBS += -lGL
       endif
@@ -689,8 +691,8 @@ endif
 ifneq ($(findstring Win32,$(OS)),)
    OBJ += media/rarch.o \
           input/keyboard_event_win32.o \
-			 gfx/drivers_context/win32_common.o \
-			 gfx/drivers_context/win32_dwm_common.o
+			 gfx/drivers_wm/win32_common.o \
+			 gfx/drivers_wm/win32_dwm_common.o
 endif
 
 # Record
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index e6afb87feb..aa8c8640fa 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -31,7 +31,7 @@
 #include "../font_renderer_driver.h"
 
 #ifdef HAVE_X11
-#include "../drivers_context/x11_common.h"
+#include "../drivers_wm/x11_common.h"
 #endif
 
 #if defined(_WIN32) && !defined(_XBOX)
diff --git a/gfx/drivers/sdl_gfx.c b/gfx/drivers/sdl_gfx.c
index 845e93d8d5..6a941740bd 100644
--- a/gfx/drivers/sdl_gfx.c
+++ b/gfx/drivers/sdl_gfx.c
@@ -27,7 +27,7 @@
 #include "../font_renderer_driver.h"
 
 #ifdef HAVE_X11
-#include "../drivers_context/x11_common.h"
+#include "../drivers_wm/x11_common.h"
 #endif
 
 #if defined(_WIN32) && !defined(_XBOX)
diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c
index 1b0686f8ce..c3621eef50 100644
--- a/gfx/drivers/xvideo.c
+++ b/gfx/drivers/xvideo.c
@@ -24,7 +24,7 @@
 #include "../font_renderer_driver.h"
 #include <retro_inline.h>
 
-#include "../drivers_context/x11_common.h"
+#include "../drivers_wm/x11_common.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/gfx/drivers_context/d3d_ctx.cpp b/gfx/drivers_context/d3d_ctx.cpp
index b22ae1e852..0390890c27 100644
--- a/gfx/drivers_context/d3d_ctx.cpp
+++ b/gfx/drivers_context/d3d_ctx.cpp
@@ -16,7 +16,7 @@
  */
 
 #include "../d3d/d3d.h"
-#include "win32_common.h"
+#include "../drivers_wm/win32_common.h"
 
 #include "../../runloop.h"
 #include "../video_monitor.h"
diff --git a/gfx/drivers_context/glx_ctx.c b/gfx/drivers_context/glx_ctx.c
index 29e9e8223d..370b2c1a58 100644
--- a/gfx/drivers_context/glx_ctx.c
+++ b/gfx/drivers_context/glx_ctx.c
@@ -18,7 +18,7 @@
 #include "../../runloop.h"
 #include "../gl_common.h"
 #include "../video_monitor.h"
-#include "x11_common.h"
+#include "../drivers_wm/x11_common.h"
 
 #include <signal.h>
 #include <stdint.h>
diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c
index a29b17c190..9ebfdf2ee5 100644
--- a/gfx/drivers_context/wgl_ctx.c
+++ b/gfx/drivers_context/wgl_ctx.c
@@ -26,8 +26,8 @@
 #include "../video_context_driver.h"
 #include "../gl_common.h"
 #include "../video_monitor.h"
-#include "win32_common.h"
-#include "wgl_shader_dlg.h"
+#include "../drivers_wm/win32_common.h"
+#include "../drivers_wm/win32_shader_dlg.h"
 #include <windows.h>
 #include <commdlg.h>
 #include <string.h>
diff --git a/gfx/drivers_context/xegl_ctx.c b/gfx/drivers_context/xegl_ctx.c
index 41711a1bef..e0b4b27df2 100644
--- a/gfx/drivers_context/xegl_ctx.c
+++ b/gfx/drivers_context/xegl_ctx.c
@@ -22,7 +22,7 @@
 #include "../../runloop.h"
 #include "../gl_common.h"
 #include "../video_monitor.h"
-#include "x11_common.h"
+#include "../drivers_wm/x11_common.h"
 
 #include <signal.h>
 #include <stdint.h>
diff --git a/gfx/drivers_context/win32_common.c b/gfx/drivers_wm/win32_common.c
similarity index 100%
rename from gfx/drivers_context/win32_common.c
rename to gfx/drivers_wm/win32_common.c
diff --git a/gfx/drivers_context/win32_common.h b/gfx/drivers_wm/win32_common.h
similarity index 100%
rename from gfx/drivers_context/win32_common.h
rename to gfx/drivers_wm/win32_common.h
diff --git a/gfx/drivers_context/win32_dwm_common.c b/gfx/drivers_wm/win32_dwm_common.c
similarity index 100%
rename from gfx/drivers_context/win32_dwm_common.c
rename to gfx/drivers_wm/win32_dwm_common.c
diff --git a/gfx/drivers_context/win32_dwm_common.h b/gfx/drivers_wm/win32_dwm_common.h
similarity index 100%
rename from gfx/drivers_context/win32_dwm_common.h
rename to gfx/drivers_wm/win32_dwm_common.h
diff --git a/gfx/drivers_context/wgl_shader_dlg.c b/gfx/drivers_wm/win32_shader_dlg.c
similarity index 99%
rename from gfx/drivers_context/wgl_shader_dlg.c
rename to gfx/drivers_wm/win32_shader_dlg.c
index 0279c607fa..a88c45c68d 100644
--- a/gfx/drivers_context/wgl_shader_dlg.c
+++ b/gfx/drivers_wm/win32_shader_dlg.c
@@ -31,7 +31,7 @@
 #include "../gl_common.h"
 #include "../video_monitor.h"
 #include "win32_common.h"
-#include "wgl_shader_dlg.h"
+#include "win32_shader_dlg.h"
 #include <windows.h>
 #include <commdlg.h>
 #include <commctrl.h>
diff --git a/gfx/drivers_context/wgl_shader_dlg.h b/gfx/drivers_wm/win32_shader_dlg.h
similarity index 100%
rename from gfx/drivers_context/wgl_shader_dlg.h
rename to gfx/drivers_wm/win32_shader_dlg.h
diff --git a/gfx/drivers_context/x11_common.c b/gfx/drivers_wm/x11_common.c
similarity index 100%
rename from gfx/drivers_context/x11_common.c
rename to gfx/drivers_wm/x11_common.c
diff --git a/gfx/drivers_context/x11_common.h b/gfx/drivers_wm/x11_common.h
similarity index 100%
rename from gfx/drivers_context/x11_common.h
rename to gfx/drivers_wm/x11_common.h
diff --git a/griffin/griffin.c b/griffin/griffin.c
index d201c32a84..6e5e9189a8 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -87,8 +87,8 @@ CHEATS
 UI COMMON CONTEXT
 ============================================================ */
 #if defined(_WIN32) && !defined(_XBOX)
-#include "../gfx/drivers_context/win32_common.c"
-#include "../gfx/drivers_context/win32_dwm_common.c"
+#include "../gfx/drivers_wm/win32_common.c"
+#include "../gfx/drivers_wm/win32_dwm_common.c"
 #endif
 
 /*============================================================
@@ -129,13 +129,13 @@ VIDEO CONTEXT
 
 #if defined(_WIN32) && !defined(_XBOX)
 #include "../gfx/drivers_context/wgl_ctx.c"
-#include "../gfx/drivers_context/wgl_shader_dlg.c"
+#include "../gfx/drivers_wm/win32_shader_dlg.c"
 #endif
 
 #endif
 
 #ifdef HAVE_X11
-#include "../gfx/drivers_context/x11_common.c"
+#include "../gfx/drivers_wm/x11_common.c"
 #endif