merge the 2 common header files; specific includes to be pulled out as

separate commits.

ok oga@

18 files changed, 28 insertions, 69 deletions

diff --git a/calmwm.c b/calmwm.c
index 5824441..88ece10 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -18,7 +18,6 @@
  * $Id$
  */
 
-#include "headers.h"
 #include "calmwm.h"
 
 Display				*X_Dpy;
diff --git a/calmwm.h b/calmwm.h
index b278f7b..38a3166 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -21,6 +21,33 @@
 #ifndef _CALMWM_H_
 #define _CALMWM_H_
 
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <assert.h>
+#include <ctype.h>
+#include <err.h>
+#include <errno.h>
+#include <dirent.h>
+#include <getopt.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <X11/Xatom.h>
+#include <X11/Xft/Xft.h>
+#include <X11/Xlib.h>
+#include <X11/Xproto.h>
+#include <X11/Xutil.h>
+#include <X11/cursorfont.h>
+#include <X11/extensions/Xinerama.h>
+#include <X11/extensions/Xrandr.h>
+#include <X11/keysym.h>
+
 #define CALMWM_MAXNAMELEN 256
 
 #undef MIN
diff --git a/client.c b/client.c
index 2701f80..c4e6abf 100644
--- a/client.c
+++ b/client.c
@@ -18,7 +18,6 @@
  * $Id$
  */
 
-#include "headers.h"
 #include "calmwm.h"
 
 static struct client_ctx	*client_mrunext(struct client_ctx *);
diff --git a/conf.c b/conf.c
index 19a9085..463e184 100644
--- a/conf.c
+++ b/conf.c
@@ -18,7 +18,6 @@
  * $Id$
  */
 
-#include "headers.h"
 #include "calmwm.h"
 
 #ifndef timespeccmp
diff --git a/font.c b/font.c
index 0f58c82..8e1476e 100644
--- a/font.c
+++ b/font.c
@@ -16,7 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "headers.h"
 #include "calmwm.h"
 
 void
diff --git a/group.c b/group.c
index 11383e2..3dc730c 100644
--- a/group.c
+++ b/group.c
@@ -19,7 +19,6 @@
  * $Id$
  */
 
-#include "headers.h"
 #include "calmwm.h"
 
 static void		 group_add(struct group_ctx *, struct client_ctx *);
diff --git a/headers.h b/headers.h
deleted file mode 100644
index e8488e9..0000000
--- a/headers.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * calmwm - the calm window manager
- *
- * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id$
- */
-
-#ifndef _CALMWM_HEADERS_H_
-#define _CALMWM_HEADERS_H_
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <err.h>
-#include <errno.h>
-#include <dirent.h>
-#include <getopt.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include <X11/Intrinsic.h>
-#include <X11/Xatom.h>
-#include <X11/Xft/Xft.h>
-#include <X11/Xlib.h>
-#include <X11/Xos.h>
-#include <X11/Xproto.h>
-#include <X11/Xutil.h>
-#include <X11/cursorfont.h>
-#include <X11/extensions/Xinerama.h>
-#include <X11/extensions/Xrandr.h>
-#include <X11/keysym.h>
-
-#endif /* _CALMWM_HEADERS_H_ */
diff --git a/input.c b/input.c
index b9c5185..13d6a1f 100644
--- a/input.c
+++ b/input.c
@@ -18,7 +18,6 @@
  * $Id$
  */
 
-#include "headers.h"
 #include "calmwm.h"
 
 int
diff --git a/kbfunc.c b/kbfunc.c
index c9377cd..a1cb430 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -20,7 +20,6 @@
 
 #include <paths.h>
 
-#include "headers.h"
 #include "calmwm.h"
 
 #define KNOWN_HOSTS	".ssh/known_hosts"
diff --git a/menu.c b/menu.c
index 69f0588..1011a32 100644
--- a/menu.c
+++ b/menu.c
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "headers.h"
 #include "calmwm.h"
 
 #define PROMPT_SCHAR	'»'
diff --git a/mousefunc.c b/mousefunc.c
index b66f64c..e49a170 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -19,7 +19,6 @@
  * $Id$
  */
 
-#include "headers.h"
 #include "calmwm.h"
 
 static int	mousefunc_sweep_calc(struct client_ctx *, int, int, int, int);
diff --git a/parse.y b/parse.y
index c60995c..db4345b 100644
--- a/parse.y
+++ b/parse.y
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "headers.h"
 #include "calmwm.h"
 
 TAILQ_HEAD(files, file)		 files = TAILQ_HEAD_INITIALIZER(files);
diff --git a/screen.c b/screen.c
index 3610bf7..dd47c30 100644
--- a/screen.c
+++ b/screen.c
@@ -18,7 +18,6 @@
  * $Id$
  */
 
-#include "headers.h"
 #include "calmwm.h"
 
 struct screen_ctx *
diff --git a/search.c b/search.c
index 2ee57ba..e136427 100644
--- a/search.c
+++ b/search.c
@@ -18,7 +18,7 @@
  */
 
 #include <fnmatch.h>
-#include "headers.h"
+
 #include "calmwm.h"
 
 static int	strsubmatch(char *, char *, int);
diff --git a/util.c b/util.c
index ac7e2f4..b2c5726 100644
--- a/util.c
+++ b/util.c
@@ -18,7 +18,6 @@
  * $Id$
  */
 
-#include "headers.h"
 #include "calmwm.h"
 
 #define MAXARGLEN 20
diff --git a/xevents.c b/xevents.c
index 8956477..5d88a6c 100644
--- a/xevents.c
+++ b/xevents.c
@@ -24,7 +24,6 @@
  *   management of the xevent's.
  */
 
-#include "headers.h"
 #include "calmwm.h"
 
 static void	 xev_handle_maprequest(XEvent *);
diff --git a/xmalloc.c b/xmalloc.c
index 8935754..989521f 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -18,7 +18,6 @@
  * $Id$
  */
 
-#include "headers.h"
 #include "calmwm.h"
 
 void *
diff --git a/xutil.c b/xutil.c
index de349b5..bdb6da9 100644
--- a/xutil.c
+++ b/xutil.c
@@ -18,7 +18,6 @@
  * $Id$
  */
 
-#include "headers.h"
 #include "calmwm.h"
 
 static unsigned int ign_mods[] = { 0, LockMask, Mod2Mask, Mod2Mask | LockMask };