diff --git a/hw/kdrive/fbdev/fb_glamor.c b/hw/kdrive/fbdev/fb_glamor.c
index 2a421bb097..6a7787aaea 100644
--- a/hw/kdrive/fbdev/fb_glamor.c
+++ b/hw/kdrive/fbdev/fb_glamor.c
@@ -47,7 +47,7 @@ fbdev_glamor_egl_cleanup(FbdevScrPriv *scrpriv)
 }
 
 static void
-glamor_egl_make_current(struct glamor_context *glamor_ctx)
+fbdev_glamor_egl_make_current(struct glamor_context *glamor_ctx)
 {
     /* There's only a single global dispatch table in Mesa.  EGL, GLX,
      * and AIGLX's direct dispatch table manipulation don't talk to
@@ -138,7 +138,7 @@ fbdevFiniAccel(ScreenPtr pScreen)
 }
 
 static Bool
-glamor_query_devices_ext(EGLDeviceEXT **devices, EGLint *num_devices)
+fbdev_glamor_query_devices_ext(EGLDeviceEXT **devices, EGLint *num_devices)
 {
     EGLint max_devices = 0;
 
@@ -178,7 +178,7 @@ glamor_query_devices_ext(EGLDeviceEXT **devices, EGLint *num_devices)
 }
 
 static inline Bool
-glamor_egl_device_matches_config(EGLDeviceEXT device, Bool strict)
+fbdev_glamor_egl_device_matches_config(EGLDeviceEXT device, Bool strict)
 {
     if (!strict) {
         return TRUE;
@@ -232,17 +232,17 @@ fbdev_glamor_egl_init_display(FbdevScrPriv *scrpriv)
         scrpriv->display = EGL_NO_DISPLAY; \
     }
 
-    if (glamor_query_devices_ext(&devices, &num_devices)) {
+    if (fbdev_glamor_query_devices_ext(&devices, &num_devices)) {
         /* Try a strict match first */
         for (uint32_t i = 0; i < num_devices; i++) {
-            if (glamor_egl_device_matches_config(devices[i], TRUE)) {
+            if (fbdev_glamor_egl_device_matches_config(devices[i], TRUE)) {
                 GLAMOR_EGL_TRY_PLATFORM(EGL_PLATFORM_DEVICE_EXT, devices[i], TRUE);
             }
         }
 
         /* Try a try a less strict match now */
         for (uint32_t i = 0; i < num_devices; i++) {
-            if (glamor_egl_device_matches_config(devices[i], FALSE)) {
+            if (fbdev_glamor_egl_device_matches_config(devices[i], FALSE)) {
                 GLAMOR_EGL_TRY_PLATFORM(EGL_PLATFORM_DEVICE_EXT, devices[i], TRUE);
             }
         }
@@ -380,7 +380,7 @@ glamor_egl_screen_init(ScreenPtr pScreen, struct glamor_context *glamor_ctx)
     glamor_ctx->display = scrpriv->display;
     glamor_ctx->ctx = scrpriv->ctx;
     glamor_ctx->surface = EGL_NO_SURFACE;
-    glamor_ctx->make_current = glamor_egl_make_current;
+    glamor_ctx->make_current = fbdev_glamor_egl_make_current;
 }
 
 /* Stubs for glamor */