9 files changed, 19 insertions, 20 deletions
diff --git a/include/wlr/backend/meson.build b/include/wlr/backend/meson.build
index e005b854..3d6f0e40 100644
--- a/include/wlr/backend/meson.build
+++ b/include/wlr/backend/meson.build
@@ -9,7 +9,7 @@ install_headers(
 	subdir: 'wlr/backend',
 )
 
-if conf_data.get('WLR_HAS_X11_BACKEND', false)
+if conf_data.get('WLR_HAS_X11_BACKEND', 0) == 1
 	install_headers('x11.h', subdir: 'wlr/backend')
 endif
 
diff --git a/include/wlr/backend/x11.h b/include/wlr/backend/x11.h
index 56360bf7..5793a3b9 100644
--- a/include/wlr/backend/x11.h
+++ b/include/wlr/backend/x11.h
@@ -2,7 +2,9 @@
 #define WLR_BACKEND_X11_H
 
 #include <stdbool.h>
+
 #include <wayland-server.h>
+
 #include <wlr/backend.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_output.h>
diff --git a/include/wlr/config.h.in b/include/wlr/config.h.in
index 17277c07..94273fac 100644
--- a/include/wlr/config.h.in
+++ b/include/wlr/config.h.in
@@ -12,6 +12,5 @@
 
 #mesondefine WLR_HAS_XCB_ERRORS
 #mesondefine WLR_HAS_XCB_ICCCM
-#mesondefine WLR_HAS_XCB_XKB
 
 #endif
diff --git a/include/wlr/meson.build b/include/wlr/meson.build
index 43b5aec9..8874dbc7 100644
--- a/include/wlr/meson.build
+++ b/include/wlr/meson.build
@@ -15,7 +15,7 @@ install_headers(
 	'xcursor.h',
 	subdir: 'wlr'
 )
-if conf_data.get('WLR_HAS_XWAYLAND', false)
+if conf_data.get('WLR_HAS_XWAYLAND', 0) == 1
 	install_headers('xwayland.h', subdir: 'wlr')
 endif
 
diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h
index 9ba2996a..fedb6fdd 100644
--- a/include/wlr/render/egl.h
+++ b/include/wlr/render/egl.h
@@ -11,7 +11,7 @@
 
 #include <wlr/config.h>
 
-#if !(defined(WLR_HAS_X11_BACKEND) || defined(WLR_HAS_WAYLAND))
+#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND
 #define MESA_EGL_NO_X11_HEADERS
 #endif
 
diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h
index 9500bced..a7f97a89 100644
--- a/include/wlr/render/interface.h
+++ b/include/wlr/render/interface.h
@@ -11,7 +11,7 @@
 
 #include <wlr/config.h>
 
-#if !(defined(WLR_HAS_X11_BACKEND) || defined(WLR_HAS_WAYLAND))
+#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND
 #define MESA_EGL_NO_X11_HEADERS
 #endif
 
diff --git a/include/wlr/render/wlr_renderer.h b/include/wlr/render/wlr_renderer.h
index 02b4a11e..9c031b7f 100644
--- a/include/wlr/render/wlr_renderer.h
+++ b/include/wlr/render/wlr_renderer.h
@@ -97,11 +97,6 @@ int wlr_renderer_get_dmabuf_formats(struct wlr_renderer *renderer,
 int wlr_renderer_get_dmabuf_modifiers(struct wlr_renderer *renderer, int format,
 	uint64_t **modifiers);
 /**
- * Get the preferred format for reading pixels.
- */
-bool wlr_renderer_preferred_read_format(struct wlr_renderer *renderer,
-	enum wl_shm_format *fmt);
-/**
  * Reads out of pixels of the currently bound surface into data. `stride` is in
  * bytes.
  *
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index 9ccfbbb5..6d38152a 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -106,11 +106,6 @@ struct wlr_output {
 
 	struct wl_event_source *idle_frame;
 
-	struct wlr_surface *fullscreen_surface;
-	struct wl_listener fullscreen_surface_commit;
-	struct wl_listener fullscreen_surface_destroy;
-	int fullscreen_width, fullscreen_height;
-
 	struct wl_list cursors; // wlr_output_cursor::link
 	struct wlr_output_cursor *hardware_cursor;
 	int software_cursor_locks; // number of locks forcing software cursors
@@ -198,6 +193,12 @@ void wlr_output_effective_resolution(struct wlr_output *output,
  */
 bool wlr_output_make_current(struct wlr_output *output, int *buffer_age);
 /**
+ * Get the preferred format for reading pixels.
+ * This function might change the current rendering context.
+ */
+bool wlr_output_preferred_read_format(struct wlr_output *output,
+	enum wl_shm_format *fmt);
+/**
  * Swaps the output buffers. If the time of the frame isn't known, set `when` to
  * NULL. If the compositor doesn't support damage tracking, set `damage` to
  * NULL.
@@ -226,8 +227,6 @@ bool wlr_output_set_gamma(struct wlr_output *output, size_t size,
 	const uint16_t *r, const uint16_t *g, const uint16_t *b);
 bool wlr_output_export_dmabuf(struct wlr_output *output,
 	struct wlr_dmabuf_attributes *attribs);
-void wlr_output_set_fullscreen_surface(struct wlr_output *output,
-	struct wlr_surface *surface);
 struct wlr_output *wlr_output_from_resource(struct wl_resource *resource);
 /**
  * Locks the output to only use software cursors instead of hardware cursors.
@@ -237,6 +236,12 @@ struct wlr_output *wlr_output_from_resource(struct wl_resource *resource);
  * a lock.
  */
 void wlr_output_lock_software_cursors(struct wlr_output *output, bool lock);
+/**
+ * Renders software cursors. This is a utility function that can be called when
+ * compositors render.
+ */
+void wlr_output_render_software_cursors(struct wlr_output *output,
+	pixman_region32_t *damage);
 
 
 struct wlr_output_cursor *wlr_output_cursor_create(struct wlr_output *output);
diff --git a/include/wlr/types/wlr_primary_selection.h b/include/wlr/types/wlr_primary_selection.h
index f33f6368..192bfc02 100644
--- a/include/wlr/types/wlr_primary_selection.h
+++ b/include/wlr/types/wlr_primary_selection.h
@@ -14,6 +14,7 @@
 
 struct wlr_primary_selection_device_manager {
 	struct wl_global *global;
+	struct wl_list resources;
 
 	struct wl_listener display_destroy;
 
@@ -24,8 +25,6 @@ struct wlr_primary_selection_device_manager {
 	void *data;
 };
 
-struct wlr_primary_selection_offer;
-
 struct wlr_primary_selection_source {
 	// source metadata
 	struct wl_array mime_types;
@@ -36,7 +35,6 @@ struct wlr_primary_selection_source {
 	void (*cancel)(struct wlr_primary_selection_source *source);
 
 	// source status
-	struct wlr_primary_selection_offer *offer;
 	struct wlr_seat_client *seat_client;
 
 	struct {