diff --git a/hw/kdrive/fbdev/fb_glamor.c b/hw/kdrive/fbdev/fb_glamor.c
index bef9cb7dac..558e6300da 100644
--- a/hw/kdrive/fbdev/fb_glamor.c
+++ b/hw/kdrive/fbdev/fb_glamor.c
@@ -68,7 +68,9 @@ fbdevInitAccel(ScreenPtr pScreen)
     KdScreenPriv(pScreen);
     KdScreenInfo *screen = pScreenPriv->screen;
     FbdevScrPriv *scrpriv = screen->driver;
+#ifdef GLXEXT
     static Bool vendor_initialized = FALSE;
+#endif
 
     if (!fbdev_glamor_egl_init(pScreen)) {
         screen->dumb = TRUE;
@@ -81,10 +83,12 @@ fbdevInitAccel(ScreenPtr pScreen)
         return FALSE;
     }
 
+#ifdef GLXEXT
     if (!vendor_initialized) {
         GlxPushProvider(&glamor_provider);
         vendor_initialized = TRUE;
     }
+#endif
 
     return TRUE;
 }
diff --git a/hw/kdrive/fbdev/fbdev.h b/hw/kdrive/fbdev/fbdev.h
index 0a5fb1436c..e6685b5879 100644
--- a/hw/kdrive/fbdev/fbdev.h
+++ b/hw/kdrive/fbdev/fbdev.h
@@ -32,7 +32,7 @@
 #include "randrstr.h"
 #endif
 
-#if defined(GLAMOR) && defined(GLXEXT)
+#ifdef GLAMOR
 #include <epoxy/egl.h>
 #endif
 
@@ -50,7 +50,7 @@ typedef struct _fbdevPriv {
 typedef struct _fbdevScrPriv {
     Rotation randr;
     Bool shadow;
-#if defined(GLAMOR) && defined(GLXEXT)
+#ifdef GLAMOR
     Bool glamor_initialized;
     EGLDisplay display;
     EGLContext ctx;
@@ -62,7 +62,7 @@ extern KdCardFuncs fbdevFuncs;
 extern const char *fbdevDevicePath;
 extern Bool fbDisableShadow;
 
-#if defined(GLAMOR) && defined(GLXEXT)
+#ifdef GLAMOR
 extern const char *fbdev_glvnd_provider;
 extern Bool es_allowed;
 extern Bool force_es;
@@ -98,7 +98,7 @@ void fbdevPutColors(ScreenPtr pScreen, int n, xColorItem * pdefs);
 
 Bool fbdevMapFramebuffer(KdScreenInfo * screen);
 
-#if defined(GLAMOR) && defined(GLXEXT)
+#ifdef GLAMOR
 Bool fbdevInitAccel(ScreenPtr screen);
 
 void fbdevEnableAccel(ScreenPtr screen);
diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c
index 36d588a33e..c8d337ed10 100644
--- a/hw/kdrive/fbdev/fbinit.c
+++ b/hw/kdrive/fbdev/fbinit.c
@@ -96,7 +96,7 @@ ddxProcessArgument(int argc, char **argv, int i)
         return 1;
     }
 
-#if defined(GLAMOR) && defined(GLXEXT)
+#ifdef GLAMOR
     if (!strcmp(argv[i], "-glvendor")) {
         if (i + 1 < argc) {
             fbdev_glvnd_provider = argv[i + 1];
@@ -136,7 +136,7 @@ KdCardFuncs fbdevFuncs = {
 
     /* no cursor funcs */
 
-#if defined(GLAMOR) && defined(GLXEXT)
+#ifdef GLAMOR
     .initAccel        = fbdevInitAccel,
     .enableAccel      = fbdevEnableAccel,
     .disableAccel     = fbdevDisableAccel,
diff --git a/hw/kdrive/fbdev/meson.build b/hw/kdrive/fbdev/meson.build
index e8542cc19f..f79741a97f 100644
--- a/hw/kdrive/fbdev/meson.build
+++ b/hw/kdrive/fbdev/meson.build
@@ -6,7 +6,7 @@ srcs = [
 
 fbdev_glamor = []
 fbdev_dep = []
-if build_glamor and build_glx
+if build_glamor
     srcs += 'fb_glamor.c'
     fbdev_glamor += glamor
     fbdev_dep += epoxy_dep