aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/backend/drm/drm.h2
-rw-r--r--include/backend/wayland.h2
-rw-r--r--include/backend/x11.h2
-rw-r--r--include/rootston/desktop.h2
-rw-r--r--include/rootston/input.h2
-rw-r--r--include/rootston/output.h2
-rw-r--r--include/rootston/seat.h2
-rw-r--r--include/rootston/server.h2
-rw-r--r--include/types/wlr_data_device.h2
-rw-r--r--include/types/wlr_seat.h2
-rw-r--r--include/types/wlr_tablet_v2.h2
-rw-r--r--include/types/wlr_xdg_shell.h2
-rw-r--r--include/types/wlr_xdg_shell_v6.h2
-rw-r--r--include/util/signal.h2
-rw-r--r--include/wlr/backend.h2
-rw-r--r--include/wlr/backend/drm.h2
-rw-r--r--include/wlr/backend/libinput.h2
-rw-r--r--include/wlr/backend/session.h2
-rw-r--r--include/wlr/backend/wayland.h2
-rw-r--r--include/wlr/backend/x11.h2
-rw-r--r--include/wlr/render/egl.h2
-rw-r--r--include/wlr/types/wlr_box.h2
-rw-r--r--include/wlr/types/wlr_buffer.h2
-rw-r--r--include/wlr/types/wlr_compositor.h2
-rw-r--r--include/wlr/types/wlr_cursor.h2
-rw-r--r--include/wlr/types/wlr_data_control_v1.h2
-rw-r--r--include/wlr/types/wlr_data_device.h2
-rw-r--r--include/wlr/types/wlr_export_dmabuf_v1.h2
-rw-r--r--include/wlr/types/wlr_foreign_toplevel_management_v1.h2
-rw-r--r--include/wlr/types/wlr_fullscreen_shell_v1.h2
-rw-r--r--include/wlr/types/wlr_gamma_control_v1.h2
-rw-r--r--include/wlr/types/wlr_gtk_primary_selection.h2
-rw-r--r--include/wlr/types/wlr_idle.h2
-rw-r--r--include/wlr/types/wlr_idle_inhibit_v1.h2
-rw-r--r--include/wlr/types/wlr_input_inhibitor.h2
-rw-r--r--include/wlr/types/wlr_input_method_v2.h2
-rw-r--r--include/wlr/types/wlr_keyboard.h4
-rw-r--r--include/wlr/types/wlr_layer_shell_v1.h2
-rw-r--r--include/wlr/types/wlr_matrix.h2
-rw-r--r--include/wlr/types/wlr_output.h2
-rw-r--r--include/wlr/types/wlr_output_management_v1.h2
-rw-r--r--include/wlr/types/wlr_pointer.h2
-rw-r--r--include/wlr/types/wlr_pointer_constraints_v1.h2
-rw-r--r--include/wlr/types/wlr_pointer_gestures_v1.h2
-rw-r--r--include/wlr/types/wlr_presentation_time.h2
-rw-r--r--include/wlr/types/wlr_primary_selection.h2
-rw-r--r--include/wlr/types/wlr_primary_selection_v1.h2
-rw-r--r--include/wlr/types/wlr_relative_pointer_v1.h2
-rw-r--r--include/wlr/types/wlr_screencopy_v1.h2
-rw-r--r--include/wlr/types/wlr_seat.h2
-rw-r--r--include/wlr/types/wlr_server_decoration.h2
-rw-r--r--include/wlr/types/wlr_surface.h2
-rw-r--r--include/wlr/types/wlr_switch.h2
-rw-r--r--include/wlr/types/wlr_tablet_pad.h2
-rw-r--r--include/wlr/types/wlr_tablet_tool.h4
-rw-r--r--include/wlr/types/wlr_tablet_v2.h2
-rw-r--r--include/wlr/types/wlr_text_input_v3.h2
-rw-r--r--include/wlr/types/wlr_touch.h2
-rw-r--r--include/wlr/types/wlr_virtual_keyboard_v1.h2
-rw-r--r--include/wlr/types/wlr_xcursor_manager.h2
-rw-r--r--include/wlr/types/wlr_xdg_decoration_v1.h2
-rw-r--r--include/wlr/types/wlr_xdg_output_v1.h2
-rw-r--r--include/wlr/types/wlr_xdg_shell.h2
-rw-r--r--include/wlr/types/wlr_xdg_shell_v6.h2
-rw-r--r--include/wlr/util/region.h2
65 files changed, 67 insertions, 67 deletions
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h
index bc1c2933..f007c9e0 100644
--- a/include/backend/drm/drm.h
+++ b/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>
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index 8f8e1ea6..e25aba43 100644
--- a/include/backend/wayland.h
+++ b/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>
diff --git a/include/backend/x11.h b/include/backend/x11.h
index 2bc08b21..e628e4cb 100644
--- a/include/backend/x11.h
+++ b/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>
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index 791f5a8b..d3d6ec18 100644
--- a/include/rootston/desktop.h
+++ b/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>
diff --git a/include/rootston/input.h b/include/rootston/input.h
index 31810b4d..a799db59 100644
--- a/include/rootston/input.h
+++ b/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>
diff --git a/include/rootston/output.h b/include/rootston/output.h
index 6b02d69f..257d9367 100644
--- a/include/rootston/output.h
+++ b/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>
diff --git a/include/rootston/seat.h b/include/rootston/seat.h
index b91f9578..fa3a83dd 100644
--- a/include/rootston/seat.h
+++ b/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"
diff --git a/include/rootston/server.h b/include/rootston/server.h
index 1836a374..f48549f2 100644
--- a/include/rootston/server.h
+++ b/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>
diff --git a/include/types/wlr_data_device.h b/include/types/wlr_data_device.h
index 5865c999..07a08c2f 100644
--- a/include/types/wlr_data_device.h
+++ b/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 | \
diff --git a/include/types/wlr_seat.h b/include/types/wlr_seat.h
index 15f1dc38..0ccb3345 100644
--- a/include/types/wlr_seat.h
+++ b/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;
diff --git a/include/types/wlr_tablet_v2.h b/include/types/wlr_tablet_v2.h
index 334ea210..d2c4a212 100644
--- a/include/types/wlr_tablet_v2.h
+++ b/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 {
diff --git a/include/types/wlr_xdg_shell.h b/include/types/wlr_xdg_shell.h
index 93058530..2afd564e 100644
--- a/include/types/wlr_xdg_shell.h
+++ b/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"
diff --git a/include/types/wlr_xdg_shell_v6.h b/include/types/wlr_xdg_shell_v6.h
index 59fca667..4c9d1fa0 100644
--- a/include/types/wlr_xdg_shell_v6.h
+++ b/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"
diff --git a/include/util/signal.h b/include/util/signal.h
index cc6cb525..fd93073a 100644
--- a/include/util/signal.h
+++ b/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);
diff --git a/include/wlr/backend.h b/include/wlr/backend.h
index 54f2b5e8..3337e51c 100644
--- a/include/wlr/backend.h
+++ b/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>
diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h
index 3724adfb..e4b5e2d1 100644
--- a/include/wlr/backend/drm.h
+++ b/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>
diff --git a/include/wlr/backend/libinput.h b/include/wlr/backend/libinput.h
index 1a2ab294..50faaf7d 100644
--- a/include/wlr/backend/libinput.h
+++ b/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>
diff --git a/include/wlr/backend/session.h b/include/wlr/backend/session.h
index 7b26f34c..36b80a8d 100644
--- a/include/wlr/backend/session.h
+++ b/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;
diff --git a/include/wlr/backend/wayland.h b/include/wlr/backend/wayland.h
index 9a47d1ce..cd8e73fb 100644
--- a/include/wlr/backend/wayland.h
+++ b/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>
diff --git a/include/wlr/backend/x11.h b/include/wlr/backend/x11.h
index 9be976b2..5a6f050b 100644
--- a/include/wlr/backend/x11.h
+++ b/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>
diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h
index fb473ba8..915de5c0 100644
--- a/include/wlr/render/egl.h
+++ b/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>
diff --git a/include/wlr/types/wlr_box.h b/include/wlr/types/wlr_box.h
index 40fd69bd..40585ab1 100644
--- a/include/wlr/types/wlr_box.h
+++ b/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;
diff --git a/include/wlr/types/wlr_buffer.h b/include/wlr/types/wlr_buffer.h
index 11b36596..86f8bccb 100644
--- a/include/wlr/types/wlr_buffer.h
+++ b/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>
/**
diff --git a/include/wlr/types/wlr_compositor.h b/include/wlr/types/wlr_compositor.h
index 36b9e83f..6aaea9c7 100644
--- a/include/wlr/types/wlr_compositor.h
+++ b/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;
diff --git a/include/wlr/types/wlr_cursor.h b/include/wlr/types/wlr_cursor.h
index 4c6b1202..58ce8505 100644
--- a/include/wlr/types/wlr_cursor.h
+++ b/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>
diff --git a/include/wlr/types/wlr_data_control_v1.h b/include/wlr/types/wlr_data_control_v1.h
index 32d169b4..d487a7db 100644
--- a/include/wlr/types/wlr_data_control_v1.h
+++ b/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 {
diff --git a/include/wlr/types/wlr_data_device.h b/include/wlr/types/wlr_data_device.h
index d8894d6e..c017e428 100644
--- a/include/wlr/types/wlr_data_device.h
+++ b/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
diff --git a/include/wlr/types/wlr_export_dmabuf_v1.h b/include/wlr/types/wlr_export_dmabuf_v1.h
index 42c88e5c..5b3fbc2c 100644
--- a/include/wlr/types/wlr_export_dmabuf_v1.h
+++ b/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 {
diff --git a/include/wlr/types/wlr_foreign_toplevel_management_v1.h b/include/wlr/types/wlr_foreign_toplevel_management_v1.h
index 6b234eb9..3adf2de5 100644
--- a/include/wlr/types/wlr_foreign_toplevel_management_v1.h
+++ b/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 {
diff --git a/include/wlr/types/wlr_fullscreen_shell_v1.h b/include/wlr/types/wlr_fullscreen_shell_v1.h
index a904d966..b014bf28 100644
--- a/include/wlr/types/wlr_fullscreen_shell_v1.h
+++ b/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 {
diff --git a/include/wlr/types/wlr_gamma_control_v1.h b/include/wlr/types/wlr_gamma_control_v1.h
index f186aa81..202fde12 100644
--- a/include/wlr/types/wlr_gamma_control_v1.h
+++ b/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;
diff --git a/include/wlr/types/wlr_gtk_primary_selection.h b/include/wlr/types/wlr_gtk_primary_selection.h
index f1a9a83b..bb16b4e3 100644
--- a/include/wlr/types/wlr_gtk_primary_selection.h
+++ b/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>
/**
diff --git a/include/wlr/types/wlr_idle.h b/include/wlr/types/wlr_idle.h
index da268555..d16932f5 100644
--- a/include/wlr/types/wlr_idle.h
+++ b/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>
/**
diff --git a/include/wlr/types/wlr_idle_inhibit_v1.h b/include/wlr/types/wlr_idle_inhibit_v1.h
index 2093eafe..0d007f9f 100644
--- a/include/wlr/types/wlr_idle_inhibit_v1.h
+++ b/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.
diff --git a/include/wlr/types/wlr_input_inhibitor.h b/include/wlr/types/wlr_input_inhibitor.h
index f3187540..2dc007be 100644
--- a/include/wlr/types/wlr_input_inhibitor.h
+++ b/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;
diff --git a/include/wlr/types/wlr_input_method_v2.h b/include/wlr/types/wlr_input_method_v2.h
index d22d54d1..9b600c1e 100644
--- a/include/wlr/types/wlr_input_method_v2.h
+++ b/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 {
diff --git a/include/wlr/types/wlr_keyboard.h b/include/wlr/types/wlr_keyboard.h
index ae279541..e16df7a7 100644
--- a/include/wlr/types/wlr_keyboard.h
+++ b/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
diff --git a/include/wlr/types/wlr_layer_shell_v1.h b/include/wlr/types/wlr_layer_shell_v1.h
index fe0175f2..9613621a 100644
--- a/include/wlr/types/wlr_layer_shell_v1.h
+++ b/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"
diff --git a/include/wlr/types/wlr_matrix.h b/include/wlr/types/wlr_matrix.h
index a3961c35..359d84fb 100644
--- a/include/wlr/types/wlr_matrix.h
+++ b/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 */
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index 9bc1b67f..281f7daf 100644
--- a/include/wlr/types/wlr_output.h
+++ b/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>
diff --git a/include/wlr/types/wlr_output_management_v1.h b/include/wlr/types/wlr_output_management_v1.h
index 4d449601..cc74b404 100644
--- a/include/wlr/types/wlr_output_management_v1.h
+++ b/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 {
diff --git a/include/wlr/types/wlr_pointer.h b/include/wlr/types/wlr_pointer.h
index 486e1bc9..69699042 100644
--- a/include/wlr/types/wlr_pointer.h
+++ b/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;
diff --git a/include/wlr/types/wlr_pointer_constraints_v1.h b/include/wlr/types/wlr_pointer_constraints_v1.h
index fef8c2e9..e030a375 100644
--- a/include/wlr/types/wlr_pointer_constraints_v1.h
+++ b/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>
diff --git a/include/wlr/types/wlr_pointer_gestures_v1.h b/include/wlr/types/wlr_pointer_gestures_v1.h
index 7caf0f53..86fcaf3d 100644
--- a/include/wlr/types/wlr_pointer_gestures_v1.h
+++ b/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>
diff --git a/include/wlr/types/wlr_presentation_time.h b/include/wlr/types/wlr_presentation_time.h
index 9f9f0e87..c80f6966 100644
--- a/include/wlr/types/wlr_presentation_time.h
+++ b/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;
diff --git a/include/wlr/types/wlr_primary_selection.h b/include/wlr/types/wlr_primary_selection.h
index 4df47380..af3d4849 100644
--- a/include/wlr/types/wlr_primary_selection.h
+++ b/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;
diff --git a/include/wlr/types/wlr_primary_selection_v1.h b/include/wlr/types/wlr_primary_selection_v1.h
index e6bde8a3..b380ea61 100644
--- a/include/wlr/types/wlr_primary_selection_v1.h
+++ b/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 {
diff --git a/include/wlr/types/wlr_relative_pointer_v1.h b/include/wlr/types/wlr_relative_pointer_v1.h
index 32ed574b..d4aa6fa8 100644
--- a/include/wlr/types/wlr_relative_pointer_v1.h
+++ b/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
diff --git a/include/wlr/types/wlr_screencopy_v1.h b/include/wlr/types/wlr_screencopy_v1.h
index ff76d829..a01e4dab 100644
--- a/include/wlr/types/wlr_screencopy_v1.h
+++ b/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 {
diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h
index 974ca578..69fe1359 100644
--- a/include/wlr/types/wlr_seat.h
+++ b/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>
diff --git a/include/wlr/types/wlr_server_decoration.h b/include/wlr/types/wlr_server_decoration.h
index 3e4eb5e1..cea47cdf 100644
--- a/include/wlr/types/wlr_server_decoration.h
+++ b/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
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index 0c389987..f62171d1 100644
--- a/include/wlr/types/wlr_surface.h
+++ b/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 {
diff --git a/include/wlr/types/wlr_switch.h b/include/wlr/types/wlr_switch.h
index df1c8579..57f90384 100644
--- a/include/wlr/types/wlr_switch.h
+++ b/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>
diff --git a/include/wlr/types/wlr_tablet_pad.h b/include/wlr/types/wlr_tablet_pad.h
index d9bb284f..255fa89e 100644
--- a/include/wlr/types/wlr_tablet_pad.h
+++ b/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>
diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h
index cb516ed9..f732ad40 100644
--- a/include/wlr/types/wlr_tablet_tool.h
+++ b/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>
@@ -45,7 +45,7 @@ struct wlr_tablet_tool {
struct {
struct wl_signal destroy;
} events;
-
+
void *data;
};
diff --git a/include/wlr/types/wlr_tablet_v2.h b/include/wlr/types/wlr_tablet_v2.h
index d6fd646d..894b062d 100644
--- a/include/wlr/types/wlr_tablet_v2.h
+++ b/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>
diff --git a/include/wlr/types/wlr_text_input_v3.h b/include/wlr/types/wlr_text_input_v3.h
index 0db0cf47..ac1b0a69 100644
--- a/include/wlr/types/wlr_text_input_v3.h
+++ b/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>
diff --git a/include/wlr/types/wlr_touch.h b/include/wlr/types/wlr_touch.h
index 80ba768e..bb8a58c3 100644
--- a/include/wlr/types/wlr_touch.h
+++ b/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;
diff --git a/include/wlr/types/wlr_virtual_keyboard_v1.h b/include/wlr/types/wlr_virtual_keyboard_v1.h
index fbc9d223..ea172056 100644
--- a/include/wlr/types/wlr_virtual_keyboard_v1.h
+++ b/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>
diff --git a/include/wlr/types/wlr_xcursor_manager.h b/include/wlr/types/wlr_xcursor_manager.h
index 285006bf..25c277c1 100644
--- a/include/wlr/types/wlr_xcursor_manager.h
+++ b/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>
diff --git a/include/wlr/types/wlr_xdg_decoration_v1.h b/include/wlr/types/wlr_xdg_decoration_v1.h
index ba1ad84b..468872a5 100644
--- a/include/wlr/types/wlr_xdg_decoration_v1.h
+++ b/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 {
diff --git a/include/wlr/types/wlr_xdg_output_v1.h b/include/wlr/types/wlr_xdg_output_v1.h
index d4279fb9..d9e2b905 100644
--- a/include/wlr/types/wlr_xdg_output_v1.h
+++ b/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 {
diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h
index 804b0083..16b6867b 100644
--- a/include/wlr/types/wlr_xdg_shell.h
+++ b/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 {
diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index 2e3a5495..a73045f5 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/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"
diff --git a/include/wlr/util/region.h b/include/wlr/util/region.h
index 4aca07e1..c3dbd78a 100644
--- a/include/wlr/util/region.h
+++ b/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`.