From 1cf78b6977a385a7bc2012c6349f7cda241972a8 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Wed, 15 May 2019 22:34:17 +0200
Subject: [PATCH] Don't include "internal" headers outside of regular headers.

Include files like <sys/_timespec.h> and so on contain small parts
such as struct timespec that are supposed to be provided by multiple
regular headers. They should only be included by other headers, not
by *.c files.

None of these was actually needed except for the libtelnet one
(replaced with <stddef.h>).
---
 lib/libtelnet/genget.c         | 2 +-
 sys/dev/drm/linux_vmalloc.c    | 1 -
 sys/emulation/ndis/subr_ndis.c | 1 -
 sys/libkern/strsep.c           | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/libtelnet/genget.c b/lib/libtelnet/genget.c
index 4d5b0bdf7b..01b5af759f 100644
--- a/lib/libtelnet/genget.c
+++ b/lib/libtelnet/genget.c
@@ -30,8 +30,8 @@
  * $FreeBSD: src/crypto/telnet/libtelnet/genget.c,v 1.2.8.2 2002/04/13 10:59:07 markm Exp $
  */
 
-#include <sys/_null.h>
 #include <ctype.h>
+#include <stddef.h>
 
 #include "misc-proto.h"
 
diff --git a/sys/dev/drm/linux_vmalloc.c b/sys/dev/drm/linux_vmalloc.c
index 1e84c2597d..9fb8710bac 100644
--- a/sys/dev/drm/linux_vmalloc.c
+++ b/sys/dev/drm/linux_vmalloc.c
@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/_null.h>
 #include <sys/queue.h>
 #include <vm/vm_extern.h>
 
diff --git a/sys/emulation/ndis/subr_ndis.c b/sys/emulation/ndis/subr_ndis.c
index 6682a6c587..6cfda2e2d9 100644
--- a/sys/emulation/ndis/subr_ndis.c
+++ b/sys/emulation/ndis/subr_ndis.c
@@ -60,7 +60,6 @@
 #include <sys/mutex.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
-#include <sys/_timespec.h>
 #include <sys/queue.h>
 #include <sys/proc.h>
 #include <sys/filedesc.h>
diff --git a/sys/libkern/strsep.c b/sys/libkern/strsep.c
index 83dc5e03a1..8956e89d4b 100644
--- a/sys/libkern/strsep.c
+++ b/sys/libkern/strsep.c
@@ -29,7 +29,6 @@
  */
 
 #include <sys/libkern.h>
-#include <sys/_null.h>
 
 char *
 strsep(char **stringp, const char *delim)
-- 
2.41.0