3 files changed, 8 insertions, 10 deletions
diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h
index fedb6fdd..269af7e2 100644
--- a/include/wlr/render/egl.h
+++ b/include/wlr/render/egl.h
@@ -11,7 +11,7 @@
 
 #include <wlr/config.h>
 
-#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND
+#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND && !defined MESA_EGL_NO_X11_HEADERS
 #define MESA_EGL_NO_X11_HEADERS
 #endif
 
diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h
index a7f97a89..c98a7cda 100644
--- a/include/wlr/render/interface.h
+++ b/include/wlr/render/interface.h
@@ -11,7 +11,7 @@
 
 #include <wlr/config.h>
 
-#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND
+#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND && !defined MESA_EGL_NO_X11_HEADERS
 #define MESA_EGL_NO_X11_HEADERS
 #endif
 
diff --git a/include/wlr/types/wlr_box.h b/include/wlr/types/wlr_box.h
index 8e25918b..40fd69bd 100644
--- a/include/wlr/types/wlr_box.h
+++ b/include/wlr/types/wlr_box.h
@@ -21,8 +21,8 @@ struct wlr_box {
 void wlr_box_closest_point(const struct wlr_box *box, double x, double y,
 	double *dest_x, double *dest_y);
 
-bool wlr_box_intersection(const struct wlr_box *box_a,
-	const struct wlr_box *box_b, struct wlr_box *dest);
+bool wlr_box_intersection(struct wlr_box *dest, const struct wlr_box *box_a,
+	const struct wlr_box *box_b);
 
 bool wlr_box_contains_point(const struct wlr_box *box, double x, double y);
 
@@ -31,16 +31,14 @@ bool wlr_box_empty(const struct wlr_box *box);
 /**
  * Transforms a box inside a `width` x `height` box.
  */
-void wlr_box_transform(const struct wlr_box *box,
-	enum wl_output_transform transform, int width, int height,
-	struct wlr_box *dest);
+void wlr_box_transform(struct wlr_box *dest, const struct wlr_box *box,
+	enum wl_output_transform transform, int width, int height);
 
 /**
  * Creates the smallest box that contains the box rotated about its center.
  */
-void wlr_box_rotated_bounds(const struct wlr_box *box, float rotation,
-	struct wlr_box *dest);
+void wlr_box_rotated_bounds(struct wlr_box *dest, const struct wlr_box *box, float rotation);
 
-void wlr_box_from_pixman_box32(const pixman_box32_t box, struct wlr_box *dest);
+void wlr_box_from_pixman_box32(struct wlr_box *dest, const pixman_box32_t box);
 
 #endif