diff --git a/modules/hw/vdpau/Makefile.am b/modules/hw/vdpau/Makefile.am
index 4c8d127aba..780454e626 100644
--- a/modules/hw/vdpau/Makefile.am
+++ b/modules/hw/vdpau/Makefile.am
@@ -15,9 +15,8 @@ libvdpau_instance_plugin_la_LIBADD = libvlc_vdpau.la \
 
 libvdpau_avcodec_plugin_la_SOURCES = hw/vdpau/avcodec.c hw/vdpau/picture.c
 libvdpau_avcodec_plugin_la_CFLAGS = $(AM_CFLAGS) \
-	$(X_CFLAGS) $(AVCODEC_CFLAGS) $(VDPAU_CFLAGS)
-libvdpau_avcodec_plugin_la_LIBADD = libvlc_vdpau.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lX11 $(AVCODEC_LIBS)
+	$(AVCODEC_CFLAGS) $(VDPAU_CFLAGS)
+libvdpau_avcodec_plugin_la_LIBADD = libvlc_vdpau.la $(AVCODEC_LIBS)
 
 libvdpau_deinterlace_plugin_la_SOURCES = hw/vdpau/deinterlace.c hw/vdpau/picture.c
 libvdpau_deinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS)
diff --git a/modules/hw/vdpau/avcodec.c b/modules/hw/vdpau/avcodec.c
index e75fa2b826..6410209ffa 100644
--- a/modules/hw/vdpau/avcodec.c
+++ b/modules/hw/vdpau/avcodec.c
@@ -36,7 +36,6 @@
 #include <vlc_fourcc.h>
 #include <vlc_picture.h>
 #include <vlc_codec.h>
-#include <vlc_xlib.h>
 #include "vlc_vdpau.h"
 #include "../../codec/avcodec/va.h"
 
@@ -169,12 +168,6 @@ static int Open(vlc_va_t *va, AVCodecContext *avctx, enum AVPixelFormat hwfmt, c
             return VLC_EGENERIC;
     }
 
-    if (!vlc_xlib_init(VLC_OBJECT(va)))
-    {
-        msg_Err(va, "Xlib is required for VDPAU");
-        return VLC_EGENERIC;
-    }
-
     unsigned codec_refs;
     switch (avctx->codec_id)
     {