Nuke more obvious #include duplications.

ok deraadt@ millert@ tedu@

7 files changed, 7 insertions, 16 deletions

diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index d4cccd64049..e8b858730d2 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.27 2014/10/17 20:19:15 millert Exp $	*/
+/*	$OpenBSD: util.c,v 1.28 2014/11/18 20:54:28 krw Exp $	*/
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -47,7 +47,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <vis.h>
-#include <err.h>
 #include "finger.h"
 #include "extern.h"
 
diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c
index 9cb08fc6262..0a0dfd6a93a 100644
--- a/usr.bin/gencat/gencat.c
+++ b/usr.bin/gencat/gencat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gencat.c,v 1.16 2012/12/05 23:20:25 deraadt Exp $	*/
+/*	$OpenBSD: gencat.c,v 1.17 2014/11/18 20:54:28 krw Exp $	*/
 /*	$NetBSD: gencat.c,v 1.9 1998/10/09 17:00:56 itohy Exp $	*/
 
 /*-
@@ -78,9 +78,6 @@ up-to-date.  Many thanks.
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <fcntl.h>
-#include <nl_types.h>
-#include <err.h>
 
 struct _msgT {
 	long    msgId;
diff --git a/usr.bin/openssl/s_client.c b/usr.bin/openssl/s_client.c
index 37a8280d15c..988d799b97c 100644
--- a/usr.bin/openssl/s_client.c
+++ b/usr.bin/openssl/s_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_client.c,v 1.7 2014/11/07 14:16:48 jsing Exp $ */
+/* $OpenBSD: s_client.c,v 1.8 2014/11/18 20:54:28 krw Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -148,7 +148,6 @@
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <limits.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index ac76a8fab6e..92c9e5f938a 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_main.c,v 1.27 2013/11/28 18:24:54 deraadt Exp $	 */
+/* $OpenBSD: rpc_main.c,v 1.28 2014/11/18 20:54:28 krw Exp $	 */
 /* $NetBSD: rpc_main.c,v 1.9 1996/02/19 11:12:43 pk Exp $	 */
 
 /*
@@ -45,7 +45,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdlib.h>
 #include <ctype.h>
 #include <sys/stat.h>
 #include "rpc_parse.h"
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c
index 37841752bc0..0fb6ba6ce07 100644
--- a/usr.bin/ssh/ssh-agent.c
+++ b/usr.bin/ssh/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.190 2014/07/25 21:22:03 dtucker Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.191 2014/11/18 20:54:28 krw Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -38,7 +38,6 @@
 #include <sys/time.h>
 #include <sys/queue.h>
 #include <sys/resource.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/un.h>
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 5d8ca91e298..346b94a2e36 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.409 2014/10/09 06:21:31 jmc Exp $ */
+/* $OpenBSD: ssh.c,v 1.410 2014/11/18 20:54:28 krw Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -47,7 +47,6 @@
 #include <sys/resource.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index a03ca2f60fc..f91ec80b883 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ul.c,v 1.15 2009/10/27 23:59:46 deraadt Exp $	*/
+/*	$OpenBSD: ul.c,v 1.16 2014/11/18 20:54:28 krw Exp $	*/
 /*	$NetBSD: ul.c,v 1.3 1994/12/07 00:28:24 jtc Exp $	*/
 
 /*
@@ -34,7 +34,6 @@
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdlib.h>
 #include <string.h>
 #include <term.h>
 #include <unistd.h>