unwind(8) traces its ancestry to rad(8) and inherited all of its include

directives, some of them no longer necessary.
Cleanup by Caspar Schutijser, thank you very much!

5 files changed, 12 insertions, 45 deletions

diff --git a/sbin/unwind/control.c b/sbin/unwind/control.c
index a7a738c54ec..ccacdc0cc6e 100644
--- a/sbin/unwind/control.c
+++ b/sbin/unwind/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.1 2019/01/23 13:11:00 florian Exp $	*/
+/*	$OpenBSD: control.c,v 1.2 2019/01/27 07:46:49 florian Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -19,16 +19,12 @@
 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
-#include <sys/uio.h>
+#include <sys/time.h>
 #include <sys/un.h>
 
-#include <netinet/in.h>
-#include <net/if.h>
-
 #include <errno.h>
 #include <event.h>
 #include <imsg.h>
-#include <md5.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/sbin/unwind/frontend.c b/sbin/unwind/frontend.c
index 607f42f336d..4e2c3eb0277 100644
--- a/sbin/unwind/frontend.c
+++ b/sbin/unwind/frontend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frontend.c,v 1.3 2019/01/24 17:39:43 florian Exp $	*/
+/*	$OpenBSD: frontend.c,v 1.4 2019/01/27 07:46:49 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -20,38 +20,29 @@
  */
 
 #include <sys/types.h>
-#include <sys/ioctl.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/uio.h>
 
+#include <netinet/in.h>
 #include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
 #include <net/route.h>
 
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <ctype.h>
 #include <errno.h>
 #include <event.h>
-#include <ifaddrs.h>
 #include <imsg.h>
 #include <netdb.h>
 #include <pwd.h>
 #include <signal.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
-#include <assert.h>
 #include "libunbound/config.h"
-#include "libunbound/libunbound/unbound.h"
-#include "libunbound/unbound-event.h"
-#include "libunbound/sldns/rrdef.h"
 #include "libunbound/sldns/pkthdr.h"
 #include "libunbound/sldns/sbuffer.h"
 #include "libunbound/sldns/wire2str.h"
diff --git a/sbin/unwind/printconf.c b/sbin/unwind/printconf.c
index c5b8cfd147a..81e170f3b01 100644
--- a/sbin/unwind/printconf.c
+++ b/sbin/unwind/printconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printconf.c,v 1.1 2019/01/23 13:11:00 florian Exp $	*/
+/*	$OpenBSD: printconf.c,v 1.2 2019/01/27 07:46:49 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -17,15 +17,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
 #include <sys/queue.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <net/if.h>
-
-#include <arpa/inet.h>
 
 #include <event.h>
 #include <imsg.h>
diff --git a/sbin/unwind/resolver.c b/sbin/unwind/resolver.c
index 93dc08e2ff9..b030ca40022 100644
--- a/sbin/unwind/resolver.c
+++ b/sbin/unwind/resolver.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: resolver.c,v 1.9 2019/01/25 17:20:45 florian Exp $	*/
+/*	$OpenBSD: resolver.c,v 1.10 2019/01/27 07:46:49 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -23,16 +23,12 @@
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <net/if.h>
-#include <arpa/inet.h>
+#include <sys/time.h>
 
 #include <errno.h>
 #include <event.h>
-#include <netdb.h>
 #include <imsg.h>
+#include <limits.h>
 #include <pwd.h>
 #include <pthread.h>
 #include <signal.h>
@@ -42,13 +38,11 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <assert.h>
 #include "libunbound/config.h"
 #include "libunbound/libunbound/unbound.h"
-#include "libunbound/unbound-event.h"
+#include "libunbound/libunbound/unbound-event.h"
 #include "libunbound/sldns/rrdef.h"
 #include "libunbound/sldns/pkthdr.h"
-#include "libunbound/sldns/sbuffer.h"
 #include "libunbound/sldns/wire2str.h"
 
 #include <openssl/crypto.h>
diff --git a/sbin/unwind/unwind.c b/sbin/unwind/unwind.c
index 998da024970..84e0c6c9b9c 100644
--- a/sbin/unwind/unwind.c
+++ b/sbin/unwind/unwind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unwind.c,v 1.3 2019/01/25 08:06:15 florian Exp $	*/
+/*	$OpenBSD: unwind.c,v 1.4 2019/01/27 07:46:49 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -22,16 +22,10 @@
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
-#include <sys/uio.h>
 #include <sys/wait.h>
 
-#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>
 
 #include <err.h>
 #include <errno.h>