Nuke some obvious #include duplications.

ok espie@ deraadt@ millert@ tedu@

21 files changed, 20 insertions, 42 deletions

diff --git a/games/snake/snscore.c b/games/snake/snscore.c
index 4c464114874..42ae871c481 100644
--- a/games/snake/snscore.c
+++ b/games/snake/snscore.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snscore.c,v 1.10 2009/11/13 19:54:09 jsg Exp $	*/
+/*	$OpenBSD: snscore.c,v 1.11 2014/11/18 20:51:00 krw Exp $	*/
 /*	$NetBSD: snscore.c,v 1.5 1995/04/24 12:25:43 cgd Exp $	*/
 
 /*
@@ -36,7 +36,6 @@
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include "pathnames.h"
diff --git a/lib/libc/asr/getaddrinfo_async.c b/lib/libc/asr/getaddrinfo_async.c
index 1d79c8298d1..18a959acf24 100644
--- a/lib/libc/asr/getaddrinfo_async.c
+++ b/lib/libc/asr/getaddrinfo_async.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getaddrinfo_async.c,v 1.30 2014/09/15 06:15:48 guenther Exp $	*/
+/*	$OpenBSD: getaddrinfo_async.c,v 1.31 2014/11/18 20:51:00 krw Exp $	*/
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
@@ -18,7 +18,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
 #include <net/if.h>
diff --git a/lib/libc/locale/runetable.c b/lib/libc/locale/runetable.c
index 8027a187f7c..7a036ac63bb 100644
--- a/lib/libc/locale/runetable.c
+++ b/lib/libc/locale/runetable.c
@@ -43,7 +43,6 @@
 #include "rune_local.h"
 #include "citrus_ctype.h"
 #include "citrus_none.h"
-#include <stdlib.h>
 
 _RuneLocale _DefaultRuneLocale = {
     _RUNE_MAGIC_1,
diff --git a/lib/libkvm/kvm_powerpc.c b/lib/libkvm/kvm_powerpc.c
index f663defc5f9..f469bec6775 100644
--- a/lib/libkvm/kvm_powerpc.c
+++ b/lib/libkvm/kvm_powerpc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_powerpc.c,v 1.8 2013/11/01 15:57:56 deraadt Exp $	*/
+/*	$OpenBSD: kvm_powerpc.c,v 1.9 2014/11/18 20:51:00 krw Exp $	*/
 
 /*-
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -50,7 +50,6 @@
 #include <stdlib.h>
 #include <db.h>
 #include <limits.h>
-#include <kvm.h>
 
 #include "kvm_private.h"
 
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index a0905ebb264..994275e0575 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.32 2013/11/27 21:25:25 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.33 2014/11/18 20:51:00 krw Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1993
@@ -45,7 +45,6 @@
 #include <string.h>
 #include <syslog.h>
 #include <stdio.h>
-#include <time.h>
 #include <unistd.h>
 #include <util.h>
 
diff --git a/libexec/ld.so/sod.c b/libexec/ld.so/sod.c
index adeff54a22d..bc62f327743 100644
--- a/libexec/ld.so/sod.c
+++ b/libexec/ld.so/sod.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sod.c,v 1.31 2014/07/10 09:03:01 otto Exp $	*/
+/*	$OpenBSD: sod.c,v 1.32 2014/11/18 20:51:00 krw Exp $	*/
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -39,7 +39,6 @@
 #include <fcntl.h>
 #include <nlist.h>
 #include <link.h>
-#include <limits.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index 925d55ee07d..8f2b1f0f71f 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rstatd.c,v 1.24 2014/10/11 03:44:02 deraadt Exp $	*/
+/*	$OpenBSD: rstatd.c,v 1.25 2014/11/18 20:51:00 krw Exp $	*/
 
 /*-
  * Copyright (c) 1993, John Brezak
@@ -38,7 +38,6 @@
 #include <pwd.h>
 #include <syslog.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <rpc/rpc.h>
 #include <rpcsvc/rstat.h>
 
diff --git a/regress/sbin/isakmpd/x509/x509test.c b/regress/sbin/isakmpd/x509/x509test.c
index 116a8717771..9f6b8b5a91e 100644
--- a/regress/sbin/isakmpd/x509/x509test.c
+++ b/regress/sbin/isakmpd/x509/x509test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: x509test.c,v 1.1 2005/04/08 17:12:50 cloder Exp $	*/
+/*	$OpenBSD: x509test.c,v 1.2 2014/11/18 20:51:00 krw Exp $	*/
 /*	$EOM: x509test.c,v 1.9 2000/12/21 15:24:25 ho Exp $	*/
 
 /*
@@ -47,7 +47,6 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/sbin/fsck_msdos/dir.c b/sbin/fsck_msdos/dir.c
index 8961b969e22..d756ccac994 100644
--- a/sbin/fsck_msdos/dir.c
+++ b/sbin/fsck_msdos/dir.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dir.c,v 1.26 2014/07/11 14:35:19 tobias Exp $	*/
+/*	$OpenBSD: dir.c,v 1.27 2014/11/18 20:51:00 krw Exp $	*/
 /*	$NetBSD: dir.c,v 1.11 1997/10/17 11:19:35 ws Exp $	*/
 
 /*
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <time.h>
 
diff --git a/sbin/pflogd/privsep_fdpass.c b/sbin/pflogd/privsep_fdpass.c
index 45a7cfc3a92..c24cdc0488c 100644
--- a/sbin/pflogd/privsep_fdpass.c
+++ b/sbin/pflogd/privsep_fdpass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: privsep_fdpass.c,v 1.7 2012/12/04 02:24:46 deraadt Exp $	*/
+/*	$OpenBSD: privsep_fdpass.c,v 1.8 2014/11/18 20:51:00 krw Exp $	*/
 
 /*
  * Copyright 2001 Niels Provos <provos@citi.umich.edu>
@@ -34,7 +34,6 @@
 
 #include <sys/types.h>
 #include <sys/uio.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <err.h>
diff --git a/sys/arch/alpha/alpha/fp_complete.c b/sys/arch/alpha/alpha/fp_complete.c
index a2de603ee56..6197664b44d 100644
--- a/sys/arch/alpha/alpha/fp_complete.c
+++ b/sys/arch/alpha/alpha/fp_complete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fp_complete.c,v 1.10 2014/05/08 20:46:49 miod Exp $	*/
+/*	$OpenBSD: fp_complete.c,v 1.11 2014/11/18 20:51:00 krw Exp $	*/
 /*	$NetBSD: fp_complete.c,v 1.5 2002/01/18 22:15:56 ross Exp $	*/
 
 /*-
@@ -41,7 +41,6 @@
 #include <machine/cpu.h>
 #include <machine/fpu.h>
 #include <machine/reg.h>
-#include <machine/cpu.h>
 #include <alpha/alpha/db_instruction.h>
 
 #include <lib/libkern/softfloat.h>
diff --git a/sys/arch/alpha/alpha/interrupt.c b/sys/arch/alpha/alpha/interrupt.c
index d38ad4e22ae..9be29cd9105 100644
--- a/sys/arch/alpha/alpha/interrupt.c
+++ b/sys/arch/alpha/alpha/interrupt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interrupt.c,v 1.33 2014/07/12 18:44:40 tedu Exp $ */
+/* $OpenBSD: interrupt.c,v 1.34 2014/11/18 20:51:00 krw Exp $ */
 /* $NetBSD: interrupt.c,v 1.46 2000/06/03 20:47:36 thorpej Exp $ */
 
 /*-
@@ -68,7 +68,6 @@
 #include <sys/vmmeter.h>
 #include <sys/sched.h>
 #include <sys/kernel.h>
-#include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
diff --git a/sys/arch/amd64/amd64/aesni.c b/sys/arch/amd64/amd64/aesni.c
index e96b8b7398d..7a47fe4baa7 100644
--- a/sys/arch/amd64/amd64/aesni.c
+++ b/sys/arch/amd64/amd64/aesni.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aesni.c,v 1.29 2014/11/18 15:18:01 mikeb Exp $	*/
+/*	$OpenBSD: aesni.c,v 1.30 2014/11/18 20:51:00 krw Exp $	*/
 /*-
  * Copyright (c) 2003 Jason Wright
  * Copyright (c) 2003, 2004 Theo de Raadt
@@ -26,7 +26,6 @@
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/mbuf.h>
-#include <sys/pool.h>
 
 #include <crypto/cryptodev.h>
 #include <crypto/rijndael.h>
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index 157587e4707..aee7f1a985d 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.195 2014/11/16 12:30:56 deraadt Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.196 2014/11/18 20:51:00 krw Exp $	*/
 /*	$NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $	*/
 
 /*-
@@ -108,7 +108,6 @@
 #include <machine/fpu.h>
 #include <machine/biosvar.h>
 #include <machine/mpbiosvar.h>
-#include <machine/reg.h>
 #include <machine/kcore.h>
 #include <machine/tss.h>
 
diff --git a/sys/arch/amd64/stand/pxeboot/net.c b/sys/arch/amd64/stand/pxeboot/net.c
index e8d335e95f6..d7e8fbf11b6 100644
--- a/sys/arch/amd64/stand/pxeboot/net.c
+++ b/sys/arch/amd64/stand/pxeboot/net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: net.c,v 1.2 2014/07/13 15:31:20 mpi Exp $	*/
+/*	$OpenBSD: net.c,v 1.3 2014/11/18 20:51:01 krw Exp $	*/
 /*	$NetBSD: net.c,v 1.14 1996/10/13 02:29:02 christos Exp $	*/
 
 /*
@@ -46,7 +46,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 
-#include <netinet/in.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
diff --git a/sys/arch/arm/arm/ast.c b/sys/arch/arm/arm/ast.c
index 217ff3dd621..bfc4cc9330b 100644
--- a/sys/arch/arm/arm/ast.c
+++ b/sys/arch/arm/arm/ast.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ast.c,v 1.13 2014/05/11 12:59:31 deraadt Exp $	*/
+/*	$OpenBSD: ast.c,v 1.14 2014/11/18 20:51:01 krw Exp $	*/
 /*	$NetBSD: ast.c,v 1.6 2003/10/31 16:44:34 cl Exp $	*/
 
 /*
@@ -55,7 +55,6 @@
 
 #include <machine/cpu.h>
 #include <machine/frame.h>
-#include <machine/cpu.h>
 
 #include <arm/cpufunc.h>
 
diff --git a/sys/arch/i386/stand/pxeboot/net.c b/sys/arch/i386/stand/pxeboot/net.c
index e8d335e95f6..d7e8fbf11b6 100644
--- a/sys/arch/i386/stand/pxeboot/net.c
+++ b/sys/arch/i386/stand/pxeboot/net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: net.c,v 1.2 2014/07/13 15:31:20 mpi Exp $	*/
+/*	$OpenBSD: net.c,v 1.3 2014/11/18 20:51:01 krw Exp $	*/
 /*	$NetBSD: net.c,v 1.14 1996/10/13 02:29:02 christos Exp $	*/
 
 /*
@@ -46,7 +46,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 
-#include <netinet/in.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
diff --git a/sys/arch/loongson/stand/boot/exec.c b/sys/arch/loongson/stand/boot/exec.c
index 3a66a224119..610389f973e 100644
--- a/sys/arch/loongson/stand/boot/exec.c
+++ b/sys/arch/loongson/stand/boot/exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.c,v 1.2 2010/04/03 19:13:27 miod Exp $	*/
+/*	$OpenBSD: exec.c,v 1.3 2014/11/18 20:51:01 krw Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -22,7 +22,6 @@
 #include <machine/pmon.h>
 #include "libsa.h"
 #include <lib/libsa/loadfile.h>
-#include <machine/cpu.h>
 
 typedef void (*program)(int32_t, int32_t, int32_t *, int32_t, uint64_t *);
 
diff --git a/sys/arch/sh/sh/locore_c.c b/sys/arch/sh/sh/locore_c.c
index 41f1de60dbb..b908f5f8169 100644
--- a/sys/arch/sh/sh/locore_c.c
+++ b/sys/arch/sh/sh/locore_c.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore_c.c,v 1.11 2014/04/14 07:36:12 mpi Exp $	*/
+/*	$OpenBSD: locore_c.c,v 1.12 2014/11/18 20:51:01 krw Exp $	*/
 /*	$NetBSD: locore_c.c,v 1.13 2006/03/04 01:13:35 uwe Exp $	*/
 
 /*-
@@ -108,7 +108,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/sched.h>
-#include <sys/proc.h>
 
 #include <uvm/uvm_extern.h>
 
diff --git a/sys/arch/solbourne/dev/zsclock.c b/sys/arch/solbourne/dev/zsclock.c
index 9753fc82894..4b0c19557a0 100644
--- a/sys/arch/solbourne/dev/zsclock.c
+++ b/sys/arch/solbourne/dev/zsclock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zsclock.c,v 1.3 2013/04/21 14:44:16 sebastia Exp $	*/
+/*	$OpenBSD: zsclock.c,v 1.4 2014/11/18 20:51:01 krw Exp $	*/
 /*	$NetBSD: clock.c,v 1.11 1995/05/16 07:30:46 phil Exp $	*/
 
 /*-
@@ -55,7 +55,6 @@
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/ioctl.h>
-#include <sys/kernel.h>
 
 #include <dev/ic/z8530reg.h>
 #include <machine/z8530var.h>
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index 7705426e3f8..f1655eb80a1 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.144 2014/09/20 09:28:24 kettenis Exp $ */
+/* $OpenBSD: machdep.c,v 1.145 2014/11/18 20:51:01 krw Exp $ */
 /* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $	 */
 
 /*
@@ -77,8 +77,6 @@
 #include <net/if.h>
 #include <uvm/uvm.h>
 
-#include <net/if.h>
-
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/ip_var.h>