diff --git a/Makefile.common b/Makefile.common
index d846d1c1a2..e754fb278e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -799,12 +799,6 @@ ifeq ($(HAVE_XVIDEO), 1)
    DEFINES += $(XVIDEO_CFLAGS)
 endif
 
-ifeq ($(HAVE_XSHM), 1)
-   OBJ += gfx/drivers/xshm.o
-   LIBS += $(XSHM_LIBS)
-   DEFINES += $(XSHM_CFLAGS)
-endif
-
 ifeq ($(HAVE_CG), 1)
    DEFINES += -DHAVE_CG
    OBJ += gfx/drivers_shader/shader_gl_cg.o
diff --git a/gfx/drivers/xshm.c b/gfx/drivers/xshm.c
deleted file mode 100644
index e2e687ef09..0000000000
--- a/gfx/drivers/xshm.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <math.h>
-
-/*#include <sys/ipc.h>*/
-#include <sys/shm.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/XShm.h>
-
-#include <retro_inline.h>
-
-#include "../../driver.h"
-#include "../../general.h"
-#include "../font_driver.h"
-#include "../common/x11_common.h"
-
-typedef struct xshm
-{
-	Display* display;
-	int screen;
-	
-	Window parentwindow;
-	Window wndw;
-	
-	unsigned int width;
-	unsigned int height;
-	unsigned int pitch;
-#if 0
-	videoformat bpp;
-#endif
-	
-	XShmSegmentInfo shmInfo;
-	XImage* image;
-	GC gc;
-} xshm_t;
-
-video_driver_t video_xshm = {
-   NULL,/*xshm_init,*/
-   NULL,/*xshm_frame,*/
-   NULL,/*xshm_set_nonblock_state,*/
-   NULL,/*xshm_alive,*/
-   NULL,/*xshm_focus,*/
-   NULL,/*xshm_suppress_screensaver,*/
-   NULL,/*xshm_has_windowed,*/
-   NULL,/*xshm_set_shader,*/
-   NULL,/*xshm_free,*/
-   "xshm",
-   NULL, /* set_viewport */
-   NULL,/*xshm_set_rotation,*/
-   NULL,/*xshm_viewport_info,*/
-   NULL,/*xshm_read_viewport,*/
-   NULL, /* read_frame_raw */
-#ifdef HAVE_OVERLAY
-   NULL, /* overlay_interface */
-#endif
-   NULL/*xshm_get_poke_interface*/
-};
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index d7fe0fc0b5..14e858834f 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -192,9 +192,6 @@ static const video_driver_t *video_drivers[] = {
 #endif
 #ifdef HAVE_SUNXI
    &video_sunxi,
-#endif
-#ifdef HAVE_XSHM
-   &video_xshm,
 #endif
    &video_null,
    NULL,