diff --git a/test/meson.build b/test/meson.build
index afa08abb2..79e1a11aa 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -2,6 +2,7 @@ simple_xinit = executable(
     'simple-xinit',
     'simple-xinit.c',
     include_directories: inc,
+    dependencies: [ xproto_dep ],
 )
 
 piglit_env = environment()
diff --git a/test/simple-xinit.c b/test/simple-xinit.c
index e85b48092..57e7eed57 100644
--- a/test/simple-xinit.c
+++ b/test/simple-xinit.c
@@ -25,6 +25,8 @@
 #include <dix-config.h>
 #endif
 
+#include <X11/Xfuncproto.h>
+
 #include <errno.h>
 #include <signal.h>
 #include <stdbool.h>
@@ -53,7 +55,7 @@ kill_server(int server_pid)
     }
 }
 
-static void
+_X_NORETURN static void
 usage(int argc, char **argv)
 {
     fprintf(stderr, "%s <client command> -- <server command>\n", argv[0]);