2 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 4f3c1d7..de88e4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AC_CONFIG_HEADERS([config.h])
 AC_CHECK_FUNCS([strncasecmp])
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XMODMAP, x11)
+PKG_CHECK_MODULES(XMODMAP, x11 xproto >= 7.0.17)
 
 dnl Allow checking code with lint, sparse, etc.
 XORG_WITH_LINT
diff --git a/xmodmap.c b/xmodmap.c
index 4486a4a..3d20e94 100644
--- a/xmodmap.c
+++ b/xmodmap.c
@@ -40,6 +40,7 @@ Bool verbose = False;
 Bool dontExecute = False;
 
 static void 
+_X_NORETURN
 Exit(int status)
 {
     if (dpy) {
@@ -76,6 +77,7 @@ static const char help_message[] =
 
 
 static void 
+_X_NORETURN
 usage(void)
 {
     fprintf (stderr, "usage:  %s [-options ...] [filename]\n", ProgramName);
@@ -105,6 +107,7 @@ static const char grammar_message[] =
 
 
 static void 
+_X_NORETURN
 grammar_usage(void)
 {
     fprintf (stderr, "%s accepts the following input expressions:\n\n",