From 512d3b83ff548614a90047a1811a8a5199e3a057 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Fri, 3 Sep 2021 08:18:31 +0000
Subject: [PATCH] sigh -- review one one pointless sys/param.h, and discover
 all the includes are a mess.

---
 usr.sbin/pppd/sys-bsd.c | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c
index 4668c3ce6e4..456432762bb 100644
--- a/usr.sbin/pppd/sys-bsd.c
+++ b/usr.sbin/pppd/sys-bsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys-bsd.c,v 1.30 2020/12/29 19:45:28 benno Exp $	*/
+/*	$OpenBSD: sys-bsd.c,v 1.31 2021/09/03 08:18:31 deraadt Exp $	*/
 
 /*
  * sys-bsd.c - System-dependent procedures for setting up
@@ -78,6 +78,12 @@
  * TODO:
  */
 
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
@@ -89,11 +95,6 @@
 #include <termios.h>
 #include <signal.h>
 #include <util.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/stat.h>
 #include <ifaddrs.h>
 
 #ifdef PPP_FILTER
@@ -105,19 +106,7 @@
 #include <net/route.h>
 #include <net/if_dl.h>
 #include <netinet/in.h>
-
-#if RTM_VERSION >= 3
-#include <sys/param.h>
-#if defined(NetBSD) && (NetBSD >= 199703)
-#include <netinet/if_inarp.h>
-#else	/* NetBSD 1.2D or later */
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <netinet/if_ether.h>
-#else
-#include <net/if_ether.h>
-#endif
-#endif
-#endif
 
 #include "pppd.h"
 #include "fsm.h"
-- 
2.20.1