diff --git a/calmwm.c b/calmwm.c
index 88ece10..d08ed86 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -18,6 +18,9 @@
  * $Id$
  */
 
+#include <getopt.h>
+#include <signal.h>
+
 #include "calmwm.h"
 
 Display				*X_Dpy;
diff --git a/calmwm.h b/calmwm.h
index 16a834d..44cbbf7 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -26,13 +26,9 @@
 #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>
diff --git a/client.c b/client.c
index c4e6abf..f0e7010 100644
--- a/client.c
+++ b/client.c
@@ -18,6 +18,8 @@
  * $Id$
  */
 
+#include <assert.h>
+
 #include "calmwm.h"
 
 static struct client_ctx	*client_mrunext(struct client_ctx *);
diff --git a/group.c b/group.c
index 3dc730c..e05ff54 100644
--- a/group.c
+++ b/group.c
@@ -19,6 +19,8 @@
  * $Id$
  */
 
+#include <assert.h>
+
 #include "calmwm.h"
 
 static void		 group_add(struct group_ctx *, struct client_ctx *);
diff --git a/kbfunc.c b/kbfunc.c
index a1cb430..1e71265 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -18,6 +18,7 @@
  * $Id$
  */
 
+#include <dirent.h>
 #include <paths.h>
 
 #include "calmwm.h"
diff --git a/search.c b/search.c
index e136427..18a3695 100644
--- a/search.c
+++ b/search.c
@@ -17,6 +17,7 @@
  * $Id$
  */
 
+#include <assert.h>
 #include <fnmatch.h>
 
 #include "calmwm.h"