From d056b4791691895675342b2abe77a65087658bb1 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Fri, 5 Jan 2018 02:57:01 +0100
Subject: [PATCH] Clean up a bit for symlinked headers.

<errno.h> as well as <poll.h> are symlinked to their <sys/...>
counterparts, so there is no need to include both.

Also fix a comment that suggests that there is a difference.
---
 sys/kern/subr_sbuf.c                    | 3 +--
 sys/sys/poll.h                          | 4 ----
 usr.sbin/installer/libdfui/conn_npipe.c | 1 -
 usr.sbin/installer/libdfui/conn_tcp.c   | 1 -
 usr.sbin/rpcbind/rpcbind.c              | 1 -
 5 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c
index f590cbe717..17254e4fa9 100644
--- a/sys/kern/subr_sbuf.c
+++ b/sys/kern/subr_sbuf.c
@@ -29,10 +29,10 @@
  */
 
 #include <sys/param.h>
+#include <sys/errno.h>
 
 #ifdef _KERNEL
 #include <sys/ctype.h>
-#include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
@@ -40,7 +40,6 @@
 #include <machine/stdarg.h>
 #else /* _KERNEL */
 #include <ctype.h>
-#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sys/sys/poll.h b/sys/sys/poll.h
index 0618b0a1eb..46817f9695 100644
--- a/sys/sys/poll.h
+++ b/sys/sys/poll.h
@@ -96,10 +96,6 @@ struct pollfd {
 #endif
 
 __BEGIN_DECLS
-/*
- * XXX logically, poll() should be declared in <poll.h>, but SVR4 at
- * least has it here in <sys/poll.h>.
- */
 #if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE
 int	poll(struct pollfd *, nfds_t, int);
 #endif
diff --git a/usr.sbin/installer/libdfui/conn_npipe.c b/usr.sbin/installer/libdfui/conn_npipe.c
index 66960f405d..a9150f1a08 100644
--- a/usr.sbin/installer/libdfui/conn_npipe.c
+++ b/usr.sbin/installer/libdfui/conn_npipe.c
@@ -45,7 +45,6 @@
 #include <sys/errno.h>
 
 #include <err.h>
-#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/installer/libdfui/conn_tcp.c b/usr.sbin/installer/libdfui/conn_tcp.c
index 7096d3f6f2..2cd9ac726d 100644
--- a/usr.sbin/installer/libdfui/conn_tcp.c
+++ b/usr.sbin/installer/libdfui/conn_tcp.c
@@ -64,7 +64,6 @@
 #include <arpa/inet.h>
 
 #include <err.h>
-#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c
index 3bd7cbf51e..5628fc7232 100644
--- a/usr.sbin/rpcbind/rpcbind.c
+++ b/usr.sbin/rpcbind/rpcbind.c
@@ -65,7 +65,6 @@
 #include <libutil.h>
 #include <pwd.h>
 #include <string.h>
-#include <errno.h>
 #include "rpcbind.h"
 
 /* Global variables */
-- 
2.11.4.GIT