6 files changed, 8 insertions, 8 deletions
diff --git a/tests/wayland/test_app_input.c b/tests/wayland/test_app_input.c
index 24b8b64..2cacb5e 100644
--- a/tests/wayland/test_app_input.c
+++ b/tests/wayland/test_app_input.c
@@ -1,7 +1,7 @@
 /* An input event callback that destroys its own surface. The app runner
  * must not touch the surface's entry after the callback, and must not
  * deliver the surface's remaining input. Needs a Wayland compositor. */
-#include "wayland/internal.h"
+#include "platform/wayland/internal.h"
 #include "yasl/app.h"
 
 #include <assert.h>
@@ -25,7 +25,7 @@ static int on_init(void *ud, struct yasl_display *d)
 {
     (void)ud;
     struct yasl_surface *s = yasl_surface_create_toplevel(d,
-        &(struct yasl_surface_spec){ .title = "App Input Test", .size = {64, 64} });
+        &(struct yasl_window_spec){ .title = "App Input Test", .size = {64, 64} });
     assert(s);
     push_key(s);
     push_key(s);
diff --git a/tests/wayland/test_clipboard.c b/tests/wayland/test_clipboard.c
index 553e84d..825564e 100644
--- a/tests/wayland/test_clipboard.c
+++ b/tests/wayland/test_clipboard.c
@@ -1,4 +1,4 @@
-#include "../../src/wayland/clipboard.c"
+#include "../../src/platform/wayland/clipboard.c"
 #include <assert.h>
 
 struct received { int count; size_t len; char text[32]; };
diff --git a/tests/wayland/test_cursor.c b/tests/wayland/test_cursor.c
index f7a7ba7..a4a522e 100644
--- a/tests/wayland/test_cursor.c
+++ b/tests/wayland/test_cursor.c
@@ -1,4 +1,4 @@
-#include "wayland/internal.h"
+#include "platform/wayland/internal.h"
 #include <assert.h>
 
 /* Record cursor requests without a compositor or tablet hardware. */
@@ -47,7 +47,7 @@ static uint32_t pointer_version(struct wl_pointer *pointer)
 #define zwp_tablet_tool_v2_set_cursor tool_cursor
 #define wp_cursor_shape_device_v1_set_shape cursor_shape
 #define wl_pointer_get_version pointer_version
-#include "../../src/wayland/pointer.c"
+#include "../../src/platform/wayland/pointer.c"
 
 int main(void)
 {
diff --git a/tests/wayland/test_input.c b/tests/wayland/test_input.c
index 7b91a9d..feff2f3 100644
--- a/tests/wayland/test_input.c
+++ b/tests/wayland/test_input.c
@@ -1,4 +1,4 @@
-#include "wayland/internal.h"
+#include "platform/wayland/internal.h"
 #include <assert.h>
 
 static void test_popup_bounds(void)
diff --git a/tests/wayland/test_keyboard.c b/tests/wayland/test_keyboard.c
index dbe0a94..6921322 100644
--- a/tests/wayland/test_keyboard.c
+++ b/tests/wayland/test_keyboard.c
@@ -1,4 +1,4 @@
-#include "../../src/wayland/keyboard.c"
+#include "../../src/platform/wayland/keyboard.c"
 #include <assert.h>
 
 static struct yasl_input_event next(struct wayland_surface *w, enum yasl_input_kind kind)
diff --git a/tests/wayland/test_tablet.c b/tests/wayland/test_tablet.c
index f8982b0..8723df2 100644
--- a/tests/wayland/test_tablet.c
+++ b/tests/wayland/test_tablet.c
@@ -1,4 +1,4 @@
-#include "../../src/wayland/pointer.c"
+#include "../../src/platform/wayland/pointer.c"
 #include <assert.h>
 
 static struct yasl_mouse_event next(struct wayland_surface *surface)