diff --git a/output.c b/output.c
index 4f40050..53f7b25 100644
--- a/output.c
+++ b/output.c
@@ -261,10 +261,7 @@ scan_out_primary_view(struct cg_output *output) {
 		return false;
 	}
 
-	if(!wlr_output_attach_buffer(wlr_output, surface->buffer)) {
-		return false;
-	}
-
+	wlr_output_attach_buffer(wlr_output, &surface->buffer->base);
 	return wlr_output_commit(wlr_output);
 }
 
diff --git a/xwayland.c b/xwayland.c
index f2d6086..9256945 100644
--- a/xwayland.c
+++ b/xwayland.c
@@ -7,6 +7,7 @@
  * See the LICENSE file accompanying this file.
  */
 
+#include <X11/Xutil.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <wayland-server-core.h>