Move CLEANMASK to xutil.h, remove useless #Includes

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

common/xutil.h

@@ -34,6 +34,8 @@
 
 #include "common/list.h"
 
+#define CLEANMASK(mask)      (mask & ~(globalconf.numlockmask | XCB_MOD_MASK_LOCK))
+
 /* See http://tronche.com/gui/x/xlib/appendix/b/ for values */
 #define CURSOR_FLEUR                             52
 #define CURSOR_LEFT_PTR                          68

event.h

@@ -25,8 +25,6 @@
 #include <xcb/xcb.h>
 #include <xcb/randr.h>
 
-#define CLEANMASK(mask)      (mask & ~(globalconf.numlockmask | XCB_MOD_MASK_LOCK))
-
 int event_handle_buttonpress(void *, xcb_connection_t *, xcb_button_press_event_t *);
 int event_handle_configurerequest(void *, xcb_connection_t *, xcb_configure_request_event_t *);
 int event_handle_configurenotify(void *, xcb_connection_t *, xcb_configure_notify_event_t *);

keybinding.c

@@ -24,7 +24,6 @@
 #include <X11/Xlib.h>
 
 #include "keybinding.h"
-#include "event.h"
 #include "window.h"
 
 extern awesome_t globalconf;

keygrabber.c

@@ -22,7 +22,6 @@
 #include <unistd.h>
 
 #include "keygrabber.h"
-#include "event.h"
 #include "structs.h"
 
 extern awesome_t globalconf;

widget.c

@@ -26,7 +26,6 @@
 
 #include "widget.h"
 #include "titlebar.h"
-#include "event.h"
 
 extern awesome_t globalconf;
 

widgets/taglist.c

@@ -23,7 +23,6 @@
 #include "widget.h"
 #include "tag.h"
 #include "lua.h"
-#include "event.h"
 #include "common/markup.h"
 #include "common/tokenize.h"
 

widgets/tasklist.c

@@ -22,7 +22,6 @@
 #include "widget.h"
 #include "client.h"
 #include "focus.h"
-#include "event.h"
 #include "ewmh.h"
 #include "tag.h"
 #include "common/markup.h"