diff --git a/glamor/glamor.h b/glamor/glamor.h
index 7ec9c5f37..41abe564f 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -114,11 +114,6 @@ extern _X_EXPORT void glamor_clear_pixmap(PixmapPtr pixmap);
 
 extern _X_EXPORT void glamor_block_handler(ScreenPtr screen);
 
-/* This function should be called after glamor_init,
- * but before adding a glamor GLX provider */
-extern _X_EXPORT void glamor_set_glvnd_vendor(ScreenPtr screen,
-                                              const char *vendor);
-
 extern _X_EXPORT PixmapPtr glamor_create_pixmap(ScreenPtr screen, int w, int h,
                                                 int depth, unsigned int usage);
 extern _X_EXPORT Bool glamor_destroy_pixmap(PixmapPtr pixmap);
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 836803720..181506bb2 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -986,6 +986,10 @@ Bool glamor_set_pixmap_texture(PixmapPtr pixmap, unsigned int tex);
 
 void glamor_set_pixmap_type(PixmapPtr pixmap, glamor_pixmap_type_t type);
 
+/* This function should be called after glamor_init,
+ * but before adding a glamor GLX provider */
+void glamor_set_glvnd_vendor(ScreenPtr screen, const char *vendor);
+
 #include "glamor_utils.h"
 
 #if 0
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index ff3565a72..46118126c 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -46,6 +46,7 @@
 #undef GC
 
 #include "dix/input_priv.h"
+#include "glamor/glamor_priv.h"
 
 #include "hostx.h"
 
@@ -66,7 +67,6 @@
 #include <xcb/glx.h>
 #include <epoxy/common.h>
 #include <epoxy/gl.h>
-#include "glamor.h"
 #include "glamor_glx_provider.h"
 #include "ephyr_glamor.h"
 #endif
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index 6618a0a34..881776a94 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -25,6 +25,8 @@
 
 #include <xwayland-config.h>
 
+#include "glamor/glamor_priv.h"
+
 #define MESA_EGL_NO_X11_HEADERS
 #define EGL_NO_X11
 #include <glamor_egl.h>