diff --git a/calmwm.c b/calmwm.c
index d08ed86..d28dde5 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -18,8 +18,18 @@
  * $Id$
  */
 
+#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 44cbbf7..7ce92a7 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -21,19 +21,6 @@
 #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 f0e7010..2818890 100644
--- a/client.c
+++ b/client.c
@@ -18,7 +18,16 @@
  * $Id$
  */
 
+#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 463e184..0764a4a 100644
--- a/conf.c
+++ b/conf.c
@@ -18,6 +18,17 @@
  * $Id$
  */
 
+#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 df7928c..f71ba06 100644
--- a/group.c
+++ b/group.c
@@ -19,7 +19,16 @@
  * $Id$
  */
 
+#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 13d6a1f..35931b6 100644
--- a/input.c
+++ b/input.c
@@ -18,6 +18,16 @@
  * $Id$
  */
 
+#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 1e71265..00d5212 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -18,8 +18,17 @@
  * $Id$
  */
 
+#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 e49a170..75e28cc 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -19,6 +19,16 @@
  * $Id$
  */
 
+#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 db4345b..9d049c9 100644
--- a/parse.y
+++ b/parse.y
@@ -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 dd47c30..0998b92 100644
--- a/screen.c
+++ b/screen.c
@@ -18,6 +18,16 @@
  * $Id$
  */
 
+#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 18a3695..4383f5d 100644
--- a/search.c
+++ b/search.c
@@ -17,8 +17,17 @@
  * $Id$
  */
 
+#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 b2c5726..450adb5 100644
--- a/util.c
+++ b/util.c
@@ -18,6 +18,16 @@
  * $Id$
  */
 
+#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 5d88a6c..22c2afc 100644
--- a/xevents.c
+++ b/xevents.c
@@ -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 989521f..8d9903e 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -18,6 +18,16 @@
  * $Id$
  */
 
+#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 bdb6da9..e59bc42 100644
--- a/xutil.c
+++ b/xutil.c
@@ -18,6 +18,16 @@
  * $Id$
  */
 
+#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 };