diff --git a/WPrefs.app/WPrefs.c b/WPrefs.app/WPrefs.c
index 8f223bc8..7afa42e4 100644
--- a/WPrefs.app/WPrefs.c
+++ b/WPrefs.app/WPrefs.c
@@ -19,9 +19,15 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 #include "WPrefs.h"
 #include <assert.h>
 
+#ifdef HAVE_STDNORETURN
+#include <stdnoreturn.h>
+#endif
+
 
 #define ICON_TITLE_FONT "sans serif:pixelsize=9"
 #define ICON_TITLE_VFONT "sans serif:pixelsize=9:weight=100"
@@ -70,7 +76,7 @@ static void savePanelData(Panel * panel);
 
 static void prepareForClose(void);
 
-static void quit(WMWidget *w, void *data)
+static noreturn void quit(WMWidget *w, void *data)
 {
 	/* Parameter not used, but tell the compiler that it is ok */
 	(void) w;
diff --git a/WPrefs.app/main.c b/WPrefs.app/main.c
index 08dcb58a..0d183dd8 100644
--- a/WPrefs.app/main.c
+++ b/WPrefs.app/main.c
@@ -18,6 +18,8 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 #include "WPrefs.h"
 
 #include <assert.h>
@@ -28,6 +30,10 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#ifdef HAVE_STDNORETURN
+#include <stdnoreturn.h>
+#endif
+
 char *NOptionValueChanged = "NOptionValueChanged";
 Bool xext_xkb_supported = False;
 
@@ -43,7 +49,7 @@ struct {
 static pid_t DeadChildren[MAX_DEATHS];
 static int DeadChildrenCount = 0;
 
-static void wAbort(Bool foo)
+static noreturn void wAbort(Bool foo)
 {
 	/* Parameter not used, but tell the compiler that it is ok */
 	(void) foo;