Userland programs should include <errno.h> not <sys/errno.h>

OK deraadt@

26 files changed, 59 insertions, 60 deletions

diff --git a/distrib/crunch/crunchide/crunchide.c b/distrib/crunch/crunchide/crunchide.c
index 04d3432bccb..a7ac080301d 100644
--- a/distrib/crunch/crunchide/crunchide.c
+++ b/distrib/crunch/crunchide/crunchide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crunchide.c,v 1.19 2004/08/24 09:12:49 jmc Exp $	 */
+/* $OpenBSD: crunchide.c,v 1.20 2005/12/21 01:40:22 millert Exp $	 */
 
 /*
  * Copyright (c) 1994 University of Maryland
@@ -62,10 +62,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <a.out.h>
 #include <sys/types.h>
-#include <sys/errno.h>
 #ifdef _NLIST_DO_ECOFF
 #include <sys/exec_ecoff.h>
 #endif
diff --git a/gnu/usr.bin/ld/rtld/rtld.c b/gnu/usr.bin/ld/rtld/rtld.c
index fd94cb7e372..e4ed556d508 100644
--- a/gnu/usr.bin/ld/rtld/rtld.c
+++ b/gnu/usr.bin/ld/rtld/rtld.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtld.c,v 1.40 2005/09/30 20:13:12 deraadt Exp $	*/
+/*	$OpenBSD: rtld.c,v 1.41 2005/12/21 01:40:22 millert Exp $	*/
 /*	$NetBSD: rtld.c,v 1.43 1996/01/14 00:35:17 pk Exp $	*/
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -37,12 +37,12 @@
 #include <sys/file.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include <sys/errno.h>
 #include <sys/mman.h>
 #ifndef MAP_COPY
 #define MAP_COPY	MAP_PRIVATE
 #endif
 #include <err.h>
+#include <errno.h>
 #include <dlfcn.h>
 #include <fcntl.h>
 #include <a.out.h>
diff --git a/gnu/usr.bin/ld/warnings.c b/gnu/usr.bin/ld/warnings.c
index 0b4dafaa28f..448a517d6ee 100644
--- a/gnu/usr.bin/ld/warnings.c
+++ b/gnu/usr.bin/ld/warnings.c
@@ -1,4 +1,4 @@
-/* * $OpenBSD: warnings.c,v 1.10 2003/04/16 02:15:10 deraadt Exp $*/
+/* * $OpenBSD: warnings.c,v 1.11 2005/12/21 01:40:22 millert Exp $*/
 /*
  */
 
@@ -7,7 +7,6 @@
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/time.h>
-#include <sys/errno.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c
index 2defe41f1d7..10ee787868c 100644
--- a/lib/libc/rpc/bindresvport.c
+++ b/lib/libc/rpc/bindresvport.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bindresvport.c,v 1.16 2005/04/01 07:44:03 otto Exp $	*/
+/*	$OpenBSD: bindresvport.c,v 1.17 2005/12/21 01:40:22 millert Exp $	*/
 
 /*
  * Copyright 1996, Jason Downs.  All rights reserved.
@@ -25,9 +25,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <errno.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/errno.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
index 7f23799f418..3bbd3167789 100644
--- a/lib/libc/rpc/clnt_generic.c
+++ b/lib/libc/rpc/clnt_generic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clnt_generic.c,v 1.5 2005/08/08 08:05:35 espie Exp $ */
+/*	$OpenBSD: clnt_generic.c,v 1.6 2005/12/21 01:40:22 millert Exp $ */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -31,10 +31,10 @@
 /*
  * Copyright (C) 1987, Sun Microsystems, Inc.
  */
+#include <errno.h>
 #include <string.h>
 #include <rpc/rpc.h>
 #include <sys/socket.h>
-#include <sys/errno.h>
 #include <netdb.h>
 
 /*
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index 24820521200..9b4b068b25e 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svc.c,v 1.20 2005/08/08 08:05:35 espie Exp $ */
+/*	$OpenBSD: svc.c,v 1.21 2005/12/21 01:40:22 millert Exp $ */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -38,10 +38,10 @@
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <sys/errno.h>
 #include <rpc/rpc.h>
 #include <rpc/pmap_clnt.h>
 
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
index 40afd62a810..c77ba875b8d 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svc_run.c,v 1.17 2005/09/10 23:04:26 brad Exp $ */
+/*	$OpenBSD: svc_run.c,v 1.18 2005/12/21 01:40:22 millert Exp $ */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -33,7 +33,7 @@
  * Wait for input, call server program.
  */
 #include <rpc/rpc.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libc/sys/ptrace.c b/lib/libc/sys/ptrace.c
index 7c6d83333e9..62d4a941adb 100644
--- a/lib/libc/sys/ptrace.c
+++ b/lib/libc/sys/ptrace.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: ptrace.c,v 1.3 2003/06/11 21:03:10 deraadt Exp $	*/
+/*	$OpenBSD: ptrace.c,v 1.4 2005/12/21 01:40:23 millert Exp $	*/
 /* David Leonard <d@openbsd.org>, 1999. Public domain. */
 
 #include <sys/types.h>
 #include <sys/ptrace.h>
-#include <sys/errno.h>
+#include <errno.h>
 
 int _ptrace(int, pid_t, caddr_t, int);
 
diff --git a/lib/libpthread/uthread/uthread_cancel.c b/lib/libpthread/uthread/uthread_cancel.c
index b08702ce857..c5eb358aff9 100644
--- a/lib/libpthread/uthread/uthread_cancel.c
+++ b/lib/libpthread/uthread/uthread_cancel.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: uthread_cancel.c,v 1.13 2002/05/07 05:13:17 pvalchev Exp $	*/
+/*	$OpenBSD: uthread_cancel.c,v 1.14 2005/12/21 01:40:23 millert Exp $	*/
 /*
  * David Leonard <d@openbsd.org>, 1999. Public domain.
  */
-#include <sys/errno.h>
+#include <errno.h>
 #include <pthread.h>
 #include "pthread_private.h"
 
diff --git a/lib/librpcsvc/bootparam_prot.x b/lib/librpcsvc/bootparam_prot.x
index 5d791c7ecf4..326ba1bd556 100644
--- a/lib/librpcsvc/bootparam_prot.x
+++ b/lib/librpcsvc/bootparam_prot.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootparam_prot.x,v 1.6 2004/01/17 12:32:11 deraadt Exp $	*/
+/*	$OpenBSD: bootparam_prot.x,v 1.7 2005/12/21 01:40:23 millert Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -43,13 +43,13 @@
 %#include <sys/param.h>
 %#include <rpc/types.h>
 %#include <sys/time.h>
-%#include <sys/errno.h>
 %#include <sys/ucred.h>
+%#include <errno.h>
 #else
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)bootparam_prot.x 1.2 87/06/24 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)bootparam_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: bootparam_prot.x,v 1.6 2004/01/17 12:32:11 deraadt Exp $";
+%static char rcsid[] = "$OpenBSD: bootparam_prot.x,v 1.7 2005/12/21 01:40:23 millert Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/sbin/brconfig/brconfig.c b/sbin/brconfig/brconfig.c
index c73424b5062..6f0abb19a89 100644
--- a/sbin/brconfig/brconfig.c
+++ b/sbin/brconfig/brconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brconfig.c,v 1.33 2004/09/14 22:13:03 deraadt Exp $	*/
+/*	$OpenBSD: brconfig.c,v 1.34 2005/12/21 01:40:23 millert Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -38,9 +38,9 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 #include <net/if_bridge.h>
-#include <sys/errno.h>
 #include <string.h>
 #include <err.h>
+#include <errno.h>
 #include <sysexits.h>
 #include <limits.h>
 
diff --git a/sbin/ipsecadm/pfkdump.c b/sbin/ipsecadm/pfkdump.c
index f95c0d3022a..8bda12f94e1 100644
--- a/sbin/ipsecadm/pfkdump.c
+++ b/sbin/ipsecadm/pfkdump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfkdump.c,v 1.17 2005/09/27 11:53:42 markus Exp $	*/
+/*	$OpenBSD: pfkdump.c,v 1.18 2005/12/21 01:40:23 millert Exp $	*/
 
 /*
  * Copyright (c) 2003 Markus Friedl.  All rights reserved.
@@ -25,7 +25,6 @@
  */
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/sysctl.h>
 #include <net/pfkeyv2.h>
@@ -36,6 +35,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <err.h>
+#include <errno.h>
 
 #define PFKEY2_CHUNK sizeof(u_int64_t)
 
diff --git a/sbin/ipsecctl/pfkdump.c b/sbin/ipsecctl/pfkdump.c
index dd3930985db..ff2cfc26d8d 100644
--- a/sbin/ipsecctl/pfkdump.c
+++ b/sbin/ipsecctl/pfkdump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfkdump.c,v 1.9 2005/12/12 23:24:10 hshoexer Exp $	*/
+/*	$OpenBSD: pfkdump.c,v 1.10 2005/12/21 01:40:23 millert Exp $	*/
 
 /*
  * Copyright (c) 2003 Markus Friedl.  All rights reserved.
@@ -25,7 +25,6 @@
  */
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/sysctl.h>
 #include <net/pfkeyv2.h>
@@ -36,6 +35,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <err.h>
+#include <errno.h>
 
 #include "ipsecctl.h"
 #include "pfkey.h"
diff --git a/sbin/isakmpd/sysdep/openbsd/sysdep.c b/sbin/isakmpd/sysdep/openbsd/sysdep.c
index d9cdb9935e2..9a21e46deb5 100644
--- a/sbin/isakmpd/sysdep/openbsd/sysdep.c
+++ b/sbin/isakmpd/sysdep/openbsd/sysdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysdep.c,v 1.34 2005/05/04 10:05:02 hshoexer Exp $	 */
+/* $OpenBSD: sysdep.c,v 1.35 2005/12/21 01:40:23 millert Exp $	 */
 /* $EOM: sysdep.c,v 1.9 2000/12/04 04:46:35 angelos Exp $	 */
 
 /*
@@ -29,13 +29,13 @@
  * This code was written under funding by Ericsson Radio Systems.
  */
 
-#include <sys/errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 
 #include "sysdep.h"
 
diff --git a/sbin/scsi/libscsi.c b/sbin/scsi/libscsi.c
index 1479f9fe96e..f7963dca7f4 100644
--- a/sbin/scsi/libscsi.c
+++ b/sbin/scsi/libscsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libscsi.c,v 1.4 2005/10/24 22:56:17 deraadt Exp $	*/
+/*	$OpenBSD: libscsi.c,v 1.5 2005/12/21 01:40:23 millert Exp $	*/
 
 /* Copyright (c) 1994 HD Associates
  * (contact: dufault@hda.com)
@@ -38,7 +38,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <sys/scsiio.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include <stdarg.h>
 #include <fcntl.h>
 
diff --git a/usr.bin/elf2ecoff/elf2ecoff.c b/usr.bin/elf2ecoff/elf2ecoff.c
index 4f7774ca49b..cc2923a32cc 100644
--- a/usr.bin/elf2ecoff/elf2ecoff.c
+++ b/usr.bin/elf2ecoff/elf2ecoff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: elf2ecoff.c,v 1.5 2003/11/27 10:33:20 henning Exp $	 */
+/* $OpenBSD: elf2ecoff.c,v 1.6 2005/12/21 01:40:24 millert Exp $	 */
 /* $NetBSD: elf2ecoff.c,v 1.8 1997/07/20 03:50:54 jonathan Exp $	 */
 
 /*
@@ -47,7 +47,7 @@
 #include <machine/elf_abi.h>
 #include <stdio.h>
 #include <sys/exec_ecoff.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include <string.h>
 #include <limits.h>
 
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 95916458884..e2cba951541 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ktrace.c,v 1.18 2004/09/14 22:25:06 deraadt Exp $	*/
+/*	$OpenBSD: ktrace.c,v 1.19 2005/12/21 01:40:24 millert Exp $	*/
 /*	$NetBSD: ktrace.c,v 1.4 1995/08/31 23:01:44 jtc Exp $	*/
 
 /*-
@@ -40,17 +40,17 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)ktrace.c	8.2 (Berkeley) 4/28/95";
 #endif
-static char *rcsid = "$OpenBSD: ktrace.c,v 1.18 2004/09/14 22:25:06 deraadt Exp $";
+static char *rcsid = "$OpenBSD: ktrace.c,v 1.19 2005/12/21 01:40:24 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/errno.h>
 #include <sys/uio.h>
 #include <sys/ktrace.h>
 
 #include <err.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index c1911788c96..779c353acfc 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbuf.c,v 1.23 2005/05/23 17:35:59 marius Exp $	*/
+/*	$OpenBSD: mbuf.c,v 1.24 2005/12/21 01:40:24 millert Exp $	*/
 /*	$NetBSD: mbuf.c,v 1.9 1996/05/07 02:55:03 thorpej Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "from: @(#)mbuf.c	8.1 (Berkeley) 6/6/93";
 #else
-static char *rcsid = "$OpenBSD: mbuf.c,v 1.23 2005/05/23 17:35:59 marius Exp $";
+static char *rcsid = "$OpenBSD: mbuf.c,v 1.24 2005/12/21 01:40:24 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -44,8 +44,8 @@ static char *rcsid = "$OpenBSD: mbuf.c,v 1.23 2005/05/23 17:35:59 marius Exp $";
 #include <sys/mbuf.h>
 #include <sys/pool.h>
 #include <sys/sysctl.h>
-#include <sys/errno.h>
 
+#include <errno.h>
 #include <kvm.h>
 #include <limits.h>
 #include <stdio.h>
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index a99a0330b4b..2e09df9bf5c 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machine.c,v 1.50 2005/12/04 23:10:06 tedu Exp $	 */
+/* $OpenBSD: machine.c,v 1.51 2005/12/21 01:40:24 millert Exp $	 */
 
 /*-
  * Copyright (c) 1994 Thorsten Lockert <tholo@sigmasoft.com>
@@ -43,7 +43,6 @@
 #include <err.h>
 #include <math.h>
 #include <unistd.h>
-#include <sys/errno.h>
 #include <sys/sysctl.h>
 #include <sys/dir.h>
 #include <sys/dkstat.h>
@@ -52,6 +51,7 @@
 #include <sys/resource.h>
 #include <sys/swap.h>
 #include <err.h>
+#include <errno.h>
 
 #include "top.h"
 #include "display.h"
diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h
index 4fdd7ab5a73..f744c1b96c9 100644
--- a/usr.sbin/amd/include/config.h
+++ b/usr.sbin/amd/include/config.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)config.h	8.1 (Berkeley) 6/6/93
- *	$Id: config.h,v 1.6 2004/05/31 10:38:20 otto Exp $
+ *	$Id: config.h,v 1.7 2005/12/21 01:40:24 millert Exp $
  */
 
 #ifdef __GNUC__
@@ -47,9 +47,9 @@
 #include "os-defaults.h"
 #include OS_HDR
 
+#include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/errno.h>
 #include <sys/time.h>
 
 #define clocktime() (clock_valid ? clock_valid : time(&clock_valid))
diff --git a/usr.sbin/mopd/common/loop-bsd.c b/usr.sbin/mopd/common/loop-bsd.c
index 51569ebfd70..ce9a20f5438 100644
--- a/usr.sbin/mopd/common/loop-bsd.c
+++ b/usr.sbin/mopd/common/loop-bsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loop-bsd.c,v 1.9 2004/04/14 20:37:28 henning Exp $ */
+/*	$OpenBSD: loop-bsd.c,v 1.10 2005/12/21 01:40:24 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -26,9 +26,10 @@
 
 #ifndef LINT
 static const char rcsid[] =
-    "$OpenBSD: loop-bsd.c,v 1.9 2004/04/14 20:37:28 henning Exp $";
+    "$OpenBSD: loop-bsd.c,v 1.10 2005/12/21 01:40:24 millert Exp $";
 #endif
 
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -37,7 +38,6 @@ static const char rcsid[] =
 #endif
 #include <net/bpf.h>
 #include <sys/ioctl.h>
-#include <sys/errno.h>
 
 #include "os.h"
 #include "common/common.h"
diff --git a/usr.sbin/mopd/common/pf.c b/usr.sbin/mopd/common/pf.c
index 7a05d3a987d..bd39c2436fc 100644
--- a/usr.sbin/mopd/common/pf.c
+++ b/usr.sbin/mopd/common/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.11 2004/05/08 20:23:21 canacar Exp $ */
+/*	$OpenBSD: pf.c,v 1.12 2005/12/21 01:40:24 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
 
 #ifndef LINT
 static const char rcsid[] =
-    "$OpenBSD: pf.c,v 1.11 2004/05/08 20:23:21 canacar Exp $";
+    "$OpenBSD: pf.c,v 1.12 2005/12/21 01:40:24 millert Exp $";
 #endif
 
 #include <stdio.h>
@@ -44,7 +44,6 @@ static const char rcsid[] =
 #include <net/if.h>
 
 #include <net/bpf.h>
-#include <sys/errno.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
@@ -53,6 +52,7 @@ static const char rcsid[] =
 #include <ctype.h>
 #include <string.h>
 #include <err.h>
+#include <errno.h>
 
 #include <syslog.h>
 
diff --git a/usr.sbin/mopd/otherOS/loop-linux2.c b/usr.sbin/mopd/otherOS/loop-linux2.c
index f25c4d59c7a..c7128f380f2 100644
--- a/usr.sbin/mopd/otherOS/loop-linux2.c
+++ b/usr.sbin/mopd/otherOS/loop-linux2.c
@@ -23,9 +23,10 @@
  */
 
 #ifndef LINT
-static const char rcsid[] = "$Id: loop-linux2.c,v 1.4 2003/12/01 00:56:51 avsm Exp $";
+static const char rcsid[] = "$Id: loop-linux2.c,v 1.5 2005/12/21 01:40:24 millert Exp $";
 #endif
 
+#include <errno.h>
 #include <stdlib.h>
 #include <strings.h>
 #include <unistd.h>
@@ -33,7 +34,6 @@ static const char rcsid[] = "$Id: loop-linux2.c,v 1.4 2003/12/01 00:56:51 avsm E
 #include <sys/time.h>
 #endif
 #include <sys/ioctl.h>
-#include <sys/errno.h>
 
 #include "os.h"
 #include "common/common.h"
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index f5e8255ca60..d093f8bd193 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rarpd.c,v 1.44 2004/09/15 22:33:15 deraadt Exp $ */
+/*	$OpenBSD: rarpd.c,v 1.45 2005/12/21 01:40:24 millert Exp $ */
 /*	$NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $	*/
 
 /*
@@ -28,7 +28,7 @@ char    copyright[] =
 #endif				/* not lint */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: rarpd.c,v 1.44 2004/09/15 22:33:15 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rarpd.c,v 1.45 2005/12/21 01:40:24 millert Exp $";
 #endif
 
 
@@ -55,8 +55,8 @@ static char rcsid[] = "$OpenBSD: rarpd.c,v 1.44 2004/09/15 22:33:15 deraadt Exp
 #include <net/if_types.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <sys/errno.h>
 #include <sys/file.h>
+#include <errno.h>
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <dirent.h>
diff --git a/usr.sbin/ypserv/makedbm/makedbm.c b/usr.sbin/ypserv/makedbm/makedbm.c
index e81b676043b..9273cd24e9d 100644
--- a/usr.sbin/ypserv/makedbm/makedbm.c
+++ b/usr.sbin/ypserv/makedbm/makedbm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: makedbm.c,v 1.24 2005/05/14 02:32:32 deraadt Exp $ */
+/*	$OpenBSD: makedbm.c,v 1.25 2005/12/21 01:40:24 millert Exp $ */
 
 /*
  * Copyright (c) 1994-97 Mats O Jansson <moj@stacken.kth.se>
@@ -27,7 +27,7 @@
  */
 
 #ifndef LINT
-static const char rcsid[] = "$OpenBSD: makedbm.c,v 1.24 2005/05/14 02:32:32 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: makedbm.c,v 1.25 2005/12/21 01:40:24 millert Exp $";
 #endif
 
 #include <stdio.h>
@@ -38,7 +38,7 @@ static const char rcsid[] = "$OpenBSD: makedbm.c,v 1.24 2005/05/14 02:32:32 dera
 #include <sys/param.h>
 #include <unistd.h>
 #include <string.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include "ypdb.h"
 #include "ypdef.h"
 #include "db.h"
diff --git a/usr.sbin/ypserv/ypserv/ypserv_db.c b/usr.sbin/ypserv/ypserv/ypserv_db.c
index d8e36f0ff0e..45728ccab9d 100644
--- a/usr.sbin/ypserv/ypserv/ypserv_db.c
+++ b/usr.sbin/ypserv/ypserv/ypserv_db.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypserv_db.c,v 1.21 2005/10/15 18:33:51 otto Exp $ */
+/*	$OpenBSD: ypserv_db.c,v 1.22 2005/12/21 01:40:25 millert Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -34,7 +34,7 @@
  */
 
 #ifndef LINT
-static const char rcsid[] = "$OpenBSD: ypserv_db.c,v 1.21 2005/10/15 18:33:51 otto Exp $";
+static const char rcsid[] = "$OpenBSD: ypserv_db.c,v 1.22 2005/12/21 01:40:25 millert Exp $";
 #endif
 
 /*
@@ -61,7 +61,7 @@ static const char rcsid[] = "$OpenBSD: ypserv_db.c,v 1.21 2005/10/15 18:33:51 ot
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <syslog.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include "yplog.h"
 #include "ypdb.h"
 #include "ypdef.h"