From 0e1de0b3c7b190c1f5148e169aef1f0a8a690074 Mon Sep 17 00:00:00 2001
From: florian <florian@openbsd.org>
Date: Tue, 31 Aug 2021 18:12:47 +0000
Subject: [PATCH] Make includes follow style(9).

---
 usr.sbin/traceroute/traceroute.c | 25 +++++++++++++------------
 usr.sbin/traceroute/traceroute.h |  5 ++---
 usr.sbin/traceroute/worker.c     | 26 ++++++++++++++------------
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c
index 37a064688d5..21ee76dba1c 100644
--- a/usr.sbin/traceroute/traceroute.c
+++ b/usr.sbin/traceroute/traceroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: traceroute.c,v 1.166 2021/08/28 19:59:49 sthen Exp $	*/
+/*	$OpenBSD: traceroute.c,v 1.167 2021/08/31 18:12:47 florian Exp $	*/
 /*	$NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $	*/
 
 /*
@@ -233,27 +233,28 @@
  *     Tue Dec 20 03:50:13 PST 1988
  */
 
+#include <sys/socket.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/uio.h>
 
-#include <arpa/inet.h>
-#include <endian.h>
-#include <err.h>
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <netinet/icmp6.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
 #include <netinet/ip_icmp.h>
+#include <netinet/icmp6.h>
 #include <netinet/udp.h>
+
+#include <arpa/inet.h>
+
+#include <err.h>
+#include <errno.h>
+#include <limits.h>
+#include <netdb.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#include <sys/uio.h>
 #include <unistd.h>
 
 #include "traceroute.h"
diff --git a/usr.sbin/traceroute/traceroute.h b/usr.sbin/traceroute/traceroute.h
index e8dd831359c..1704068d29c 100644
--- a/usr.sbin/traceroute/traceroute.h
+++ b/usr.sbin/traceroute/traceroute.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: traceroute.h,v 1.5 2017/05/28 10:06:13 benno Exp $	*/
+/*	$OpenBSD: traceroute.h,v 1.6 2021/08/31 18:12:47 florian Exp $	*/
 /*	$NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $	*/
 
 /*
@@ -62,11 +62,10 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/types.h>
 
 #include <netinet/ip_var.h>
 #include <netmpls/mpls.h>
-#include <sys/cdefs.h>
-#include <sys/types.h>
 
 #define DUMMY_PORT 10010
 
diff --git a/usr.sbin/traceroute/worker.c b/usr.sbin/traceroute/worker.c
index e56bf59dff1..7a6aef082c2 100644
--- a/usr.sbin/traceroute/worker.c
+++ b/usr.sbin/traceroute/worker.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: worker.c,v 1.6 2019/06/28 13:32:51 deraadt Exp $	*/
+/*	$OpenBSD: worker.c,v 1.7 2021/08/31 18:12:47 florian Exp $	*/
 /*	$NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $	*/
 
 /*
@@ -62,25 +62,27 @@
  * SUCH DAMAGE.
  */
 
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <endian.h>
-#include <err.h>
-#include <limits.h>
-#include <netdb.h>
-#include <netinet/icmp6.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/uio.h>
+
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
 #include <netinet/ip_icmp.h>
+#include <netinet/icmp6.h>
 #include <netinet/udp.h>
+
+#include <arpa/inet.h>
+#include <arpa/nameser.h>
+
+#include <err.h>
+#include <limits.h>
+#include <netdb.h>
 #include <poll.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
 #include <time.h>
 #include <unistd.h>
 
-- 
2.20.1