diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h
index 35b8db880..f0717fc25 100644
--- a/app/cwm/calmwm.h
+++ b/app/cwm/calmwm.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: calmwm.h,v 1.90 2009/05/18 00:17:46 oga Exp $
+ * $Id: calmwm.h,v 1.91 2009/06/17 12:30:17 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -33,6 +33,12 @@
 #define ChildMask	(SubstructureRedirectMask|SubstructureNotifyMask)
 #define ButtonMask	(ButtonPressMask|ButtonReleaseMask)
 #define MouseMask	(ButtonMask|PointerMotionMask)
+#define KeyMask		(KeyPressMask|ExposureMask)
+#define MenuMask 	(ButtonMask|ButtonMotionMask|ExposureMask| \
+			PointerMotionMask)
+#define MenuGrabMask	(ButtonMask|ButtonMotionMask|StructureNotifyMask|\
+			PointerMotionMask)
+#define SearchMask	(KeyPressMask|ExposureMask)
 
 enum cwmcolor {
 	CWM_COLOR_BORDOR_ACTIVE,
diff --git a/app/cwm/menu.c b/app/cwm/menu.c
index a6cd6aed1..16cf4004d 100644
--- a/app/cwm/menu.c
+++ b/app/cwm/menu.c
@@ -18,11 +18,6 @@
 #include "headers.h"
 #include "calmwm.h"
 
-#define KeyMask		(KeyPressMask|ExposureMask)
-#define MenuMask 	(ButtonMask|ButtonMotionMask|ExposureMask| \
-			PointerMotionMask)
-#define MenuGrabMask	(ButtonMask|ButtonMotionMask|StructureNotifyMask|\
-			PointerMotionMask)
 #define PROMPT_SCHAR	'»'
 #define PROMPT_ECHAR	'«'
 
diff --git a/app/cwm/search.c b/app/cwm/search.c
index 6a39bffba..a3efec2c4 100644
--- a/app/cwm/search.c
+++ b/app/cwm/search.c
@@ -14,14 +14,12 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: search.c,v 1.15 2009/05/18 00:23:35 okan Exp $
+ * $Id: search.c,v 1.16 2009/06/17 12:30:17 okan Exp $
  */
 
 #include "headers.h"
 #include "calmwm.h"
 
-#define SearchMask (KeyPressMask|ExposureMask)
-
 static int	strsubmatch(char *, char *, int);
 
 /*