diff --git a/cfg.c b/cfg.c
index badfe038..00ee33b1 100644
--- a/cfg.c
+++ b/cfg.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "tmux.h"
 
diff --git a/format.c b/format.c
index 8163a5cf..0773b6bf 100644
--- a/format.c
+++ b/format.c
@@ -17,7 +17,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/wait.h>
 
 #include <errno.h>
diff --git a/server-client.c b/server-client.c
index 08200529..d179f6e8 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1105,6 +1105,7 @@ server_client_resize_event(__unused int fd, __unused short events, void *data)
 		if (errno != EINVAL && errno != ENXIO)
 #endif
 		fatal("ioctl failed");
+	log_debug("%s: %%%u resize to %u,%u", __func__, wp->id, wp->sx, wp->sy);
 
 	wp->flags &= ~PANE_RESIZE;
 
diff --git a/tools/cmp-cvs.sh b/tools/cmp-cvs.sh
index 048ad15c..b17d6f82 100644
--- a/tools/cmp-cvs.sh
+++ b/tools/cmp-cvs.sh
@@ -4,7 +4,7 @@ rm diff.out
 touch diff.out
 
 for i in *.[ch]; do
-    diff -u -I'\$OpenBSD' $i /usr/src/usr.bin/tmux/$i >diff.tmp
+    diff -u -I'\$OpenBSD' $i ../../OpenBSD/tmux/$i >diff.tmp
     set -- `wc -l diff.tmp`
     [ $1 -eq 8 ] && continue
     echo $i
diff --git a/window.c b/window.c
index c949565b..c220215d 100644
--- a/window.c
+++ b/window.c
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
-#include <signal.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>