diff --git a/cogl/cogl-display.h b/cogl/cogl-display.h
index 463b99cbd..c8cf7be63 100644
--- a/cogl/cogl-display.h
+++ b/cogl/cogl-display.h
@@ -171,24 +171,6 @@ cogl_gdl_display_set_plane (CoglDisplay *display,
                             gdl_plane_id_t plane);
 #endif
 
-#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
-/**
- * cogl_wayland_display_set_compositor_display:
- * @display: a #CoglDisplay
- * @wayland_display: A compositor's Wayland display pointer
- *
- * Informs Cogl of a compositor's Wayland display pointer. This
- * enables Cogl to register private wayland extensions required to
- * pass buffers between the clients and compositor.
- *
- * Since: 1.10
- * Stability: unstable
- */
-void
-cogl_wayland_display_set_compositor_display (CoglDisplay *display,
-                                          struct wl_display *wayland_display);
-#endif
-
 /**
  * cogl_is_display:
  * @object: A #CoglObject pointer
diff --git a/cogl/cogl-wayland-server.h b/cogl/cogl-wayland-server.h
index 9c2cb46cc..315af22ea 100644
--- a/cogl/cogl-wayland-server.h
+++ b/cogl/cogl-wayland-server.h
@@ -34,8 +34,22 @@
 
 G_BEGIN_DECLS
 
-#define cogl_wayland_texture_2d_new_from_buffer \
-  cogl_wayland_texture_2d_new_from_buffer_EXP
+/**
+ * cogl_wayland_display_set_compositor_display:
+ * @display: a #CoglDisplay
+ * @wayland_display: A compositor's Wayland display pointer
+ *
+ * Informs Cogl of a compositor's Wayland display pointer. This
+ * enables Cogl to register private wayland extensions required to
+ * pass buffers between the clients and compositor.
+ *
+ * Since: 1.10
+ * Stability: unstable
+ */
+void
+cogl_wayland_display_set_compositor_display (CoglDisplay *display,
+                                          struct wl_display *wayland_display);
+
 /**
  * cogl_wayland_texture_2d_new_from_buffer:
  * @ctx: A #CoglContext