diff --git a/glamor/glamor.h b/glamor/glamor.h
index 41abe564f..c042facd6 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -136,9 +136,6 @@ extern _X_EXPORT Bool glamor_destroy_pixmap(PixmapPtr pixmap);
 extern _X_EXPORT void glamor_egl_exchange_buffers(PixmapPtr front,
                                                   PixmapPtr back);
 
-extern _X_EXPORT void glamor_pixmap_exchange_fbos(PixmapPtr front,
-                                                  PixmapPtr back);
-
 /* The DDX is not supposed to call these four functions */
 extern _X_EXPORT void glamor_enable_dri3(ScreenPtr screen);
 extern _X_EXPORT int glamor_egl_fds_from_pixmap(ScreenPtr, PixmapPtr, int *,
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 458c2c379..776945ae2 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -42,10 +42,9 @@
 #include <gbm.h>
 #include <drm_fourcc.h>
 
-#include "glamor_egl.h"
+#include "glamor/glamor_priv.h"
 
-#include "glamor.h"
-#include "glamor_priv.h"
+#include "glamor_egl.h"
 #include "glamor_glx_provider.h"
 #include "dri3.h"
 
diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c
index 0db9d6858..c08250ad9 100644
--- a/glamor/glamor_fbo.c
+++ b/glamor/glamor_fbo.c
@@ -28,7 +28,7 @@
 
 #include <stdlib.h>
 
-#include "glamor_priv.h"
+#include "glamor/glamor_priv.h"
 
 void
 glamor_destroy_fbo(glamor_screen_private *glamor_priv,
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 181506bb2..c61e38a42 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -990,6 +990,8 @@ void glamor_set_pixmap_type(PixmapPtr pixmap, glamor_pixmap_type_t type);
  * but before adding a glamor GLX provider */
 void glamor_set_glvnd_vendor(ScreenPtr screen, const char *vendor);
 
+void glamor_pixmap_exchange_fbos(PixmapPtr front, PixmapPtr back);
+
 #include "glamor_utils.h"
 
 #if 0