From 6bae335dd015f9e023db26fea05e06c52cf1d0d7 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Wed, 19 Apr 2023 12:58:15 +0000
Subject: [PATCH] remove duplicate includes

---
 libexec/snmpd/snmpd_metrics/mib.c      | 3 +--
 libexec/spamd/spamd.c                  | 3 +--
 regress/lib/libc/sys/t_kevent.c        | 3 +--
 regress/sbin/iked/test_helper/fuzz.c   | 1 -
 sbin/ldattach/ldattach.c               | 3 +--
 sbin/shutdown/shutdown.c               | 3 +--
 usr.bin/ctfconv/pool.c                 | 3 +--
 usr.bin/dig/lib/dns/gen.c              | 1 -
 usr.bin/dig/lib/isc/include/isc/hash.h | 8 +-------
 usr.bin/systat/nfs.c                   | 3 +--
 usr.bin/xargs/strnsubst.c              | 3 +--
 usr.sbin/eigrpd/log.c                  | 4 +---
 usr.sbin/inetd/inetd.c                 | 3 +--
 usr.sbin/npppd/common/radish.c         | 4 +---
 usr.sbin/ntpd/ntp_dns.c                | 5 +----
 usr.sbin/ocspcheck/http.c              | 3 +--
 usr.sbin/pwd_mkdb/pwd_mkdb.c           | 3 +--
 usr.sbin/rad/rad.c                     | 3 +--
 usr.sbin/rpki-client/output.c          | 3 +--
 usr.sbin/slaacctl/parser.c             | 3 +--
 usr.sbin/vmd/loadfile_elf.c            | 3 +--
 usr.sbin/vmd/vmd.c                     | 3 +--
 22 files changed, 20 insertions(+), 51 deletions(-)

diff --git a/libexec/snmpd/snmpd_metrics/mib.c b/libexec/snmpd/snmpd_metrics/mib.c
index 150da0b7131..c68d40b1ec5 100644
--- a/libexec/snmpd/snmpd_metrics/mib.c
+++ b/libexec/snmpd/snmpd_metrics/mib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mib.c,v 1.2 2022/10/16 13:33:10 jsg Exp $	*/
+/*	$OpenBSD: mib.c,v 1.3 2023/04/19 12:58:15 jsg Exp $	*/
 
 /*
  * Copyright (c) 2022 Martijn van Duren <martijn@openbsd.org>
@@ -57,7 +57,6 @@
 #include <syslog.h>
 #include <time.h>
 #include <unistd.h>
-#include <pwd.h>
 #include <libgen.h>
 #include <limits.h>
 #include <kvm.h>
diff --git a/libexec/spamd/spamd.c b/libexec/spamd/spamd.c
index 25ffbc76cd8..58800238dfc 100644
--- a/libexec/spamd/spamd.c
+++ b/libexec/spamd/spamd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spamd.c,v 1.159 2023/01/14 07:36:16 tb Exp $	*/
+/*	$OpenBSD: spamd.c,v 1.160 2023/04/19 12:58:15 jsg Exp $	*/
 
 /*
  * Copyright (c) 2015 Henning Brauer <henning@openbsd.org>
@@ -39,7 +39,6 @@
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <limits.h>
 #include <tls.h>
 
 #include <netdb.h>
diff --git a/regress/lib/libc/sys/t_kevent.c b/regress/lib/libc/sys/t_kevent.c
index 917ab7f1dd6..003d7b8a5d4 100644
--- a/regress/lib/libc/sys/t_kevent.c
+++ b/regress/lib/libc/sys/t_kevent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_kevent.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
+/*	$OpenBSD: t_kevent.c,v 1.3 2023/04/19 12:58:15 jsg Exp $	*/
 /*	$NetBSD: t_kevent.c,v 1.9 2020/10/31 01:08:32 christos Exp $ */
 
 /*-
@@ -46,7 +46,6 @@
 #ifndef __OpenBSD__
 #include <sys/drvctlio.h>
 #endif
-#include <sys/event.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
diff --git a/regress/sbin/iked/test_helper/fuzz.c b/regress/sbin/iked/test_helper/fuzz.c
index 4f14217d559..0b9303da3a5 100644
--- a/regress/sbin/iked/test_helper/fuzz.c
+++ b/regress/sbin/iked/test_helper/fuzz.c
@@ -25,7 +25,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #include "test_helper.h"
 
diff --git a/sbin/ldattach/ldattach.c b/sbin/ldattach/ldattach.c
index bf0099bc6d6..ddc9e6d1f63 100644
--- a/sbin/ldattach/ldattach.c
+++ b/sbin/ldattach/ldattach.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldattach.c,v 1.19 2023/03/08 04:43:06 guenther Exp $	*/
+/*	$OpenBSD: ldattach.c,v 1.20 2023/04/19 12:58:15 jsg Exp $	*/
 
 /*
  * Copyright (c) 2007, 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -27,7 +27,6 @@
 #include <sys/limits.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
 
 #include <err.h>
 #include <errno.h>
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index 97b55b763bb..2c74ae3d25a 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shutdown.c,v 1.54 2023/01/13 07:02:16 cheloha Exp $	*/
+/*	$OpenBSD: shutdown.c,v 1.55 2023/04/19 12:58:15 jsg Exp $	*/
 /*	$NetBSD: shutdown.c,v 1.9 1995/03/18 15:01:09 cgd Exp $	*/
 
 /*
@@ -33,7 +33,6 @@
 #include <sys/types.h>
 #include <sys/resource.h>
 #include <sys/syslog.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 
 #include <ctype.h>
diff --git a/usr.bin/ctfconv/pool.c b/usr.bin/ctfconv/pool.c
index 24129248527..d337603ea10 100644
--- a/usr.bin/ctfconv/pool.c
+++ b/usr.bin/ctfconv/pool.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pool.c,v 1.3 2017/08/29 21:10:20 deraadt Exp $ */
+/*	$OpenBSD: pool.c,v 1.4 2023/04/19 12:58:15 jsg Exp $ */
 
 /*
  * Copyright (c) 2017 Martin Pieuchot
@@ -18,7 +18,6 @@
 
 #ifndef NOPOOL
 
-#include <sys/types.h>
 #include <sys/types.h>
 #include <sys/queue.h>
 
diff --git a/usr.bin/dig/lib/dns/gen.c b/usr.bin/dig/lib/dns/gen.c
index 96da6d300c2..846312b40c5 100644
--- a/usr.bin/dig/lib/dns/gen.c
+++ b/usr.bin/dig/lib/dns/gen.c
@@ -22,7 +22,6 @@
 #include <dirent.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/usr.bin/dig/lib/isc/include/isc/hash.h b/usr.bin/dig/lib/isc/include/isc/hash.h
index fbc103b1b22..a691b7741b5 100644
--- a/usr.bin/dig/lib/isc/include/isc/hash.h
+++ b/usr.bin/dig/lib/isc/include/isc/hash.h
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hash.h,v 1.4 2020/09/14 08:40:44 florian Exp $ */
+/* $Id: hash.h,v 1.5 2023/04/19 12:58:15 jsg Exp $ */
 
 #ifndef ISC_HASH_H
 #define ISC_HASH_H 1
@@ -73,12 +73,6 @@
  *	None.
  */
 
-/***
- *** Imports
- ***/
-
-#include <isc/types.h>
-
 /***
  *** Functions
  ***/
diff --git a/usr.bin/systat/nfs.c b/usr.bin/systat/nfs.c
index 87feef6e71e..df6c9b9e97d 100644
--- a/usr.bin/systat/nfs.c
+++ b/usr.bin/systat/nfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs.c,v 1.8 2019/06/28 13:35:04 deraadt Exp $	*/
+/*	$OpenBSD: nfs.c,v 1.9 2023/04/19 12:58:15 jsg Exp $	*/
 
 /*
  * Copyright (c) 2009 Jasper Lievisse Adriaanse <jasper@openbsd.org>
@@ -21,7 +21,6 @@
 #include <sys/mount.h>
 #include <sys/signal.h>
 #include <sys/sysctl.h>
-#include <sys/types.h>
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
diff --git a/usr.bin/xargs/strnsubst.c b/usr.bin/xargs/strnsubst.c
index a26edc57cc7..5cb404cec53 100644
--- a/usr.bin/xargs/strnsubst.c
+++ b/usr.bin/xargs/strnsubst.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strnsubst.c,v 1.7 2019/07/03 03:24:02 deraadt Exp $	*/
+/*	$OpenBSD: strnsubst.c,v 1.8 2023/04/19 12:58:16 jsg Exp $	*/
 /*	$FreeBSD: strnsubst.c,v 1.6 2002/06/22 12:58:42 jmallett Exp $	*/
 
 /*
@@ -67,7 +67,6 @@ done:
 }
 
 #ifdef TEST
-#include <stdio.h>
 
 int
 main(void)
diff --git a/usr.sbin/eigrpd/log.c b/usr.sbin/eigrpd/log.c
index 1d7bca0df4e..a57dde7d560 100644
--- a/usr.sbin/eigrpd/log.c
+++ b/usr.sbin/eigrpd/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.9 2021/01/19 10:51:35 claudio Exp $ */
+/*	$OpenBSD: log.c,v 1.10 2023/04/19 12:58:16 jsg Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -28,8 +28,6 @@
 #include <syslog.h>
 #include <time.h>
 #include <unistd.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 
 #include "eigrpd.h"
 #include "log.h"
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index bffe64b691c..fec44e82a11 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inetd.c,v 1.163 2022/12/04 23:50:50 cheloha Exp $	*/
+/*	$OpenBSD: inetd.c,v 1.164 2023/04/19 12:58:16 jsg Exp $	*/
 
 /*
  * Copyright (c) 1983,1991 The Regents of the University of California.
@@ -1489,7 +1489,6 @@ discard_dg(int s, struct servtab *sep)
 	(void) read(s, buffer, sizeof(buffer));
 }
 
-#include <ctype.h>
 #define LINESIZ 72
 char ring[128];
 char *endring;
diff --git a/usr.sbin/npppd/common/radish.c b/usr.sbin/npppd/common/radish.c
index 35f9abf2cfe..42ee00c8e8a 100644
--- a/usr.sbin/npppd/common/radish.c
+++ b/usr.sbin/npppd/common/radish.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radish.c,v 1.7 2021/03/29 03:54:39 yasuoka Exp $ */
+/*	$OpenBSD: radish.c,v 1.8 2023/04/19 12:58:16 jsg Exp $ */
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
@@ -48,9 +48,7 @@
 #include "radish.h"
 
 #include <netinet/in.h>
-#include <string.h>
 #include <strings.h>
-#include <stdlib.h>
 #include <stdio.h>
 
 #define FATAL(x)			\
diff --git a/usr.sbin/ntpd/ntp_dns.c b/usr.sbin/ntpd/ntp_dns.c
index 72a00deabc9..8928b8cd7fc 100644
--- a/usr.sbin/ntpd/ntp_dns.c
+++ b/usr.sbin/ntpd/ntp_dns.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntp_dns.c,v 1.27 2021/10/24 21:24:19 deraadt Exp $ */
+/*	$OpenBSD: ntp_dns.c,v 1.28 2023/04/19 12:58:16 jsg Exp $ */
 
 /*
  * Copyright (c) 2003-2008 Henning Brauer <henning@openbsd.org>
@@ -23,8 +23,6 @@
 #include <arpa/nameser.h>
 #include <resolv.h>
 
-#include <netinet/in.h>
-
 #include <err.h>
 #include <errno.h>
 #include <poll.h>
@@ -33,7 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <resolv.h>
 #include <unistd.h>
 
 #include "ntpd.h"
diff --git a/usr.sbin/ocspcheck/http.c b/usr.sbin/ocspcheck/http.c
index 82a504ad1a1..46b01f1ec4a 100644
--- a/usr.sbin/ocspcheck/http.c
+++ b/usr.sbin/ocspcheck/http.c
@@ -1,4 +1,4 @@
-/*	$Id: http.c,v 1.16 2022/12/15 08:07:03 florian Exp $ */
+/*	$Id: http.c,v 1.17 2023/04/19 12:58:16 jsg Exp $ */
 /*
  * Copyright (c) 2016 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -33,7 +33,6 @@
 #include <unistd.h>
 
 #include "http.h"
-#include <tls.h>
 
 /*
  * A buffer for transferring HTTP/S data.
diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c
index d2a55325908..14a0187eda1 100644
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pwd_mkdb.c,v 1.60 2022/12/04 23:50:51 cheloha Exp $	*/
+/*	$OpenBSD: pwd_mkdb.c,v 1.61 2023/04/19 12:58:16 jsg Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -47,7 +47,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <limits.h>
 #include <util.h>
 
 #define MINIMUM(a, b)	(((a) < (b)) ? (a) : (b))
diff --git a/usr.sbin/rad/rad.c b/usr.sbin/rad/rad.c
index 713fb4a9dca..b283e58fbf1 100644
--- a/usr.sbin/rad/rad.c
+++ b/usr.sbin/rad/rad.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rad.c,v 1.28 2022/10/15 13:26:15 florian Exp $	*/
+/*	$OpenBSD: rad.c,v 1.29 2023/04/19 12:58:16 jsg Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -28,7 +28,6 @@
 #include <netinet/in.h>
 #include <net/if.h>
 #include <net/route.h>
-#include <netinet/in.h>
 #include <netinet/if_ether.h>
 #include <netinet6/in6_var.h>
 #include <netinet/icmp6.h>
diff --git a/usr.sbin/rpki-client/output.c b/usr.sbin/rpki-client/output.c
index 79b425ec0a8..878b6b68cd7 100644
--- a/usr.sbin/rpki-client/output.c
+++ b/usr.sbin/rpki-client/output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: output.c,v 1.29 2022/12/15 12:02:29 claudio Exp $ */
+/*	$OpenBSD: output.c,v 1.30 2023/04/19 12:58:16 jsg Exp $ */
 /*
  * Copyright (c) 2019 Theo de Raadt <deraadt@openbsd.org>
  *
@@ -51,7 +51,6 @@
 #include <signal.h>
 #include <string.h>
 #include <limits.h>
-#include <unistd.h>
 #include <time.h>
 
 #include "extern.h"
diff --git a/usr.sbin/slaacctl/parser.c b/usr.sbin/slaacctl/parser.c
index f4a1858cc87..86b71297a1c 100644
--- a/usr.sbin/slaacctl/parser.c
+++ b/usr.sbin/slaacctl/parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser.c,v 1.1 2017/04/10 13:35:42 florian Exp $	*/
+/*	$OpenBSD: parser.c,v 1.2 2023/04/19 12:58:16 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -24,7 +24,6 @@
 #include <arpa/inet.h>
 
 #include <net/if.h>
-#include <netinet/in.h>
 #include <netinet/if_ether.h>
 
 #include <err.h>
diff --git a/usr.sbin/vmd/loadfile_elf.c b/usr.sbin/vmd/loadfile_elf.c
index d03384611ab..44578830e3b 100644
--- a/usr.sbin/vmd/loadfile_elf.c
+++ b/usr.sbin/vmd/loadfile_elf.c
@@ -1,5 +1,5 @@
 /* $NetBSD: loadfile.c,v 1.10 2000/12/03 02:53:04 tsutsui Exp $ */
-/* $OpenBSD: loadfile_elf.c,v 1.45 2022/12/28 21:30:19 jmc Exp $ */
+/* $OpenBSD: loadfile_elf.c,v 1.46 2023/04/19 12:58:16 jsg Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -94,7 +94,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <err.h>
-#include <errno.h>
 #include <stddef.h>
 
 #include <machine/vmmvar.h>
diff --git a/usr.sbin/vmd/vmd.c b/usr.sbin/vmd/vmd.c
index 38b8ad46bf5..97209bf1c8a 100644
--- a/usr.sbin/vmd/vmd.c
+++ b/usr.sbin/vmd/vmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmd.c,v 1.140 2023/04/16 12:47:26 dv Exp $	*/
+/*	$OpenBSD: vmd.c,v 1.141 2023/04/19 12:58:16 jsg Exp $	*/
 
 /*
  * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -38,7 +38,6 @@
 #include <unistd.h>
 #include <util.h>
 #include <ctype.h>
-#include <pwd.h>
 #include <grp.h>
 
 #include <machine/specialreg.h>
-- 
2.20.1