From 4a81f47491cbfb08a46cd77fd45b27cb6cb98515 Mon Sep 17 00:00:00 2001
From: nicm <nicm@openbsd.org>
Date: Thu, 17 Apr 2014 11:38:35 +0000
Subject: [PATCH] Remove some unnecessary includes and fix a typo.

---
 usr.bin/tmux/cfg.c             | 3 +--
 usr.bin/tmux/client.c          | 4 +---
 usr.bin/tmux/cmd-lock-server.c | 6 +-----
 usr.bin/tmux/cmd-new-session.c | 3 +--
 usr.bin/tmux/options-table.c   | 6 +++---
 usr.bin/tmux/window.c          | 6 +-----
 6 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/usr.bin/tmux/cfg.c b/usr.bin/tmux/cfg.c
index 4521e7eb336..bbcb649b09a 100644
--- a/usr.bin/tmux/cfg.c
+++ b/usr.bin/tmux/cfg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfg.c,v 1.30 2013/10/20 17:28:43 nicm Exp $ */
+/* $OpenBSD: cfg.c,v 1.31 2014/04/17 11:38:35 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -17,7 +17,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/usr.bin/tmux/client.c b/usr.bin/tmux/client.c
index 5b4d8eeca31..1c90079819d 100644
--- a/usr.bin/tmux/client.c
+++ b/usr.bin/tmux/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.78 2014/01/09 21:20:45 nicm Exp $ */
+/* $OpenBSD: client.c,v 1.79 2014/04/17 11:38:35 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -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>
diff --git a/usr.bin/tmux/cmd-lock-server.c b/usr.bin/tmux/cmd-lock-server.c
index 4dd0cb45645..55c2ffd6aff 100644
--- a/usr.bin/tmux/cmd-lock-server.c
+++ b/usr.bin/tmux/cmd-lock-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-lock-server.c,v 1.15 2013/10/10 12:00:21 nicm Exp $ */
+/* $OpenBSD: cmd-lock-server.c,v 1.16 2014/04/17 11:38:35 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -18,10 +18,6 @@
 
 #include <sys/types.h>
 
-#include <pwd.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "tmux.h"
 
 /*
diff --git a/usr.bin/tmux/cmd-new-session.c b/usr.bin/tmux/cmd-new-session.c
index 4ed74091aef..cc39946d0d9 100644
--- a/usr.bin/tmux/cmd-new-session.c
+++ b/usr.bin/tmux/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-new-session.c,v 1.57 2014/02/23 00:53:06 nicm Exp $ */
+/* $OpenBSD: cmd-new-session.c,v 1.58 2014/04/17 11:38:35 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -20,7 +20,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
diff --git a/usr.bin/tmux/options-table.c b/usr.bin/tmux/options-table.c
index 3209ca5d253..9341bd383ad 100644
--- a/usr.bin/tmux/options-table.c
+++ b/usr.bin/tmux/options-table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options-table.c,v 1.48 2014/04/17 07:55:43 nicm Exp $ */
+/* $OpenBSD: options-table.c,v 1.49 2014/04/17 11:38:35 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -28,8 +28,8 @@
  * options. These tables are the master copy of the options with their real
  * (user-visible) types, range limits and default values. At start these are
  * copied into the runtime global options trees (which only has number and
- * string types). These tables are then used to loop up the real type when
- * the user sets an option or its value needs to be shown.
+ * string types). These tables are then used to look up the real type when the
+ * user sets an option or its value needs to be shown.
  */
 
 /* Choice option type lists. */
diff --git a/usr.bin/tmux/window.c b/usr.bin/tmux/window.c
index e0f23c10119..09eb4ae352c 100644
--- a/usr.bin/tmux/window.c
+++ b/usr.bin/tmux/window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.105 2014/04/17 09:13:13 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.106 2014/04/17 11:38:35 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -17,14 +17,10 @@
  */
 
 #include <sys/types.h>
-#include <sys/ioctl.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
-#include <paths.h>
-#include <pwd.h>
-#include <signal.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-- 
2.20.1