pull all non-X11 headers from calmwm.h and place them only where they

are required.

encourged to go all the way by oga@

app/cwm/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"
 

app/cwm/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>

app/cwm/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"
 

app/cwm/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

app/cwm/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

app/cwm/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"
 

app/cwm/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

app/cwm/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"
 

app/cwm/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	'»'

app/cwm/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);

app/cwm/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>

app/cwm/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 *

app/cwm/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"
 

app/cwm/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

app/cwm/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 *);

app/cwm/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 *

app/cwm/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 };