Merge branch 'obsd-master'

Conflicts:
	Makefile
	tmux.1
	window.c

1 files changed, 0 insertions, 2 deletions

diff --git a/client.c b/client.c
index 277efb65..2d4a93b5 100644
--- a/client.c
+++ b/client.c
@@ -25,8 +25,6 @@
 
 #include <errno.h>
 #include <event.h>
-#include <fcntl.h>
-#include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>