From fb3ff22ef266df7aab2945a994a190f507cdfc51 Mon Sep 17 00:00:00 2001
From: okan
Date: Tue, 15 Dec 2009 04:10:42 +0000
Subject: pull all non-X11 headers from calmwm.h and place them only where they
 are required.

encourged to go all the way by oga@
---
 calmwm.c    | 12 +++++++++++-
 calmwm.h    | 15 +--------------
 client.c    | 11 ++++++++++-
 conf.c      | 13 ++++++++++++-
 font.c      | 10 ++++++++++
 group.c     | 11 ++++++++++-
 input.c     | 12 +++++++++++-
 kbfunc.c    | 11 ++++++++++-
 menu.c      | 10 ++++++++++
 mousefunc.c | 12 +++++++++++-
 parse.y     |  6 +++++-
 screen.c    | 12 +++++++++++-
 search.c    | 11 ++++++++++-
 util.c      | 12 +++++++++++-
 xevents.c   | 12 +++++++++++-
 xmalloc.c   | 12 +++++++++++-
 xutil.c     | 12 +++++++++++-
 17 files changed, 166 insertions(+), 28 deletions(-)

diff --git a/calmwm.c b/calmwm.c
index 98d993c..d04d861 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -15,11 +15,21 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: calmwm.c,v 1.50 2009/12/15 03:34:34 okan Exp $
+ * $Id: calmwm.c,v 1.51 2009/12/15 04:10:42 okan Exp $
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
 #include <getopt.h>
 #include <signal.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
 
 #include "calmwm.h"
 
diff --git a/calmwm.h b/calmwm.h
index 9a7e6b7..dc664a5 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -15,25 +15,12 @@
  * 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.113 2009/12/15 03:34:34 okan Exp $
+ * $Id: calmwm.h,v 1.114 2009/12/15 04:10:42 okan Exp $
  */
 
 #ifndef _CALMWM_H_
 #define _CALMWM_H_
 
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <ctype.h>
-#include <err.h>
-#include <errno.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>
diff --git a/client.c b/client.c
index dfa7718..659141c 100644
--- a/client.c
+++ b/client.c
@@ -15,10 +15,19 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: client.c,v 1.71 2009/12/15 03:34:34 okan Exp $
+ * $Id: client.c,v 1.72 2009/12/15 04:10:42 okan Exp $
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
 #include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
 
 #include "calmwm.h"
 
diff --git a/conf.c b/conf.c
index 761df11..6b3ed54 100644
--- a/conf.c
+++ b/conf.c
@@ -15,9 +15,20 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: conf.c,v 1.74 2009/12/15 03:24:36 okan Exp $
+ * $Id: conf.c,v 1.75 2009/12/15 04:10:42 okan Exp $
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/stat.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 #ifndef timespeccmp
diff --git a/font.c b/font.c
index 90ffe24..3a8ff0a 100644
--- a/font.c
+++ b/font.c
@@ -16,6 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 int
diff --git a/group.c b/group.c
index b12ee92..f4716e7 100644
--- a/group.c
+++ b/group.c
@@ -16,10 +16,19 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: group.c,v 1.42 2009/12/15 03:38:11 okan Exp $
+ * $Id: group.c,v 1.43 2009/12/15 04:10:42 okan Exp $
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
 #include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
 
 #include "calmwm.h"
 
diff --git a/input.c b/input.c
index dc2ebf7..164a09b 100644
--- a/input.c
+++ b/input.c
@@ -15,9 +15,19 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: input.c,v 1.9 2009/12/15 03:24:36 okan Exp $
+ * $Id: input.c,v 1.10 2009/12/15 04:10:42 okan Exp $
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 int
diff --git a/kbfunc.c b/kbfunc.c
index 9e8691a..005d00c 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -15,11 +15,20 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: kbfunc.c,v 1.49 2009/12/15 03:34:34 okan Exp $
+ * $Id: kbfunc.c,v 1.50 2009/12/15 04:10:42 okan Exp $
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
 #include <dirent.h>
+#include <err.h>
+#include <errno.h>
 #include <paths.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
 
 #include "calmwm.h"
 
diff --git a/menu.c b/menu.c
index 1011a32..96d6556 100644
--- a/menu.c
+++ b/menu.c
@@ -15,6 +15,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 #define PROMPT_SCHAR	'»'
diff --git a/mousefunc.c b/mousefunc.c
index f75e460..559e526 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -16,9 +16,19 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: mousefunc.c,v 1.18 2009/12/15 03:24:36 okan Exp $
+ * $Id: mousefunc.c,v 1.19 2009/12/15 04:10:42 okan Exp $
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.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 8875900..a7407e0 100644
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.23 2009/12/15 03:24:36 okan Exp $ */
+/*	$OpenBSD: parse.y,v 1.24 2009/12/15 04:10:42 okan Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -21,7 +21,11 @@
 
 %{
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
 #include <ctype.h>
+#include <err.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
diff --git a/screen.c b/screen.c
index a843b65..e5793a5 100644
--- a/screen.c
+++ b/screen.c
@@ -15,9 +15,19 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: screen.c,v 1.24 2009/12/15 03:24:36 okan Exp $
+ * $Id: screen.c,v 1.25 2009/12/15 04:10:42 okan Exp $
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 struct screen_ctx *
diff --git a/search.c b/search.c
index dece575..b2d74e3 100644
--- a/search.c
+++ b/search.c
@@ -14,11 +14,20 @@
  * 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.19 2009/12/15 03:34:34 okan Exp $
+ * $Id: search.c,v 1.20 2009/12/15 04:10:42 okan Exp $
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
 #include <assert.h>
+#include <err.h>
+#include <errno.h>
 #include <fnmatch.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
 
 #include "calmwm.h"
 
diff --git a/util.c b/util.c
index 8a1f274..bdde1ae 100644
--- a/util.c
+++ b/util.c
@@ -15,9 +15,19 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: util.c,v 1.11 2009/12/15 03:24:36 okan Exp $
+ * $Id: util.c,v 1.12 2009/12/15 04:10:42 okan Exp $
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 #define MAXARGLEN 20
diff --git a/xevents.c b/xevents.c
index a765df6..02de6bf 100644
--- a/xevents.c
+++ b/xevents.c
@@ -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: xevents.c,v 1.48 2009/12/15 03:24:36 okan Exp $
+ * $Id: xevents.c,v 1.49 2009/12/15 04:10:42 okan Exp $
  */
 
 /*
@@ -24,6 +24,16 @@
  *   management of the xevent's.
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 static void	 xev_handle_maprequest(XEvent *);
diff --git a/xmalloc.c b/xmalloc.c
index 47df4c0..e225a25 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -15,9 +15,19 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: xmalloc.c,v 1.5 2009/12/15 03:24:36 okan Exp $
+ * $Id: xmalloc.c,v 1.6 2009/12/15 04:10:42 okan Exp $
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 void *
diff --git a/xutil.c b/xutil.c
index 7d1b9cb..52d4ff1 100644
--- a/xutil.c
+++ b/xutil.c
@@ -15,9 +15,19 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: xutil.c,v 1.28 2009/12/15 03:24:36 okan Exp $
+ * $Id: xutil.c,v 1.29 2009/12/15 04:10:42 okan Exp $
  */
 
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <err.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include "calmwm.h"
 
 static unsigned int ign_mods[] = { 0, LockMask, Mod2Mask, Mod2Mask | LockMask };
-- 
cgit v1.2.3-2-gb3c3