Avoid using wayland-{client,server}.h

Their use is discouraged. Instead, include -core or -protocol headers.

backend/wayland/output.c

@@ -8,7 +8,7 @@
 #include <unistd.h>
 
 #include <drm_fourcc.h>
-#include <wayland-client.h>
+#include <wayland-client-protocol.h>
 
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/render/wlr_renderer.h>

backend/wayland/pointer.c

@@ -1,7 +1,6 @@
-
 #include <assert.h>
 #include <stdlib.h>
-#include <wayland-client.h>
+#include <wayland-client-protocol.h>
 #include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/util/log.h>
 

backend/wayland/seat.c

@@ -1,4 +1,3 @@
-
 #include <assert.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -6,7 +5,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <wayland-client.h>
+#include <wayland-client-protocol.h>
 
 #include <wlr/interfaces/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_output.h>

examples/embedded.c

@@ -4,9 +4,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wayland-client.h>
+#include <wayland-client-protocol.h>
 #include <wayland-egl.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/wayland.h>
 #include <wlr/render/allocator.h>
 #include <wlr/types/wlr_compositor.h>

include/backend/wayland.h

@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include <wayland-client.h>
+#include <wayland-client-protocol.h>
 #include <wayland-server-core.h>
 
 #include <wlr/backend/wayland.h>

include/wlr/backend/wayland.h

@@ -1,7 +1,8 @@
 #ifndef WLR_BACKEND_WAYLAND_H
 #define WLR_BACKEND_WAYLAND_H
+
 #include <stdbool.h>
-#include <wayland-client.h>
+#include <wayland-client-protocol.h>
 #include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/types/wlr_output.h>

render/pixman/renderer.c

@@ -2,7 +2,7 @@
 #include <drm_fourcc.h>
 #include <pixman.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-util.h>
 #include <wlr/render/interface.h>
 #include <wlr/util/box.h>
 #include <wlr/util/log.h>

types/buffer/resource.c

@@ -1,6 +1,6 @@
 #include <assert.h>
 #include <string.h>
-#include <wayland-server.h>
+#include <wayland-server-protocol.h>
 #include <wlr/interfaces/wlr_buffer.h>
 #include <wlr/util/log.h>
 #include "types/wlr_buffer.h"

types/wlr_shm.c

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-protocol.h>
 #include <wlr/interfaces/wlr_buffer.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_shm.h>