diff --git a/ext/vulkan/gstvulkan.c b/ext/vulkan/gstvulkan.c
index d553e87605..6c39dce8b9 100644
--- a/ext/vulkan/gstvulkan.c
+++ b/ext/vulkan/gstvulkan.c
@@ -32,22 +32,13 @@
 #include "vksink.h"
 #include "vkupload.h"
 
-#if GST_VULKAN_HAVE_WINDOW_X11
-#include <X11/Xlib.h>
-#endif
-
-#define GST_CAT_DEFAULT gst_gl_gstgl_debug
+#define GST_CAT_DEFAULT gst_vulkan_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  GST_DEBUG_CATEGORY_INIT (gst_gl_gstgl_debug, "gstvulkan", 0, "gstvulkan");
-
-#if GST_VULKAN_HAVE_WINDOW_X11
-  if (g_getenv ("GST_VULKAN_XINITTHREADS"))
-    XInitThreads ();
-#endif
+  GST_DEBUG_CATEGORY_INIT (gst_vulkan_debug, "vulkan", 0, "vulkan");
 
   if (!gst_element_register (plugin, "vulkansink",
           GST_RANK_NONE, GST_TYPE_VULKAN_SINK)) {
diff --git a/ext/vulkan/vkdisplay.c b/ext/vulkan/vkdisplay.c
index a495e89ad2..a01321ee6c 100644
--- a/ext/vulkan/vkdisplay.c
+++ b/ext/vulkan/vkdisplay.c
@@ -27,9 +27,6 @@
 
 #include "vkdisplay.h"
 
-#if GST_VULKAN_HAVE_WINDOW_X11
-#include "x11/vkdisplay_x11.h"
-#endif
 #if GST_VULKAN_HAVE_WINDOW_XCB
 #include "xcb/vkdisplay_xcb.h"
 #endif
diff --git a/ext/vulkan/vkdisplay.h b/ext/vulkan/vkdisplay.h
index 34b5ae15a6..c223c4697c 100644
--- a/ext/vulkan/vkdisplay.h
+++ b/ext/vulkan/vkdisplay.h
@@ -44,13 +44,10 @@ GType gst_vulkan_display_get_type (void);
 enum _GstVulkanDisplayType
 {
   GST_VULKAN_DISPLAY_TYPE_NONE = 0,
-  GST_VULKAN_DISPLAY_TYPE_X11 = (1 << 0),
-  GST_VULKAN_DISPLAY_TYPE_XCB = (1 << 1),
-  GST_VULKAN_DISPLAY_TYPE_WAYLAND = (1 << 2),
-  GST_VULKAN_DISPLAY_TYPE_MIR = (1 << 3),
-  GST_VULKAN_DISPLAY_TYPE_WIN32 = (1 << 4),
-  GST_VULKAN_DISPLAY_TYPE_COCOA = (1 << 5),
-  GST_VULKAN_DISPLAY_TYPE_IOS = (1 << 6),
+  GST_VULKAN_DISPLAY_TYPE_XCB = (1 << 0),
+  GST_VULKAN_DISPLAY_TYPE_WAYLAND = (1 << 1),
+  GST_VULKAN_DISPLAY_TYPE_COCOA = (1 << 2),
+  GST_VULKAN_DISPLAY_TYPE_IOS = (1 << 3),
 
   GST_VULKAN_DISPLAY_TYPE_ANY = G_MAXUINT32
 };
diff --git a/ext/vulkan/vkwindow.c b/ext/vulkan/vkwindow.c
index e7e17c1982..2a7fcb0581 100644
--- a/ext/vulkan/vkwindow.c
+++ b/ext/vulkan/vkwindow.c
@@ -37,9 +37,6 @@
 
 #include "vkwindow.h"
 
-#if GST_VULKAN_HAVE_WINDOW_X11
-#include "x11/vkwindow_x11.h"
-#endif
 #if GST_VULKAN_HAVE_WINDOW_XCB
 #include "xcb/vkwindow_xcb.h"
 #endif
@@ -178,10 +175,6 @@ gst_vulkan_window_new (GstVulkanDisplay * display)
 
   user_choice = g_getenv ("GST_VULKAN_WINDOW");
   GST_INFO ("creating a window, user choice:%s", user_choice);
-#if GST_VULKAN_HAVE_WINDOW_X11
-  if (!window && (!user_choice || g_strstr_len (user_choice, 3, "x11")))
-    window = GST_VULKAN_WINDOW (gst_vulkan_window_x11_new (display));
-#endif
 #if GST_VULKAN_HAVE_WINDOW_XCB
   if (!window && (!user_choice || g_strstr_len (user_choice, 3, "xcb")))
     window = GST_VULKAN_WINDOW (gst_vulkan_window_xcb_new (display));