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.

This commit si similar to wlroots' ca45f4490ccc ("Remove all wayland-server.h
includes").

14 files changed, 13 insertions, 14 deletions

diff --git a/include/sway/output.h b/include/sway/output.h
index a5a2f29e7..b94824b45 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -2,7 +2,7 @@
 #define _SWAY_OUTPUT_H
 #include <time.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_output.h>
 #include "config.h"
diff --git a/include/sway/server.h b/include/sway/server.h
index 216616851..7cbca4f20 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -1,7 +1,7 @@
 #ifndef _SWAY_SERVER_H
 #define _SWAY_SERVER_H
 #include <stdbool.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>
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 4ce487fca..d9f5b8f2e 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -1,6 +1,6 @@
 #ifndef _SWAY_VIEW_H
 #define _SWAY_VIEW_H
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include "config.h"
diff --git a/meson.build b/meson.build
index eb5039eed..6bb472f12 100644
--- a/meson.build
+++ b/meson.build
@@ -13,7 +13,6 @@ project(
 
 add_project_arguments(
 	[
-		'-DWL_HIDE_DEPRECATED',
 		'-DWLR_USE_UNSTABLE',
 
 		'-Wno-unused-parameter',
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index 1667995c7..ed00b2825 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -1,7 +1,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_output_damage.h>
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 22ced14e4..7dcc8e51c 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_buffer.h>
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 6bea56569..9d7b89af5 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <time.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_buffer.h>
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 9e914f144..015745779 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -2,7 +2,7 @@
 #include <float.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/util/edges.h>
 #include "log.h"
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 5ac589cfd..0c6ab7dc3 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -2,7 +2,7 @@
 #include <float.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include "log.h"
 #include "sway/decoration.h"
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index f6ca8f818..0f7082012 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 199309L
 #include <stdbool.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/xwayland.h>
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 773e90fdd..9c4f7a640 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -14,7 +14,7 @@
 #include <sys/ioctl.h>
 #include <sys/un.h>
 #include <unistd.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include "sway/commands.h"
 #include "sway/config.h"
 #include "sway/desktop/transaction.h"
diff --git a/sway/server.c b/sway/server.c
index 4f46a0650..784237d40 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -2,7 +2,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/backend.h>
 #include <wlr/backend/noop.h>
 #include <wlr/backend/session.h>
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 10aed5997..ef44c9440 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_xdg_shell_v6.h>
 #include <wlr/types/wlr_xdg_shell.h>
diff --git a/sway/tree/view.c b/sway/tree/view.c
index be5408042..bb3ae707f 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -1,7 +1,7 @@
 #define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <strings.h>
-#include <wayland-server.h>
+#include <wayland-server-core.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_buffer.h>
 #include <wlr/types/wlr_output_layout.h>