From cde80ab49a4a085df5d2ae5a2742ee6e9b5d098f Mon Sep 17 00:00:00 2001
From: Pierre Habouzit <madcoder@debian.org>
Date: Thu, 26 Jun 2008 22:38:46 +0200
Subject: [PATCH] Move CLEANMASK to xutil.h, remove useless #Includes

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---
 common/xutil.h     | 2 ++
 event.h            | 2 --
 keybinding.c       | 1 -
 keygrabber.c       | 1 -
 widget.c           | 1 -
 widgets/taglist.c  | 1 -
 widgets/tasklist.c | 1 -
 7 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/common/xutil.h b/common/xutil.h
index 3dca3bf2c..2bca8718f 100644
--- a/common/xutil.h
+++ b/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
diff --git a/event.h b/event.h
index 9aebd5388..6017bff53 100644
--- a/event.h
+++ b/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 *);
diff --git a/keybinding.c b/keybinding.c
index 797d500e9..333887ee2 100644
--- a/keybinding.c
+++ b/keybinding.c
@@ -24,7 +24,6 @@
 #include <X11/Xlib.h>
 
 #include "keybinding.h"
-#include "event.h"
 #include "window.h"
 
 extern awesome_t globalconf;
diff --git a/keygrabber.c b/keygrabber.c
index 005f57ee0..76d2e0fb3 100644
--- a/keygrabber.c
+++ b/keygrabber.c
@@ -22,7 +22,6 @@
 #include <unistd.h>
 
 #include "keygrabber.h"
-#include "event.h"
 #include "structs.h"
 
 extern awesome_t globalconf;
diff --git a/widget.c b/widget.c
index dbd16c7e6..efdd510eb 100644
--- a/widget.c
+++ b/widget.c
@@ -26,7 +26,6 @@
 
 #include "widget.h"
 #include "titlebar.h"
-#include "event.h"
 
 extern awesome_t globalconf;
 
diff --git a/widgets/taglist.c b/widgets/taglist.c
index 9530cd20b..84937e820 100644
--- a/widgets/taglist.c
+++ b/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"
 
diff --git a/widgets/tasklist.c b/widgets/tasklist.c
index b419d0b66..129a4243b 100644
--- a/widgets/tasklist.c
+++ b/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"