Remove all wayland-server.h includes

The documentation for wayland-server.h says:

> Use of this header file is discouraged. Prefer including
> wayland-server-core.h instead, which does not include the server protocol
> header and as such only defines the library PI, excluding the deprecated API
> below.

Replacing wayland-server.h with wayland-server-core.h allows us to drop the
WL_HIDE_DEPRECATED declaration.

backend/backend.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/drm.h>
 #include <wlr/backend/headless.h>
 #include <wlr/backend/interface.h>

backend/drm/backend.c

@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/interface.h>
 #include <wlr/backend/session.h>
 #include <wlr/interfaces/wlr_output.h>

backend/drm/drm.c

@@ -12,7 +12,7 @@
 #include <string.h>
 #include <strings.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wayland-util.h>
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_output.h>

backend/rdp/keyboard.c

@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_keyboard.h>
 #include <wlr/interfaces/wlr_keyboard.h>

backend/rdp/output.c

@@ -2,7 +2,7 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/log.h>

backend/rdp/pointer.c

@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <string.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_pointer.h>
 #include <wlr/interfaces/wlr_pointer.h>

backend/session/direct-freebsd.c

@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #include <termios.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/session/interface.h>
 #include <wlr/util/log.h>
 #include <xf86drm.h>

backend/session/direct.c

@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/session/interface.h>
 #include <wlr/util/log.h>
 #include "backend/session/direct-ipc.h"

backend/session/logind.c

@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 #include <sys/sysmacros.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/session/interface.h>
 #include <wlr/config.h>
 #include <wlr/util/log.h>

backend/session/noop.c

@@ -3,7 +3,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/session/interface.h>
 #include <wlr/util/log.h>
 #include "util/signal.h"

backend/session/session.c

@@ -6,7 +6,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/session.h>
 #include <wlr/backend/session/interface.h>
 #include <wlr/config.h>

backend/wayland/backend.c

@@ -5,7 +5,7 @@
 
 #include <wlr/config.h>
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 
 #include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_input_device.h>

backend/x11/backend.c

@@ -10,7 +10,7 @@
 #include <wlr/config.h>
 
 #include <X11/Xlib-xcb.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <xcb/xcb.h>
 #include <xcb/xfixes.h>
 #include <xcb/xinput.h>

examples/fullscreen-shell.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_compositor.h>

examples/multi-pointer.c

@@ -7,8 +7,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server-protocol.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/render/gles2.h>

examples/output-layout.c

@@ -8,8 +8,7 @@
 #include <strings.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server-protocol.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/render/wlr_renderer.h>

examples/pointer.c

@@ -6,8 +6,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server-protocol.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/render/gles2.h>

examples/rotation.c

@@ -8,8 +8,7 @@
 #include <strings.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server-protocol.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/render/wlr_renderer.h>

examples/simple.c

@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/types/wlr_output.h>

examples/tablet.c

@@ -6,8 +6,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server-protocol.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/render/wlr_renderer.h>

examples/touch.c

@@ -7,8 +7,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server-protocol.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/types/wlr_output.h>

include/backend/drm/drm.h

@@ -7,7 +7,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wayland-util.h>
 #include <wlr/backend/drm.h>
 #include <wlr/backend/session.h>

include/backend/wayland.h

@@ -5,7 +5,7 @@
 
 #include <wayland-client.h>
 #include <wayland-egl.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wayland-util.h>
 
 #include <wlr/backend/wayland.h>

include/backend/x11.h

@@ -4,7 +4,7 @@
 #include <stdbool.h>
 
 #include <X11/Xlib-xcb.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <xcb/xcb.h>
 
 #include <wlr/backend/x11.h>

include/rootston/desktop.h

@@ -1,7 +1,7 @@
 #ifndef ROOTSTON_DESKTOP_H
 #define ROOTSTON_DESKTOP_H
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/config.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_foreign_toplevel_management_v1.h>

include/rootston/input.h

@@ -1,7 +1,7 @@
 #ifndef ROOTSTON_INPUT_H
 #define ROOTSTON_INPUT_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_seat.h>

include/rootston/output.h

@@ -2,7 +2,7 @@
 #define ROOTSTON_OUTPUT_H
 #include <pixman.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output_damage.h>
 

include/rootston/seat.h

@@ -1,7 +1,7 @@
 #ifndef ROOTSTON_SEAT_H
 #define ROOTSTON_SEAT_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include "rootston/input.h"
 #include "rootston/keyboard.h"
 #include "rootston/layers.h"

include/rootston/server.h

@@ -1,7 +1,7 @@
 #ifndef _ROOTSTON_SERVER_H
 #define _ROOTSTON_SERVER_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/config.h>

include/types/wlr_data_device.h

@@ -1,7 +1,7 @@
 #ifndef TYPES_WLR_DATA_DEVICE_H
 #define TYPES_WLR_DATA_DEVICE_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 
 #define DATA_DEVICE_ALL_ACTIONS (WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY | \
 	WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE | \

include/types/wlr_seat.h

@@ -1,7 +1,7 @@
 #ifndef TYPES_WLR_SEAT_H
 #define TYPES_WLR_SEAT_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_seat.h>
 
 const struct wlr_pointer_grab_interface default_pointer_grab_impl;

include/types/wlr_tablet_v2.h

@@ -2,7 +2,7 @@
 #define TYPES_WLR_TABLET_V2_H
 
 #include "tablet-unstable-v2-protocol.h"
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_tablet_v2.h>
 
 struct wlr_tablet_seat_v2 {

include/types/wlr_xdg_shell.h

@@ -1,7 +1,7 @@
 #ifndef TYPES_WLR_XDG_SHELL_H
 #define TYPES_WLR_XDG_SHELL_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include "xdg-shell-protocol.h"
 

include/types/wlr_xdg_shell_v6.h

@@ -1,7 +1,7 @@
 #ifndef TYPES_WLR_XDG_SHELL_V6_H
 #define TYPES_WLR_XDG_SHELL_V6_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include "xdg-shell-unstable-v6-protocol.h"
 

include/util/signal.h

@@ -1,7 +1,7 @@
 #ifndef UTIL_SIGNAL_H
 #define UTIL_SIGNAL_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 
 void wlr_signal_emit_safe(struct wl_signal *signal, void *data);
 

include/wlr/backend.h

@@ -9,7 +9,7 @@
 #ifndef WLR_BACKEND_H
 #define WLR_BACKEND_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/session.h>
 #include <wlr/render/egl.h>
 

include/wlr/backend/drm.h

@@ -9,7 +9,7 @@
 #ifndef WLR_BACKEND_DRM_H
 #define WLR_BACKEND_DRM_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/types/wlr_output.h>

include/wlr/backend/libinput.h

@@ -10,7 +10,7 @@
 #define WLR_BACKEND_LIBINPUT_H
 
 #include <libinput.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/session.h>
 #include <wlr/types/wlr_input_device.h>

include/wlr/backend/session.h

@@ -4,7 +4,7 @@
 #include <libudev.h>
 #include <stdbool.h>
 #include <sys/types.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 
 struct session_impl;
 

include/wlr/backend/wayland.h

@@ -2,7 +2,7 @@
 #define WLR_BACKEND_WAYLAND_H
 #include <stdbool.h>
 #include <wayland-client.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_output.h>

include/wlr/backend/x11.h

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

include/wlr/render/egl.h

@@ -19,7 +19,7 @@
 #include <EGL/eglext.h>
 #include <pixman.h>
 #include <stdbool.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/render/dmabuf.h>
 #include <wlr/render/drm_format_set.h>
 

include/wlr/types/wlr_box.h

@@ -11,7 +11,7 @@
 
 #include <pixman.h>
 #include <stdbool.h>
-#include <wayland-server.h>
+#include <wayland-server-protocol.h>
 
 struct wlr_box {
 	int x, y;

include/wlr/types/wlr_buffer.h

@@ -10,7 +10,7 @@
 #define WLR_TYPES_WLR_BUFFER_H
 
 #include <pixman.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/render/dmabuf.h>
 
 /**

include/wlr/types/wlr_compositor.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_COMPOSITOR_H
 #define WLR_TYPES_WLR_COMPOSITOR_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/render/wlr_renderer.h>
 
 struct wlr_surface;

include/wlr/types/wlr_cursor.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_CURSOR_H
 #define WLR_TYPES_WLR_CURSOR_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_output_layout.h>

include/wlr/types/wlr_data_control_v1.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_DATA_CONTROL_V1_H
 #define WLR_TYPES_WLR_DATA_CONTROL_V1_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_seat.h>
 
 struct wlr_data_control_manager_v1 {

include/wlr/types/wlr_data_device.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_DATA_DEVICE_H
 #define WLR_TYPES_WLR_DATA_DEVICE_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_seat.h>
 
 extern const struct wlr_pointer_grab_interface

include/wlr/types/wlr_export_dmabuf_v1.h

@@ -10,7 +10,7 @@
 #define WLR_TYPES_WLR_EXPORT_DMABUF_V1_H
 
 #include <stdbool.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/render/dmabuf.h>
 
 struct wlr_export_dmabuf_manager_v1 {

include/wlr/types/wlr_foreign_toplevel_management_v1.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_FOREIGN_TOPLEVEL_MANAGEMENT_V1_H
 #define WLR_TYPES_WLR_FOREIGN_TOPLEVEL_MANAGEMENT_V1_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_output.h>
 
 struct wlr_foreign_toplevel_manager_v1 {

include/wlr/types/wlr_fullscreen_shell_v1.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_FULLSCREEN_SHELL_V1_H
 #define WLR_TYPES_WLR_FULLSCREEN_SHELL_V1_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include "fullscreen-shell-unstable-v1-protocol.h"
 
 struct wlr_fullscreen_shell_v1 {

include/wlr/types/wlr_gamma_control_v1.h

@@ -1,7 +1,7 @@
 #ifndef WLR_TYPES_WLR_GAMMA_CONTROL_V1_H
 #define WLR_TYPES_WLR_GAMMA_CONTROL_V1_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 
 struct wlr_gamma_control_manager_v1 {
 	struct wl_global *global;

include/wlr/types/wlr_gtk_primary_selection.h

@@ -14,7 +14,7 @@
 #ifndef WLR_TYPES_WLR_GTK_PRIMARY_SELECTION_H
 #define WLR_TYPES_WLR_GTK_PRIMARY_SELECTION_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_seat.h>
 
 /**

include/wlr/types/wlr_idle.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_IDLE_H
 #define WLR_TYPES_WLR_IDLE_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_seat.h>
 
 /**

include/wlr/types/wlr_idle_inhibit_v1.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_IDLE_INHIBIT_V1_H
 #define WLR_TYPES_WLR_IDLE_INHIBIT_V1_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 
 /* This interface permits clients to inhibit the idle behavior such as
  * screenblanking, locking, and screensaving.

include/wlr/types/wlr_input_inhibitor.h

@@ -8,7 +8,7 @@
 
 #ifndef WLR_TYPES_INPUT_INHIBITOR_H
 #define WLR_TYPES_INPUT_INHIBITOR_H
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 
 struct wlr_input_inhibit_manager {
 	struct wl_global *global;

include/wlr/types/wlr_input_method_v2.h

@@ -10,7 +10,7 @@
 #define WLR_TYPES_WLR_INPUT_METHOD_V2_H
 #include <stdint.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_seat.h>
 
 struct wlr_input_method_v2_preedit_string {

include/wlr/types/wlr_keyboard.h

@@ -11,8 +11,8 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <wayland-server.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
+#include <wayland-server-core.h>
 #include <xkbcommon/xkbcommon.h>
 
 #define WLR_LED_COUNT 3

include/wlr/types/wlr_layer_shell_v1.h

@@ -10,7 +10,7 @@
 #define WLR_TYPES_WLR_LAYER_SHELL_V1_H
 #include <stdbool.h>
 #include <stdint.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
 #include "wlr-layer-shell-unstable-v1-protocol.h"

include/wlr/types/wlr_matrix.h

@@ -17,7 +17,7 @@
 #ifndef WLR_TYPES_WLR_MATRIX_H
 #define WLR_TYPES_WLR_MATRIX_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 
 /** Writes the identity matrix into mat */

include/wlr/types/wlr_output.h

@@ -12,7 +12,7 @@
 #include <pixman.h>
 #include <stdbool.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-protocol.h>
 #include <wayland-util.h>
 #include <wlr/render/dmabuf.h>
 #include <wlr/types/wlr_buffer.h>

include/wlr/types/wlr_output_management_v1.h

@@ -10,7 +10,7 @@
 #define WLR_TYPES_WLR_OUTPUT_MANAGEMENT_V1_H
 
 #include <stdbool.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_output.h>
 
 struct wlr_output_manager_v1 {

include/wlr/types/wlr_pointer.h

@@ -10,7 +10,7 @@
 #define WLR_TYPES_WLR_POINTER_H
 
 #include <stdint.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_input_device.h>
 
 struct wlr_pointer_impl;

include/wlr/types/wlr_pointer_constraints_v1.h

@@ -10,7 +10,7 @@
 #define WLR_TYPES_WLR_POINTER_CONSTRAINTS_V1_H
 
 #include <stdint.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <pixman.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_seat.h>

include/wlr/types/wlr_pointer_gestures_v1.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_POINTER_GESTURES_V1_H
 #define WLR_TYPES_WLR_POINTER_GESTURES_V1_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/types/wlr_surface.h>
 

include/wlr/types/wlr_presentation_time.h

@@ -12,7 +12,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 
 struct wlr_presentation {
 	struct wl_global *global;

include/wlr/types/wlr_primary_selection.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_PRIMARY_SELECTION_H
 #define WLR_TYPES_WLR_PRIMARY_SELECTION_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_seat.h>
 
 struct wlr_primary_selection_source;

include/wlr/types/wlr_primary_selection_v1.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_PRIMARY_SELECTION_V1_H
 #define WLR_TYPES_WLR_PRIMARY_SELECTION_V1_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_seat.h>
 
 struct wlr_primary_selection_v1_device_manager {

include/wlr/types/wlr_relative_pointer_v1.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_RELATIVE_POINTER_V1_H
 #define WLR_TYPES_WLR_RELATIVE_POINTER_V1_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 
 /**
  * This protocol specifies a set of interfaces used for making clients able to

include/wlr/types/wlr_screencopy_v1.h

@@ -10,7 +10,7 @@
 #define WLR_TYPES_WLR_SCREENCOPY_V1_H
 
 #include <stdbool.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 
 struct wlr_screencopy_manager_v1 {

include/wlr/types/wlr_seat.h

@@ -10,7 +10,7 @@
 #define WLR_TYPES_WLR_SEAT_H
 
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_keyboard.h>
 #include <wlr/types/wlr_surface.h>

include/wlr/types/wlr_server_decoration.h

@@ -14,7 +14,7 @@
 #ifndef WLR_TYPES_WLR_SERVER_DECORATION_H
 #define WLR_TYPES_WLR_SERVER_DECORATION_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 
 /**
  * Possible values to use in request_mode and the event mode. Same as

include/wlr/types/wlr_surface.h

@@ -13,7 +13,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_output.h>
 
 enum wlr_surface_state_field {

include/wlr/types/wlr_switch.h

@@ -10,7 +10,7 @@
 #define WLR_TYPES_WLR_SWITCH_H
 
 #include <stdint.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_list.h>
 

include/wlr/types/wlr_tablet_pad.h

@@ -10,7 +10,7 @@
 #define WLR_TYPES_WLR_TABLET_PAD_H
 
 #include <stdint.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_list.h>
 

include/wlr/types/wlr_tablet_tool.h

@@ -10,7 +10,7 @@
 #define WLR_TYPES_TABLET_TOOL_H
 
 #include <stdint.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_list.h>
 

include/wlr/types/wlr_tablet_v2.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_TABLET_V2_H
 #define WLR_TYPES_WLR_TABLET_V2_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/types/wlr_input_device.h>
 

include/wlr/types/wlr_text_input_v3.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_TEXT_INPUT_V3_H
 #define WLR_TYPES_WLR_TEXT_INPUT_V3_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/types/wlr_surface.h>
 

include/wlr/types/wlr_touch.h

@@ -10,7 +10,7 @@
 #define WLR_TYPES_WLR_TOUCH_H
 
 #include <stdint.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 
 struct wlr_touch_impl;
 

include/wlr/types/wlr_virtual_keyboard_v1.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_VIRTUAL_KEYBOARD_V1_H
 #define WLR_TYPES_WLR_VIRTUAL_KEYBOARD_V1_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/interfaces/wlr_input_device.h>
 #include <wlr/interfaces/wlr_keyboard.h>
 

include/wlr/types/wlr_xcursor_manager.h

@@ -9,7 +9,7 @@
 #ifndef WLR_TYPES_WLR_XCURSOR_MANAGER_H
 #define WLR_TYPES_WLR_XCURSOR_MANAGER_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_cursor.h>
 #include <wlr/xcursor.h>
 

include/wlr/types/wlr_xdg_decoration_v1.h

@@ -1,7 +1,7 @@
 #ifndef WLR_TYPES_WLR_XDG_DECORATION_V1
 #define WLR_TYPES_WLR_XDG_DECORATION_V1
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_xdg_shell.h>
 
 enum wlr_xdg_toplevel_decoration_v1_mode {

include/wlr/types/wlr_xdg_output_v1.h

@@ -8,7 +8,7 @@
 
 #ifndef WLR_TYPES_WLR_XDG_OUTPUT_V1_H
 #define WLR_TYPES_WLR_XDG_OUTPUT_V1_H
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_output_layout.h>
 
 struct wlr_xdg_output_v1 {

include/wlr/types/wlr_xdg_shell.h

@@ -10,7 +10,7 @@
 #define WLR_TYPES_WLR_XDG_SHELL_H
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_seat.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include "xdg-shell-protocol.h"
 
 struct wlr_xdg_shell {

include/wlr/types/wlr_xdg_shell_v6.h

@@ -14,7 +14,7 @@
 #ifndef WLR_TYPES_WLR_XDG_SHELL_V6_H
 #define WLR_TYPES_WLR_XDG_SHELL_V6_H
 
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_seat.h>
 #include "xdg-shell-unstable-v6-protocol.h"

include/wlr/util/region.h

@@ -19,7 +19,7 @@
 
 #include <stdbool.h>
 #include <pixman.h>
-#include <wayland-server.h>
+#include <wayland-server-protocol.h>
 
 /**
  * Scales a region, ie. multiplies all its coordinates by `scale`.

meson.build

@@ -96,9 +96,6 @@ if cc.get_id() == 'clang'
 	add_project_arguments('-Wno-missing-braces', language: 'c')
 endif
 
-# Avoid wl_buffer deprecation warnings
-add_project_arguments('-DWL_HIDE_DEPRECATED', language: 'c')
-
 wayland_server = dependency('wayland-server', version: '>=1.16')
 wayland_client = dependency('wayland-client')
 wayland_egl    = dependency('wayland-egl')

rootston/input.c

@@ -2,7 +2,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/libinput.h>
 #include <wlr/config.h>
 #include <wlr/types/wlr_cursor.h>

rootston/keyboard.c

@@ -2,7 +2,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/session.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>

rootston/layer_shell.c

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_layer_shell_v1.h>

rootston/main.c

@@ -2,7 +2,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>

rootston/seat.c

@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend/libinput.h>
 #include <wlr/config.h>
 #include <wlr/types/wlr_data_device.h>

rootston/xdg_shell.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xdg_shell.h>

rootston/xdg_shell_v6.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>

rootston/xwayland.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/config.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>

tinywl/tinywl.c

@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_cursor.h>

types/data_device/wlr_data_device.c

@@ -3,7 +3,7 @@
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/util/log.h>

types/data_device/wlr_data_offer.c

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/util/log.h>

types/data_device/wlr_data_source.c

@@ -4,7 +4,7 @@
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/util/log.h>

types/data_device/wlr_drag.c

@@ -3,7 +3,7 @@
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/util/log.h>