--- a/src/client/cl_net.c
+++ b/src/client/cl_net.c
@@ -4,7 +4,7 @@
  */
 
 #include <unistd.h>
-#include <sys/signal.h>
+#include <signal.h>
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
--- a/src/client/misc.c
+++ b/src/client/misc.c
@@ -1,4 +1,5 @@
 #include <X11/Xlib.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
--- a/src/ggz/client/ggz.c
+++ b/src/ggz/client/ggz.c
@@ -33,6 +33,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 static char *name=NULL;
 static int ggz_sock;