From 805f91d44721747224f8704ea6950a5290ac5a0b Mon Sep 17 00:00:00 2001
From: Simon Schubert <corecode@dragonflybsd.org>
Date: Mon, 19 May 2008 10:19:49 +0000
Subject: [PATCH] Don't #include <sys/select.h> from sys/types.h, to conform to
 SUS.

Some old BSD programs assume that sys/types.h is basically enough
to get all types and even functions declared, so adjust these.
sys/param.h still works as kitchensink and includes sys/select.h.
---
 include/rpc/svc.h                        |  3 ++-
 lib/libbind/port_before.h                |  3 ++-
 sbin/diskinfo/diskinfo.c                 |  4 ++--
 sys/emulation/linux/i386/linux_proto.h   |  6 +++++-
 sys/emulation/linux/i386/linux_syscall.h |  2 +-
 sys/emulation/linux/i386/linux_sysent.c  |  2 +-
 sys/emulation/linux/i386/linux_union.h   |  2 +-
 sys/kern/init_sysent.c                   |  4 ++--
 sys/kern/makesyscalls.sh                 |  3 ++-
 sys/kern/syscalls.c                      |  4 ++--
 sys/sys/param.h                          |  3 ++-
 sys/sys/syscall-hide.h                   |  4 ++--
 sys/sys/syscall.h                        |  4 ++--
 sys/sys/syscall.mk                       |  4 ++--
 sys/sys/sysproto.h                       |  6 ++++--
 sys/sys/sysunion.h                       |  4 ++--
 sys/sys/types.h                          | 10 +++-------
 usr.bin/window/wwiomux.c                 |  3 ++-
 usr.sbin/ppp/acf.c                       |  3 ++-
 usr.sbin/ppp/async.c                     |  3 ++-
 usr.sbin/ppp/iplist.c                    |  3 ++-
 usr.sbin/ppp/link.c                      |  3 ++-
 usr.sbin/ppp/log.c                       |  3 ++-
 usr.sbin/ppp/mbuf.c                      |  3 ++-
 usr.sbin/ppp/ncpaddr.c                   |  3 ++-
 usr.sbin/ppp/pred.c                      |  3 ++-
 usr.sbin/ppp/proto.c                     |  3 ++-
 usr.sbin/ppp/sync.c                      |  3 ++-
 usr.sbin/ppp/throughput.c                |  3 ++-
 usr.sbin/ppp/timer.c                     |  4 +++-
 usr.sbin/sdpd/scr.c                      |  3 ++-
 usr.sbin/sdpd/ssar.c                     |  3 ++-
 usr.sbin/sdpd/sur.c                      |  3 ++-
 33 files changed, 70 insertions(+), 47 deletions(-)

diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 39f3695f56..d5aa807c5d 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -29,7 +29,7 @@
  *	from: @(#)svc.h 1.20 88/02/08 SMI
  *	from: @(#)svc.h	2.2 88/07/29 4.0 RPCSRC
  * $FreeBSD: src/include/rpc/svc.h,v 1.16 1999/12/29 05:00:43 peter Exp $
- * $DragonFly: src/include/rpc/svc.h,v 1.3 2003/11/14 01:01:50 dillon Exp $
+ * $DragonFly: src/include/rpc/svc.h,v 1.4 2008/05/19 10:19:49 corecode Exp $
  */
 
 /*
@@ -41,6 +41,7 @@
 #ifndef _RPC_SVC_H
 #define _RPC_SVC_H
 #include <sys/cdefs.h>
+#include <sys/select.h>
 
 /*
  * This interface must manage two items concerning remote procedure calling:
diff --git a/lib/libbind/port_before.h b/lib/libbind/port_before.h
index 1b9dc4b168..b28d17bf8a 100644
--- a/lib/libbind/port_before.h
+++ b/lib/libbind/port_before.h
@@ -1,4 +1,4 @@
-/* $DragonFly: src/lib/libbind/port_before.h,v 1.2 2006/09/20 21:48:39 victor Exp $ */
+/* $DragonFly: src/lib/libbind/port_before.h,v 1.3 2008/05/19 10:19:49 corecode Exp $ */
 #ifndef port_before_h
 #define port_before_h
 #include <config.h>
@@ -12,6 +12,7 @@ struct timezone;        /* silence warning */
 #include <sys/timers.h>
 #endif
 #include <limits.h>
+#include <sys/select.h>
 
 
 #undef WANT_IRS_GR
diff --git a/sbin/diskinfo/diskinfo.c b/sbin/diskinfo/diskinfo.c
index ec2964eece..72ea2af736 100644
--- a/sbin/diskinfo/diskinfo.c
+++ b/sbin/diskinfo/diskinfo.c
@@ -31,11 +31,11 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $DragonFly: src/sbin/diskinfo/diskinfo.c,v 1.6 2007/06/27 18:15:57 dillon Exp $
+ * $DragonFly: src/sbin/diskinfo/diskinfo.c,v 1.7 2008/05/19 10:19:49 corecode Exp $
  */
 
 #define DKTYPENAMES
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/fcntl.h>
 #include <sys/dtype.h>
 #include <sys/diskslice.h>
diff --git a/sys/emulation/linux/i386/linux_proto.h b/sys/emulation/linux/i386/linux_proto.h
index e01b62a57f..de9deacbcc 100644
--- a/sys/emulation/linux/i386/linux_proto.h
+++ b/sys/emulation/linux/i386/linux_proto.h
@@ -2,13 +2,15 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $DragonFly: src/sys/emulation/linux/i386/linux_proto.h,v 1.18 2006/06/13 08:12:03 dillon Exp $
+ * $DragonFly: src/sys/emulation/linux/i386/linux_proto.h,v 1.19 2008/05/19 10:19:49 corecode Exp $
  * created from DragonFly: src/sys/emulation/linux/i386/syscalls.master,v 1.9 2006/06/05 07:26:10 dillon Exp 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
 #define	_LINUX_SYSPROTO_H_
 
+#include <sys/select.h>
+
 #include <sys/signal.h>
 
 #include <sys/acl.h>
@@ -17,6 +19,8 @@
 
 #include <sys/sysmsg.h>
 
+#include <sys/syslink.h>
+
 #define	PAD_(t)	(sizeof(register_t) <= sizeof(t) ? \
 		0 : sizeof(register_t) - sizeof(t))
 
diff --git a/sys/emulation/linux/i386/linux_syscall.h b/sys/emulation/linux/i386/linux_syscall.h
index 76d35f079e..885760fdb8 100644
--- a/sys/emulation/linux/i386/linux_syscall.h
+++ b/sys/emulation/linux/i386/linux_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $DragonFly: src/sys/emulation/linux/i386/linux_syscall.h,v 1.18 2006/06/13 08:12:03 dillon Exp $
+ * $DragonFly: src/sys/emulation/linux/i386/linux_syscall.h,v 1.19 2008/05/19 10:19:49 corecode Exp $
  * created from DragonFly: src/sys/emulation/linux/i386/syscalls.master,v 1.9 2006/06/05 07:26:10 dillon Exp 
  */
 
diff --git a/sys/emulation/linux/i386/linux_sysent.c b/sys/emulation/linux/i386/linux_sysent.c
index 3abac554bd..5cee595d57 100644
--- a/sys/emulation/linux/i386/linux_sysent.c
+++ b/sys/emulation/linux/i386/linux_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $DragonFly: src/sys/emulation/linux/i386/linux_sysent.c,v 1.18 2006/06/13 08:12:03 dillon Exp $
+ * $DragonFly: src/sys/emulation/linux/i386/linux_sysent.c,v 1.19 2008/05/19 10:19:49 corecode Exp $
  * created from DragonFly: src/sys/emulation/linux/i386/syscalls.master,v 1.9 2006/06/05 07:26:10 dillon Exp 
  */
 
diff --git a/sys/emulation/linux/i386/linux_union.h b/sys/emulation/linux/i386/linux_union.h
index e8ce7ddcce..5a8df8d2dc 100644
--- a/sys/emulation/linux/i386/linux_union.h
+++ b/sys/emulation/linux/i386/linux_union.h
@@ -2,7 +2,7 @@
  * Union of syscall args for messaging.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $DragonFly: src/sys/emulation/linux/i386/linux_union.h,v 1.14 2006/06/13 08:12:03 dillon Exp $
+ * $DragonFly: src/sys/emulation/linux/i386/linux_union.h,v 1.15 2008/05/19 10:19:49 corecode Exp $
  * created from DragonFly: src/sys/emulation/linux/i386/syscalls.master,v 1.9 2006/06/05 07:26:10 dillon Exp 
  */
 
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 8ff3959ed8..3179b1604f 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -2,8 +2,8 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $DragonFly: src/sys/kern/init_sysent.c,v 1.59 2008/01/10 22:30:27 nth Exp $
- * created from DragonFly: src/sys/kern/syscalls.master,v 1.56 2007/06/16 20:00:37 dillon Exp 
+ * $DragonFly: src/sys/kern/init_sysent.c,v 1.60 2008/05/19 10:19:49 corecode Exp $
+ * created from DragonFly: src/sys/kern/syscalls.master,v 1.57 2008/01/10 22:30:27 nth Exp 
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index c8f3bdcc21..507676930f 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -1,7 +1,7 @@
 #! /bin/sh -
 #	@(#)makesyscalls.sh	8.1 (Berkeley) 6/10/93
 # $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.39.2.4 2001/10/20 09:01:24 marcel Exp $
-# $DragonFly: src/sys/kern/makesyscalls.sh,v 1.16 2006/08/06 18:56:44 dillon Exp $
+# $DragonFly: src/sys/kern/makesyscalls.sh,v 1.17 2008/05/19 10:19:49 corecode Exp $
 
 set -e
 
@@ -130,6 +130,7 @@ s/\$//g
 		printf " * created from%s\n */\n\n", $0 > sysarg
 		printf "#ifndef %s\n", sysproto_h > sysarg
 		printf "#define\t%s\n\n", sysproto_h > sysarg
+		printf "#include <sys/select.h>\n\n" > sysarg
 		printf "#include <sys/signal.h>\n\n" > sysarg
 		printf "#include <sys/acl.h>\n\n" > sysarg
 		printf "#include <sys/msgport.h>\n\n" > sysarg
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 8e4d4cbc82..c8f3e94be8 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -2,8 +2,8 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $DragonFly: src/sys/kern/syscalls.c,v 1.58 2008/01/10 22:30:27 nth Exp $
- * created from DragonFly: src/sys/kern/syscalls.master,v 1.56 2007/06/16 20:00:37 dillon Exp 
+ * $DragonFly: src/sys/kern/syscalls.c,v 1.59 2008/05/19 10:19:49 corecode Exp $
+ * created from DragonFly: src/sys/kern/syscalls.master,v 1.57 2008/01/10 22:30:27 nth Exp 
  */
 
 char *syscallnames[] = {
diff --git a/sys/sys/param.h b/sys/sys/param.h
index d9ef30e7ce..1e421a072b 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -37,7 +37,7 @@
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
  * $FreeBSD: src/sys/sys/param.h,v 1.61.2.38 2003/05/22 17:12:01 fjoe Exp $
- * $DragonFly: src/sys/sys/param.h,v 1.47 2008/05/07 17:26:28 dillon Exp $
+ * $DragonFly: src/sys/sys/param.h,v 1.48 2008/05/19 10:19:49 corecode Exp $
  */
 
 #ifndef _SYS_PARAM_H_
@@ -111,6 +111,7 @@
 
 #ifndef _KERNEL
 /* Signals. */
+#include <sys/select.h>
 #include <sys/signal.h>
 #endif
 
diff --git a/sys/sys/syscall-hide.h b/sys/sys/syscall-hide.h
index c25f0e52ca..b5be50f9d1 100644
--- a/sys/sys/syscall-hide.h
+++ b/sys/sys/syscall-hide.h
@@ -2,8 +2,8 @@
  * System call hiders.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $DragonFly: src/sys/sys/syscall-hide.h,v 1.59 2008/01/10 22:30:28 nth Exp $
- * created from DragonFly: src/sys/kern/syscalls.master,v 1.56 2007/06/16 20:00:37 dillon Exp 
+ * $DragonFly: src/sys/sys/syscall-hide.h,v 1.60 2008/05/19 10:19:49 corecode Exp $
+ * created from DragonFly: src/sys/kern/syscalls.master,v 1.57 2008/01/10 22:30:27 nth Exp 
  */
 
 #ifdef COMPAT_43
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 7cf96ad749..5afb6b935b 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -2,8 +2,8 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $DragonFly: src/sys/sys/syscall.h,v 1.59 2008/01/10 22:30:28 nth Exp $
- * created from DragonFly: src/sys/kern/syscalls.master,v 1.56 2007/06/16 20:00:37 dillon Exp 
+ * $DragonFly: src/sys/sys/syscall.h,v 1.60 2008/05/19 10:19:49 corecode Exp $
+ * created from DragonFly: src/sys/kern/syscalls.master,v 1.57 2008/01/10 22:30:27 nth Exp 
  */
 
 #define	SYS_syscall	0
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index 58c33ad6b6..3b968a9e6b 100644
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -1,7 +1,7 @@
 # DragonFly system call names.
 # DO NOT EDIT-- this file is automatically generated.
-# $DragonFly: src/sys/sys/syscall.mk,v 1.59 2008/01/10 22:30:28 nth Exp $
-# created from DragonFly: src/sys/kern/syscalls.master,v 1.56 2007/06/16 20:00:37 dillon Exp 
+# $DragonFly: src/sys/sys/syscall.mk,v 1.60 2008/05/19 10:19:49 corecode Exp $
+# created from DragonFly: src/sys/kern/syscalls.master,v 1.57 2008/01/10 22:30:27 nth Exp 
 MIASM =  \
 	syscall.o \
 	exit.o \
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index ce8498bad9..6d76085056 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -2,13 +2,15 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $DragonFly: src/sys/sys/sysproto.h,v 1.59 2008/01/10 22:30:28 nth Exp $
- * created from DragonFly: src/sys/kern/syscalls.master,v 1.56 2007/06/16 20:00:37 dillon Exp 
+ * $DragonFly: src/sys/sys/sysproto.h,v 1.60 2008/05/19 10:19:49 corecode Exp $
+ * created from DragonFly: src/sys/kern/syscalls.master,v 1.57 2008/01/10 22:30:27 nth Exp 
  */
 
 #ifndef _SYS_SYSPROTO_H_
 #define	_SYS_SYSPROTO_H_
 
+#include <sys/select.h>
+
 #include <sys/signal.h>
 
 #include <sys/acl.h>
diff --git a/sys/sys/sysunion.h b/sys/sys/sysunion.h
index c2bc81ae63..5455f580fd 100644
--- a/sys/sys/sysunion.h
+++ b/sys/sys/sysunion.h
@@ -2,8 +2,8 @@
  * Union of syscall args for messaging.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $DragonFly: src/sys/sys/sysunion.h,v 1.56 2008/01/10 22:30:28 nth Exp $
- * created from DragonFly: src/sys/kern/syscalls.master,v 1.56 2007/06/16 20:00:37 dillon Exp 
+ * $DragonFly: src/sys/sys/sysunion.h,v 1.57 2008/05/19 10:19:49 corecode Exp $
+ * created from DragonFly: src/sys/kern/syscalls.master,v 1.57 2008/01/10 22:30:27 nth Exp 
  */
 
 union sysunion {
diff --git a/sys/sys/types.h b/sys/sys/types.h
index 164d879c31..3eec97d55f 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -37,7 +37,7 @@
  *
  *	@(#)types.h	8.6 (Berkeley) 2/19/95
  * $FreeBSD: src/sys/sys/types.h,v 1.40.2.2 2001/04/21 14:53:06 ume Exp $
- * $DragonFly: src/sys/sys/types.h,v 1.19 2008/05/11 03:39:49 hasso Exp $
+ * $DragonFly: src/sys/sys/types.h,v 1.20 2008/05/19 10:19:49 corecode Exp $
  */
 
 #ifndef _SYS_TYPES_H_
@@ -194,11 +194,7 @@ typedef __time_t	time_t;
 typedef __timer_t	timer_t;
 #endif
 
-#ifndef _SYS_SELECT_H_
-#include <sys/select.h>
-#endif
-
-#ifndef _POSIX_SOURCE
+#ifdef __BSD_VISIBLE
 
 #define NBBY 8		/* number of bits in a byte */
 /*
@@ -227,6 +223,6 @@ int	 truncate (const char *, off_t);
 __END_DECLS
 #endif /* !_KERNEL */
 
-#endif /* !_POSIX_SOURCE */
+#endif /* __BSD_VISIBLE */
 
 #endif /* !_SYS_TYPES_H_ */
diff --git a/usr.bin/window/wwiomux.c b/usr.bin/window/wwiomux.c
index f4eee68201..baf9e940f0 100644
--- a/usr.bin/window/wwiomux.c
+++ b/usr.bin/window/wwiomux.c
@@ -35,12 +35,13 @@
  *
  * @(#)wwiomux.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/window/wwiomux.c,v 1.1.1.1.14.1 2001/05/17 09:45:01 obrien Exp $
- * $DragonFly: src/usr.bin/window/wwiomux.c,v 1.2 2003/06/17 04:29:34 dillon Exp $
+ * $DragonFly: src/usr.bin/window/wwiomux.c,v 1.3 2008/05/19 10:19:49 corecode Exp $
  */
 
 #include "ww.h"
 #include <sys/time.h>
 #include <sys/types.h>
+#include <sys/select.h>
 #if !defined(OLD_TTY) && !defined(TIOCPKT_DATA)
 #include <sys/ioctl.h>
 #endif
diff --git a/usr.sbin/ppp/acf.c b/usr.sbin/ppp/acf.c
index b257046c09..a59b56b977 100644
--- a/usr.sbin/ppp/acf.c
+++ b/usr.sbin/ppp/acf.c
@@ -24,10 +24,11 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/acf.c,v 1.4.2.1 2000/08/19 09:29:59 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/acf.c,v 1.2 2003/06/17 04:30:00 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/acf.c,v 1.3 2008/05/19 10:19:49 corecode Exp $
  */
 
 #include <sys/types.h>
+#include <sys/select.h>
 
 #include <stdio.h>
 #include <termios.h>
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index 40ae7e4c28..2edc5824f3 100644
--- a/usr.sbin/ppp/async.c
+++ b/usr.sbin/ppp/async.c
@@ -26,10 +26,11 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/async.c,v 1.23.2.3 2002/09/01 02:12:22 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/async.c,v 1.2 2003/06/17 04:30:00 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/async.c,v 1.3 2008/05/19 10:19:49 corecode Exp $
  */
 
 #include <sys/types.h>
+#include <sys/select.h>
 
 #include <string.h>
 #include <termios.h>
diff --git a/usr.sbin/ppp/iplist.c b/usr.sbin/ppp/iplist.c
index 457eb9ea0f..f92b24cb43 100644
--- a/usr.sbin/ppp/iplist.c
+++ b/usr.sbin/ppp/iplist.c
@@ -24,10 +24,11 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/iplist.c,v 1.9 1999/08/28 01:18:31 peter Exp $
- * $DragonFly: src/usr.sbin/ppp/iplist.c,v 1.2 2003/06/17 04:30:00 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/iplist.c,v 1.3 2008/05/19 10:19:49 corecode Exp $
  */
 
 #include <sys/types.h>
+#include <sys/select.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
diff --git a/usr.sbin/ppp/link.c b/usr.sbin/ppp/link.c
index 1f8476de2f..27298d2753 100644
--- a/usr.sbin/ppp/link.c
+++ b/usr.sbin/ppp/link.c
@@ -24,11 +24,12 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/link.c,v 1.16.2.2 2002/09/01 02:12:28 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/link.c,v 1.2 2003/06/17 04:30:00 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/link.c,v 1.3 2008/05/19 10:19:49 corecode Exp $
  *
  */
 
 #include <sys/types.h>
+#include <sys/select.h>
 #include <netinet/in_systm.h>
 #include <sys/socket.h>
 #include <sys/un.h>
diff --git a/usr.sbin/ppp/log.c b/usr.sbin/ppp/log.c
index a0f6a32f32..7d6433df70 100644
--- a/usr.sbin/ppp/log.c
+++ b/usr.sbin/ppp/log.c
@@ -24,10 +24,11 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/log.c,v 1.44.2.5 2002/09/01 02:12:28 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/log.c,v 1.3 2005/11/24 23:42:54 swildner Exp $
+ * $DragonFly: src/usr.sbin/ppp/log.c,v 1.4 2008/05/19 10:19:49 corecode Exp $
  */
 
 #include <sys/types.h>
+#include <sys/select.h>
 
 #include <ctype.h>
 #include <stdarg.h>
diff --git a/usr.sbin/ppp/mbuf.c b/usr.sbin/ppp/mbuf.c
index 71ba0c497c..fe4f1f3f45 100644
--- a/usr.sbin/ppp/mbuf.c
+++ b/usr.sbin/ppp/mbuf.c
@@ -26,10 +26,11 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/mbuf.c,v 1.36.2.5 2002/09/01 02:12:28 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/mbuf.c,v 1.2 2003/06/17 04:30:00 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/mbuf.c,v 1.3 2008/05/19 10:19:49 corecode Exp $
  */
 
 #include <sys/types.h>
+#include <sys/select.h>
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/usr.sbin/ppp/ncpaddr.c b/usr.sbin/ppp/ncpaddr.c
index ae58f95124..0687d8f30e 100644
--- a/usr.sbin/ppp/ncpaddr.c
+++ b/usr.sbin/ppp/ncpaddr.c
@@ -24,10 +24,11 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/ncpaddr.c,v 1.10.2.3 2003/04/29 16:05:55 ume Exp $
- * $DragonFly: src/usr.sbin/ppp/ncpaddr.c,v 1.3 2006/01/17 23:49:16 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/ncpaddr.c,v 1.4 2008/05/19 10:19:49 corecode Exp $
  */
 
 #include <sys/types.h>
+#include <sys/select.h>
 #include <sys/socket.h>
 #ifdef __OpenBSD__
 #include <net/if_types.h>
diff --git a/usr.sbin/ppp/pred.c b/usr.sbin/ppp/pred.c
index 56a5333b34..aa135f8790 100644
--- a/usr.sbin/ppp/pred.c
+++ b/usr.sbin/ppp/pred.c
@@ -27,10 +27,11 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/pred.c,v 1.29.2.3 2002/09/01 02:12:31 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/pred.c,v 1.2 2003/06/17 04:30:01 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/pred.c,v 1.3 2008/05/19 10:19:49 corecode Exp $
  */
 
 #include <sys/types.h>
+#include <sys/select.h>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ppp/proto.c b/usr.sbin/ppp/proto.c
index 111f7f62eb..f3445253f8 100644
--- a/usr.sbin/ppp/proto.c
+++ b/usr.sbin/ppp/proto.c
@@ -24,10 +24,11 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/proto.c,v 1.5.2.1 2000/08/19 09:30:08 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/proto.c,v 1.2 2003/06/17 04:30:01 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/proto.c,v 1.3 2008/05/19 10:19:49 corecode Exp $
  */
 
 #include <sys/types.h>
+#include <sys/select.h>
 
 #include <stdio.h>
 #include <termios.h>
diff --git a/usr.sbin/ppp/sync.c b/usr.sbin/ppp/sync.c
index 169595dc53..0354d9fc59 100644
--- a/usr.sbin/ppp/sync.c
+++ b/usr.sbin/ppp/sync.c
@@ -24,10 +24,11 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/sync.c,v 1.6 1999/12/20 20:29:47 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/sync.c,v 1.2 2003/06/17 04:30:01 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/sync.c,v 1.3 2008/05/19 10:19:49 corecode Exp $
  */
 
 #include <sys/types.h>
+#include <sys/select.h>
 
 #include <stdio.h>
 #include <termios.h>
diff --git a/usr.sbin/ppp/throughput.c b/usr.sbin/ppp/throughput.c
index 1a0340f22e..dac8311be1 100644
--- a/usr.sbin/ppp/throughput.c
+++ b/usr.sbin/ppp/throughput.c
@@ -24,10 +24,11 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/throughput.c,v 1.13.2.3 2002/09/01 02:12:32 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/throughput.c,v 1.2 2003/06/17 04:30:01 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/throughput.c,v 1.3 2008/05/19 10:19:49 corecode Exp $
  */
 
 #include <sys/types.h>
+#include <sys/select.h>
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c
index 7f279c34ee..555bc3193c 100644
--- a/usr.sbin/ppp/timer.c
+++ b/usr.sbin/ppp/timer.c
@@ -26,9 +26,11 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/ppp/timer.c,v 1.38.2.3 2002/09/01 02:12:32 brian Exp $
- * $DragonFly: src/usr.sbin/ppp/timer.c,v 1.2 2003/06/17 04:30:01 dillon Exp $
+ * $DragonFly: src/usr.sbin/ppp/timer.c,v 1.3 2008/05/19 10:19:49 corecode Exp $
  */
 
+#include <sys/select.h>
+
 #include <errno.h>
 #include <signal.h>
 #include <stdarg.h>
diff --git a/usr.sbin/sdpd/scr.c b/usr.sbin/sdpd/scr.c
index df19fff73a..4ad9031c0a 100644
--- a/usr.sbin/sdpd/scr.c
+++ b/usr.sbin/sdpd/scr.c
@@ -1,5 +1,5 @@
 /* $NetBSD: scr.c,v 1.1 2006/06/19 15:44:56 gdamore Exp $ */
-/* $DragonFly: src/usr.sbin/sdpd/scr.c,v 1.1 2008/01/06 21:51:30 hasso Exp $ */
+/* $DragonFly: src/usr.sbin/sdpd/scr.c,v 1.2 2008/05/19 10:19:49 corecode Exp $ */
 
 /*
  * scr.c
@@ -33,6 +33,7 @@
  */
 
 #include <sys/queue.h>
+#include <sys/select.h>
 #include <bluetooth.h>
 #include <errno.h>
 #include <sdp.h>
diff --git a/usr.sbin/sdpd/ssar.c b/usr.sbin/sdpd/ssar.c
index 9d3227f9ec..443f23a65a 100644
--- a/usr.sbin/sdpd/ssar.c
+++ b/usr.sbin/sdpd/ssar.c
@@ -1,5 +1,5 @@
 /* $NetBSD: ssar.c,v 1.2 2007/11/09 20:08:41 plunky Exp $ */
-/* $DragonFly: src/usr.sbin/sdpd/ssar.c,v 1.1 2008/01/06 21:51:30 hasso Exp $ */
+/* $DragonFly: src/usr.sbin/sdpd/ssar.c,v 1.2 2008/05/19 10:19:49 corecode Exp $ */
 
 /*
  * ssar.c
@@ -33,6 +33,7 @@
  */
 
 #include <sys/queue.h>
+#include <sys/select.h>
 #include <bluetooth.h>
 #include <sdp.h>
 #include <string.h>
diff --git a/usr.sbin/sdpd/sur.c b/usr.sbin/sdpd/sur.c
index 1b76ebaa7b..1d18660c6f 100644
--- a/usr.sbin/sdpd/sur.c
+++ b/usr.sbin/sdpd/sur.c
@@ -1,5 +1,5 @@
 /* $NetBSD: sur.c,v 1.1 2006/06/19 15:44:56 gdamore Exp $ */
-/* $DragonFly: src/usr.sbin/sdpd/sur.c,v 1.1 2008/01/06 21:51:30 hasso Exp $ */
+/* $DragonFly: src/usr.sbin/sdpd/sur.c,v 1.2 2008/05/19 10:19:49 corecode Exp $ */
 
 /*
  * sur.c
@@ -33,6 +33,7 @@
  */
 
 #include <sys/queue.h>
+#include <sys/select.h>
 #include <bluetooth.h>
 #include <errno.h>
 #include <sdp.h>
-- 
2.41.0