diff --git a/Makefile.common b/Makefile.common
index 7832a2fe01..59f2ac614a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -384,7 +384,7 @@ endif
 
 ifeq ($(HAVE_X11), 1)
    OBJ += input/drivers/x11_input.o \
-			 gfx/drivers_wm/x11_common.o \
+			 gfx/common/x11_common.o \
 			 input/drivers_keyboard/keyboard_event_x11.o
    LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS)
    DEFINES += $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
diff --git a/gfx/drivers_wm/x11_common.c b/gfx/common/x11_common.c
similarity index 100%
rename from gfx/drivers_wm/x11_common.c
rename to gfx/common/x11_common.c
diff --git a/gfx/drivers_wm/x11_common.h b/gfx/common/x11_common.h
similarity index 100%
rename from gfx/drivers_wm/x11_common.h
rename to gfx/common/x11_common.h
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index 2f1db80e1f..5472725e3d 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_wm/x11_common.h"
+#include "../common/x11_common.h"
 #endif
 
 #if defined(_WIN32) && !defined(_XBOX)
diff --git a/gfx/drivers/sdl_gfx.c b/gfx/drivers/sdl_gfx.c
index 6a941740bd..16e42a2c50 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_wm/x11_common.h"
+#include "../common/x11_common.h"
 #endif
 
 #if defined(_WIN32) && !defined(_XBOX)
diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c
index e9a7fafb83..8e382859ef 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_wm/x11_common.h"
+#include "../common/x11_common.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/gfx/drivers_context/glx_ctx.c b/gfx/drivers_context/glx_ctx.c
index 236bd9a300..01b3a4822f 100644
--- a/gfx/drivers_context/glx_ctx.c
+++ b/gfx/drivers_context/glx_ctx.c
@@ -18,7 +18,7 @@
 #include "../../runloop.h"
 #include "../drivers/gl_common.h"
 #include "../video_monitor.h"
-#include "../drivers_wm/x11_common.h"
+#include "../common/x11_common.h"
 
 #include <signal.h>
 #include <stdint.h>
diff --git a/gfx/drivers_context/xegl_ctx.c b/gfx/drivers_context/xegl_ctx.c
index 1bffc3f061..c38a625d25 100644
--- a/gfx/drivers_context/xegl_ctx.c
+++ b/gfx/drivers_context/xegl_ctx.c
@@ -22,7 +22,7 @@
 #include "../../runloop.h"
 #include "../drivers/gl_common.h"
 #include "../video_monitor.h"
-#include "../drivers_wm/x11_common.h"
+#include "../common/x11_common.h"
 
 #include <signal.h>
 #include <stdint.h>
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 3d4a2ff053..a1a253f32a 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -135,7 +135,7 @@ VIDEO CONTEXT
 #endif
 
 #ifdef HAVE_X11
-#include "../gfx/drivers_wm/x11_common.c"
+#include "../gfx/common/x11_common.c"
 #endif