diff --git a/kbfunc.c b/kbfunc.c
index fc70bc9..a60fc33 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -35,7 +35,7 @@
 #define KNOWN_HOSTS	".ssh/known_hosts"
 #define HASH_MARKER	"|1|"
 
-extern int		_xev_quit;
+extern sig_atomic_t	xev_quit;
 
 void
 kbfunc_client_lower(struct client_ctx *cc, union arg *arg)
@@ -491,7 +491,7 @@ kbfunc_client_freeze(struct client_ctx *cc, union arg *arg)
 void
 kbfunc_quit_wm(struct client_ctx *cc, union arg *arg)
 {
-	_xev_quit = 1;
+	xev_quit = 1;
 }
 
 void
diff --git a/xevents.c b/xevents.c
index 47d2cc8..438b700 100644
--- a/xevents.c
+++ b/xevents.c
@@ -410,14 +410,14 @@ xev_handle_expose(XEvent *ee)
 		client_draw_border(cc);
 }
 
-volatile sig_atomic_t	_xev_quit = 0;
+volatile sig_atomic_t	xev_quit = 0;
 
 void
 xev_loop(void)
 {
 	XEvent		 e;
 
-	while (_xev_quit == 0) {
+	while (xev_quit == 0) {
 		XNextEvent(X_Dpy, &e);
 		if (e.type - Randr_ev == RRScreenChangeNotify)
 			xev_handle_randr(&e);