diff --git a/test/wtest.c b/test/wtest.c
index 37f285d9..00b12509 100644
--- a/test/wtest.c
+++ b/test/wtest.c
@@ -8,6 +8,8 @@
  * TODO: remake
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/Xlib.h>
@@ -15,6 +17,11 @@
 #include <X11/Xproto.h>
 #include <WMaker.h>
 
+#ifdef HAVE_STDNORETURN
+#include <stdnoreturn.h>
+#endif
+
+
 static char bits[] = {
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
@@ -34,7 +41,7 @@ static void callback(int item)
 	printf("pushed item %i\n", item);
 }
 
-static void quit(int item)
+static noreturn void quit(int item)
 {
 	/*
 	 * This parameter is not used, but because we're a call-back we have a fixed
diff --git a/util/wmsetbg.c b/util/wmsetbg.c
index ee4780fb..b52f9500 100644
--- a/util/wmsetbg.c
+++ b/util/wmsetbg.c
@@ -100,7 +100,7 @@ typedef struct BackgroundTexture {
 	int height;
 } BackgroundTexture;
 
-static void quit(int rcode)
+static noreturn void quit(int rcode)
 {
 	WMReleaseApplication();
 	exit(rcode);