diff --git a/calmwm.h b/calmwm.h
index f71426d..b2ce839 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -327,7 +327,6 @@ extern struct client_ctx_q		 Clientq;
 extern struct conf			 Conf;
 extern const char			*homedir;
 extern int				 HasRandr, Randr_ev;
-extern volatile sig_atomic_t		 cwm_status;
 
 enum {
 	WM_STATE,
@@ -482,18 +481,10 @@ void			 kbfunc_ssh(struct client_ctx *, union arg *);
 void			 kbfunc_term(struct client_ctx *, union arg *);
 void 			 kbfunc_tile(struct client_ctx *, union arg *);
 
-void			 mousefunc_client_cyclegroup(struct client_ctx *,
-			    union arg *);
 void			 mousefunc_client_grouptoggle(struct client_ctx *,
 			    union arg *);
-void			 mousefunc_client_hide(struct client_ctx *,
-    			    union arg *);
-void			 mousefunc_client_lower(struct client_ctx *,
-    			    union arg *);
 void			 mousefunc_client_move(struct client_ctx *,
     			    union arg *);
-void			 mousefunc_client_raise(struct client_ctx *,
-    			    union arg *);
 void			 mousefunc_client_resize(struct client_ctx *,
     			    union arg *);
 void			 mousefunc_menu_cmd(struct client_ctx *, union arg *);
diff --git a/kbfunc.c b/kbfunc.c
index 705baef..813f8e6 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -35,6 +35,8 @@
 
 #define HASH_MARKER	"|1|"
 
+extern sig_atomic_t	 cwm_status;
+
 void
 kbfunc_client_lower(struct client_ctx *cc, union arg *arg)
 {
diff --git a/xevents.c b/xevents.c
index 987d4fa..89d7a63 100644
--- a/xevents.c
+++ b/xevents.c
@@ -29,7 +29,6 @@
 
 #include <err.h>
 #include <errno.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>