From 7426d5d9f11d81a7d781a7568167f4e6deed3928 Mon Sep 17 00:00:00 2001
From: yasuoka <yasuoka@openbsd.org>
Date: Sat, 8 Jul 2023 08:53:26 +0000
Subject: [PATCH] Tidy up #include lines.

---
 lib/libradius/radius.c          |  9 ++++-----
 lib/libradius/radius.h          | 10 +++++++---
 lib/libradius/radius_attr.c     |  9 ++++-----
 lib/libradius/radius_eapmsk.c   | 12 ++----------
 lib/libradius/radius_userpass.c |  8 +-------
 5 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/lib/libradius/radius.c b/lib/libradius/radius.c
index 3dd955952f9..f1a20cc5c0a 100644
--- a/lib/libradius/radius.c
+++ b/lib/libradius/radius.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radius.c,v 1.3 2015/08/20 21:51:42 deraadt Exp $ */
+/*	$OpenBSD: radius.c,v 1.4 2023/07/08 08:53:26 yasuoka Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -26,12 +26,11 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-
 #include <sys/uio.h>
-#include <stdbool.h>
+#include <arpa/inet.h>
+
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libradius/radius.h b/lib/libradius/radius.h
index 98c5ee61fe9..1bfcd3d7d6c 100644
--- a/lib/libradius/radius.h
+++ b/lib/libradius/radius.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radius.h,v 1.1 2015/07/20 23:52:29 yasuoka Exp $ */
+/*	$OpenBSD: radius.h,v 1.2 2023/07/08 08:53:26 yasuoka Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -313,10 +313,14 @@
 #define RADIUS_TUNNEL_MEDIUM_TYPE_E163		7	/* E.163 (POTS) */
 #define RADIUS_TUNNEL_MEDIUM_TYPE_E164		8	/* E.164 (SMDS, Frame
 							 * Relay, ATM) */
+#include <sys/socket.h>
+#include <sys/cdefs.h>
 
+#include <stdbool.h>
+#include <stdint.h>
 
-
-#include <sys/cdefs.h>
+struct in_addr;
+struct in6_addr;
 
 __BEGIN_DECLS
 
diff --git a/lib/libradius/radius_attr.c b/lib/libradius/radius_attr.c
index e07985ed98b..1a994700dfd 100644
--- a/lib/libradius/radius_attr.c
+++ b/lib/libradius/radius_attr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radius_attr.c,v 1.1 2015/07/20 23:52:29 yasuoka Exp $ */
+/*	$OpenBSD: radius_attr.c,v 1.2 2023/07/08 08:53:26 yasuoka Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -26,14 +26,13 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
-#include <md5.h>
+#include <endian.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "radius.h"
diff --git a/lib/libradius/radius_eapmsk.c b/lib/libradius/radius_eapmsk.c
index 0cb69ddaee4..95fe0f775e1 100644
--- a/lib/libradius/radius_eapmsk.c
+++ b/lib/libradius/radius_eapmsk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radius_eapmsk.c,v 1.1 2015/07/20 23:52:29 yasuoka Exp $ */
+/*	$OpenBSD: radius_eapmsk.c,v 1.2 2023/07/08 08:53:26 yasuoka Exp $ */
 
 /*-
  * Copyright (c) 2013 Internet Initiative Japan Inc.
@@ -26,17 +26,9 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 
-#include <openssl/md5.h>
-
 #include "radius.h"
 
 #include "radius_local.h"
diff --git a/lib/libradius/radius_userpass.c b/lib/libradius/radius_userpass.c
index 08bbc3d1a71..79c9498213d 100644
--- a/lib/libradius/radius_userpass.c
+++ b/lib/libradius/radius_userpass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radius_userpass.c,v 1.1 2015/07/20 23:52:29 yasuoka Exp $ */
+/*	$OpenBSD: radius_userpass.c,v 1.2 2023/07/08 08:53:26 yasuoka Exp $ */
 
 /*-
  * Copyright (c) 2013 Internet Initiative Japan Inc.
@@ -26,13 +26,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <stdbool.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <openssl/md5.h>
-- 
2.20.1