From b75d68301ee5b06b4db0b68980b9298bc2d020d6 Mon Sep 17 00:00:00 2001
From: kleink <kleink@NetBSD.org>
Date: Fri, 12 Feb 1999 15:04:00 +0000
Subject: [PATCH] <sys/fcntl.h> -> <fcntl.h>

---
 bin/pax/tables.c                        | 6 +++---
 distrib/utils/mksunbootcd/mksunbootcd.c | 5 ++---
 lib/libc/termios/tcflush.c              | 6 +++---
 libexec/atrun/atrun.c                   | 6 +++---
 share/doc/psd/05.sysman/2.2.t           | 4 ++--
 usr.bin/vmstat/vmstat.c                 | 6 +++---
 usr.sbin/ypbind/ypbind.c                | 6 +++---
 7 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 225767f38c25..86b7349d8314 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tables.c,v 1.7 1997/07/20 20:32:45 christos Exp $	*/
+/*	$NetBSD: tables.c,v 1.8 1999/02/12 15:04:00 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: tables.c,v 1.7 1997/07/20 20:32:45 christos Exp $");
+__RCSID("$NetBSD: tables.c,v 1.8 1999/02/12 15:04:00 kleink Exp $");
 #endif
 #endif /* not lint */
 
@@ -50,9 +50,9 @@ __RCSID("$NetBSD: tables.c,v 1.7 1997/07/20 20:32:45 christos Exp $");
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/param.h>
-#include <sys/fcntl.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/distrib/utils/mksunbootcd/mksunbootcd.c b/distrib/utils/mksunbootcd/mksunbootcd.c
index e612679c692d..85611399d0be 100644
--- a/distrib/utils/mksunbootcd/mksunbootcd.c
+++ b/distrib/utils/mksunbootcd/mksunbootcd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mksunbootcd.c,v 1.1.1.1 1999/01/18 07:37:23 mrg Exp $	*/
+/*	$NetBSD: mksunbootcd.c,v 1.2 1999/02/12 15:04:01 kleink Exp $	*/
 
 /*
  * Copyright (c) 1998 Ignatios Souvatzis
@@ -36,15 +36,14 @@
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 
-#include <sys/fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 
 #include <dev/sun/disklabel.h>
 
 #include <err.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/lib/libc/termios/tcflush.c b/lib/libc/termios/tcflush.c
index 182f576ee342..e2ff5ec74448 100644
--- a/lib/libc/termios/tcflush.c
+++ b/lib/libc/termios/tcflush.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcflush.c,v 1.4 1997/07/21 14:09:15 jtc Exp $	*/
+/*	$NetBSD: tcflush.c,v 1.5 1999/02/12 15:04:01 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -38,13 +38,13 @@
 #if 0
 static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
 #else
-__RCSID("$NetBSD: tcflush.c,v 1.4 1997/07/21 14:09:15 jtc Exp $");
+__RCSID("$NetBSD: tcflush.c,v 1.5 1999/02/12 15:04:01 kleink Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
 #include <sys/ioctl.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
 #include <termios.h>
 #include <errno.h>
 
diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c
index 985a38429cf0..86f96996cc74 100644
--- a/libexec/atrun/atrun.c
+++ b/libexec/atrun/atrun.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: atrun.c,v 1.5 1998/06/27 21:15:42 christos Exp $	*/
+/*	$NetBSD: atrun.c,v 1.6 1999/02/12 15:04:00 kleink Exp $	*/
 
 /*
  *  atrun.c - run jobs queued by at; run with root privileges.
@@ -27,7 +27,6 @@
 
 /* System Headers */
 
-#include <sys/fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
@@ -35,6 +34,7 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <pwd.h>
 #include <grp.h>
 #include <signal.h>
@@ -70,7 +70,7 @@ static char *namep;
 #if 0
 static char rcsid[] = "$OpenBSD: atrun.c,v 1.7 1997/09/08 22:12:10 millert Exp $";
 #else
-__RCSID("$NetBSD: atrun.c,v 1.5 1998/06/27 21:15:42 christos Exp $");
+__RCSID("$NetBSD: atrun.c,v 1.6 1999/02/12 15:04:00 kleink Exp $");
 #endif
 
 static int debug = 0;
diff --git a/share/doc/psd/05.sysman/2.2.t b/share/doc/psd/05.sysman/2.2.t
index a8ea75b92836..a61b1ab57fb8 100644
--- a/share/doc/psd/05.sysman/2.2.t
+++ b/share/doc/psd/05.sysman/2.2.t
@@ -1,4 +1,4 @@
-.\"	$NetBSD: 2.2.t,v 1.2 1998/01/09 06:54:48 perry Exp $
+.\"	$NetBSD: 2.2.t,v 1.3 1999/02/12 15:04:01 kleink Exp $
 .\"
 .\" Copyright (c) 1983, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -167,7 +167,7 @@ file to be opened.
 The \fIoflag\fP parameter must
 include O_CREAT to cause the file to be created.
 Bits for \fIoflag\fP are
-defined in \fI<sys/fcntl.h>\fP:
+defined in \fI<fcntl.h>\fP:
 .DS
 .TS
 l l.
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index dea0b7b9cd2f..998a5d49a280 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmstat.c,v 1.54 1999/01/11 23:03:06 thorpej Exp $	*/
+/*	$NetBSD: vmstat.c,v 1.55 1999/02/12 15:04:00 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1986, 1991, 1993\n\
 #if 0
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 3/1/95";
 #else
-__RCSID("$NetBSD: vmstat.c,v 1.54 1999/01/11 23:03:06 thorpej Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.55 1999/02/12 15:04:00 kleink Exp $");
 #endif
 #endif /* not lint */
 
@@ -92,13 +92,13 @@ __RCSID("$NetBSD: vmstat.c,v 1.54 1999/01/11 23:03:06 thorpej Exp $");
 #include <sys/buf.h>
 #include <sys/namei.h>
 #include <sys/malloc.h>
-#include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/sysctl.h>
 #include <sys/device.h>
 #include <sys/pool.h>
 #include <vm/vm.h>
 #include <err.h>
+#include <fcntl.h>
 #include <time.h>
 #include <nlist.h>
 #include <kvm.h>
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index e103680f3ada..5bbfbbb1a0c6 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ypbind.c,v 1.37 1998/08/21 09:39:04 bouyer Exp $	*/
+/*	$NetBSD: ypbind.c,v 1.38 1999/02/12 15:04:01 kleink Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@fsa.ca>
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 #ifndef LINT
-__RCSID("$NetBSD: ypbind.c,v 1.37 1998/08/21 09:39:04 bouyer Exp $");
+__RCSID("$NetBSD: ypbind.c,v 1.38 1999/02/12 15:04:01 kleink Exp $");
 #endif
 
 #include <sys/param.h>
@@ -43,10 +43,10 @@ __RCSID("$NetBSD: ypbind.c,v 1.37 1998/08/21 09:39:04 bouyer Exp $");
 #include <sys/signal.h>
 #include <sys/socket.h>
 #include <sys/file.h>
-#include <sys/fcntl.h>
 #include <sys/uio.h>
 #include <sys/syslog.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>