When there are multiple groups of functions with their own #includes

listed, the #includes in each group are independent, so that users
don't need to guess at possible carry-over.

general idea ok otto@ millert@
actual diff ok jmc@ schwarze@

14 files changed, 55 insertions, 46 deletions

diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 24ceb425d1b..d540a97f8e8 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: printf.3,v 1.61 2013/03/04 01:50:01 brad Exp $
+.\"	$OpenBSD: printf.3,v 1.62 2013/04/01 20:16:31 guenther Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: March 4 2013 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt PRINTF 3
 .Os
 .Sh NAME
@@ -65,6 +65,7 @@
 .Ft int
 .Fn dprintf "int fd" "const char * restrict format" ...
 .Fd #include <stdarg.h>
+.Fd #include <stdio.h>
 .Ft int
 .Fn vprintf "const char *format" "va_list ap"
 .Ft int
diff --git a/lib/libc/sys/access.2 b/lib/libc/sys/access.2
index afb51edece3..baf3df6f6a1 100644
--- a/lib/libc/sys/access.2
+++ b/lib/libc/sys/access.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: access.2,v 1.21 2013/03/31 05:07:55 guenther Exp $
+.\"	$OpenBSD: access.2,v 1.22 2013/04/01 20:16:31 guenther Exp $
 .\"	$NetBSD: access.2,v 1.7 1995/02/27 12:31:44 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)access.2	8.2 (Berkeley) 4/1/94
 .\"
-.Dd $Mdocdate: March 31 2013 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt ACCESS 2
 .Os
 .Sh NAME
@@ -42,6 +42,7 @@
 .Ft int
 .Fn access "const char *path" "int amode"
 .Fd #include <fcntl.h>
+.Fd #include <unistd.h>
 .Ft int
 .Fn faccessat "int fd" "const char *path" "int amode" "int flag"
 .Sh DESCRIPTION
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index d098579753e..6821f5df14a 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chmod.2,v 1.21 2013/03/31 05:07:55 guenther Exp $
+.\"	$OpenBSD: chmod.2,v 1.22 2013/04/01 20:16:31 guenther Exp $
 .\"	$NetBSD: chmod.2,v 1.7 1995/02/27 12:32:06 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)chmod.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: March 31 2013 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt CHMOD 2
 .Os
 .Sh NAME
@@ -44,6 +44,7 @@
 .Fn chmod "const char *path" "mode_t mode"
 .Ft int
 .Fn fchmod "int fd" "mode_t mode"
+.Fd #include <sys/stat.h>
 .Fd #include <fcntl.h>
 .Ft int
 .Fn fchmodat "int fd" "const char *path" "mode_t mode" "int flag"
diff --git a/lib/libc/sys/chown.2 b/lib/libc/sys/chown.2
index dde8c2f2176..d3e3c2127fc 100644
--- a/lib/libc/sys/chown.2
+++ b/lib/libc/sys/chown.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chown.2,v 1.20 2013/03/31 05:07:55 guenther Exp $
+.\"	$OpenBSD: chown.2,v 1.21 2013/04/01 20:16:31 guenther Exp $
 .\"	$NetBSD: chown.2,v 1.10 1995/10/12 15:40:47 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)chown.2	8.4 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: March 31 2013 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt CHOWN 2
 .Os
 .Sh NAME
@@ -40,17 +40,17 @@
 .Nm fchown
 .Nd change owner and group of a file or link
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <fcntl.h>
 .Fd #include <unistd.h>
 .Ft int
 .Fn chown "const char *path" "uid_t owner" "gid_t group"
 .Ft int
 .Fn lchown "const char *path" "uid_t owner" "gid_t group"
 .Ft int
-.Fn fchownat "int fd" "const char *path" "uid_t owner" "gid_t group" "int flag"
-.Ft int
 .Fn fchown "int fd" "uid_t owner" "gid_t group"
+.Fd #include <fcntl.h>
+.Fd #include <unistd.h>
+.Ft int
+.Fn fchownat "int fd" "const char *path" "uid_t owner" "gid_t group" "int flag"
 .Sh DESCRIPTION
 The owner ID and group ID of the file (or link) named by
 .Fa path
diff --git a/lib/libc/sys/link.2 b/lib/libc/sys/link.2
index e3be19067e1..ce8d0f64e77 100644
--- a/lib/libc/sys/link.2
+++ b/lib/libc/sys/link.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: link.2,v 1.23 2013/03/31 05:07:55 guenther Exp $
+.\"	$OpenBSD: link.2,v 1.24 2013/04/01 20:16:31 guenther Exp $
 .\"	$NetBSD: link.2,v 1.7 1995/02/27 12:34:01 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,17 +30,18 @@
 .\"
 .\"     @(#)link.2	8.3 (Berkeley) 1/12/94
 .\"
-.Dd $Mdocdate: March 31 2013 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt LINK 2
 .Os
 .Sh NAME
 .Nm link
 .Nd make hard link to a file
 .Sh SYNOPSIS
-.Fd #include <fcntl.h>
 .Fd #include <unistd.h>
 .Ft int
 .Fn link "const char *name1" "const char *name2"
+.Fd #include <fcntl.h>
+.Fd #include <unistd.h>
 .Ft int
 .Fn linkat "int fd1" "const char *name1" "int fd2" "const char *name2" "int flag"
 .Sh DESCRIPTION
diff --git a/lib/libc/sys/mkdir.2 b/lib/libc/sys/mkdir.2
index 740350eb982..d1142108bfd 100644
--- a/lib/libc/sys/mkdir.2
+++ b/lib/libc/sys/mkdir.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mkdir.2,v 1.12 2013/03/31 05:07:55 guenther Exp $
+.\"	$OpenBSD: mkdir.2,v 1.13 2013/04/01 20:16:31 guenther Exp $
 .\"	$NetBSD: mkdir.2,v 1.8 1995/02/27 12:34:22 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mkdir.2	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: March 31 2013 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt MKDIR 2
 .Os
 .Sh NAME
@@ -38,11 +38,11 @@
 .Nm mkdirat
 .Nd make a directory file
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
 .Fd #include <sys/stat.h>
-.Fd #include <fcntl.h>
 .Ft int
 .Fn mkdir "const char *path" "mode_t mode"
+.Fd #include <sys/stat.h>
+.Fd #include <fcntl.h>
 .Ft int
 .Fn mkdirat "int fd" "const char *path" "mode_t mode"
 .Sh DESCRIPTION
diff --git a/lib/libc/sys/mkfifo.2 b/lib/libc/sys/mkfifo.2
index 7cb23f37427..7fa8fe95b16 100644
--- a/lib/libc/sys/mkfifo.2
+++ b/lib/libc/sys/mkfifo.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mkfifo.2,v 1.10 2013/03/31 05:07:55 guenther Exp $
+.\"	$OpenBSD: mkfifo.2,v 1.11 2013/04/01 20:16:31 guenther Exp $
 .\"	$NetBSD: mkfifo.2,v 1.8 1995/02/27 12:34:27 cgd Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)mkfifo.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: March 31 2013 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt MKFIFO 2
 .Os
 .Sh NAME
@@ -38,11 +38,11 @@
 .Nm mkfifoat
 .Nd make a FIFO file
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
 .Fd #include <sys/stat.h>
-.Fd #include <fcntl.h>
 .Ft int
 .Fn mkfifo "const char *path" "mode_t mode"
+.Fd #include <sys/stat.h>
+.Fd #include <fcntl.h>
 .Ft int
 .Fn mkfifoat "int fd" "const char *path" "mode_t mode"
 .Sh DESCRIPTION
diff --git a/lib/libc/sys/mknod.2 b/lib/libc/sys/mknod.2
index da3f52893e0..f3174508cdb 100644
--- a/lib/libc/sys/mknod.2
+++ b/lib/libc/sys/mknod.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mknod.2,v 1.16 2013/03/31 05:07:55 guenther Exp $
+.\"	$OpenBSD: mknod.2,v 1.17 2013/04/01 20:16:31 guenther Exp $
 .\"	$NetBSD: mknod.2,v 1.6 1995/02/27 12:34:33 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mknod.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: March 31 2013 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt MKNOD 2
 .Os
 .Sh NAME
@@ -41,6 +41,7 @@
 .Fd #include <sys/stat.h>
 .Ft int
 .Fn mknod "const char *path" "mode_t mode" "dev_t dev"
+.Fd #include <sys/stat.h>
 .Fd #include <fcntl.h>
 .Ft int
 .Fn mknodat "int fd" "const char *path" "mode_t mode" "dev_t dev"
diff --git a/lib/libc/sys/readlink.2 b/lib/libc/sys/readlink.2
index ec15ad22ef2..ae9c40408da 100644
--- a/lib/libc/sys/readlink.2
+++ b/lib/libc/sys/readlink.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: readlink.2,v 1.14 2013/03/31 05:07:55 guenther Exp $
+.\"	$OpenBSD: readlink.2,v 1.15 2013/04/01 20:16:31 guenther Exp $
 .\"	$NetBSD: readlink.2,v 1.7 1995/02/27 12:35:54 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)readlink.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: March 31 2013 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt READLINK 2
 .Os
 .Sh NAME
@@ -38,10 +38,11 @@
 .Nm readlinkat
 .Nd read value of a symbolic link
 .Sh SYNOPSIS
-.Fd #include <fcntl.h>
 .Fd #include <unistd.h>
 .Ft int
 .Fn readlink "const char *path" "char *buf" "size_t bufsiz"
+.Fd #include <fcntl.h>
+.Fd #include <unistd.h>
 .Ft ssize_t
 .Fn readlinkat "int fd" "const char *path" "char *buf" "size_t bufsiz"
 .Sh DESCRIPTION
diff --git a/lib/libc/sys/rename.2 b/lib/libc/sys/rename.2
index 5609fbe7cd7..d38df66b873 100644
--- a/lib/libc/sys/rename.2
+++ b/lib/libc/sys/rename.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rename.2,v 1.17 2013/03/31 05:07:55 guenther Exp $
+.\"	$OpenBSD: rename.2,v 1.18 2013/04/01 20:16:31 guenther Exp $
 .\"	$NetBSD: rename.2,v 1.7 1995/02/27 12:36:15 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)rename.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: March 31 2013 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt RENAME 2
 .Os
 .Sh NAME
@@ -38,10 +38,11 @@
 .Nm renameat
 .Nd change the name of a file
 .Sh SYNOPSIS
-.Fd #include <fcntl.h>
 .Fd #include <stdio.h>
 .Ft int
 .Fn rename "const char *from" "const char *to"
+.Fd #include <fcntl.h>
+.Fd #include <stdio.h>
 .Ft int
 .Fn renameat "int fromfd" "const char *from" "int tofd" "const char *to"
 .Sh DESCRIPTION
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index 139fd35cdf0..686d6befa55 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stat.2,v 1.34 2013/03/30 09:00:06 jmc Exp $
+.\"	$OpenBSD: stat.2,v 1.35 2013/04/01 20:16:31 guenther Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)stat.2	8.3 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: March 30 2013 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt STAT 2
 .Os
 .Sh NAME
@@ -39,17 +39,17 @@
 .Nm fstat
 .Nd get file status
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
 .Fd #include <sys/stat.h>
-.Fd #include <fcntl.h>
 .Ft int
 .Fn stat "const char *path" "struct stat *sb"
 .Ft int
 .Fn lstat "const char *path" "struct stat *sb"
 .Ft int
-.Fn fstatat "int fd" "const char *path" "struct stat *sb" "int flag"
-.Ft int
 .Fn fstat "int fd" "struct stat *sb"
+.Fd #include <sys/stat.h>
+.Fd #include <fcntl.h>
+.Ft int
+.Fn fstatat "int fd" "const char *path" "struct stat *sb" "int flag"
 .Sh DESCRIPTION
 The
 .Fn stat
diff --git a/lib/libc/sys/symlink.2 b/lib/libc/sys/symlink.2
index 6ccbde2a79a..38047d6d2df 100644
--- a/lib/libc/sys/symlink.2
+++ b/lib/libc/sys/symlink.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: symlink.2,v 1.14 2013/03/31 05:07:55 guenther Exp $
+.\"	$OpenBSD: symlink.2,v 1.15 2013/04/01 20:16:31 guenther Exp $
 .\"	$NetBSD: symlink.2,v 1.7 1995/02/27 12:38:34 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,17 +30,18 @@
 .\"
 .\"     @(#)symlink.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: March 31 2013 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt SYMLINK 2
 .Os
 .Sh NAME
 .Nm symlink
 .Nd make symbolic link to a file
 .Sh SYNOPSIS
-.Fd #include <fcntl.h>
 .Fd #include <unistd.h>
 .Ft int
 .Fn symlink "const char *name1" "const char *name2"
+.Fd #include <fcntl.h>
+.Fd #include <unistd.h>
 .Ft int
 .Fn symlinkat "const char *name1" "int fd" "const char *name2"
 .Sh DESCRIPTION
diff --git a/lib/libc/sys/unlink.2 b/lib/libc/sys/unlink.2
index b563b92ecf8..d1bedb8e598 100644
--- a/lib/libc/sys/unlink.2
+++ b/lib/libc/sys/unlink.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: unlink.2,v 1.21 2013/03/31 05:07:55 guenther Exp $
+.\"	$OpenBSD: unlink.2,v 1.22 2013/04/01 20:16:31 guenther Exp $
 .\"	$NetBSD: unlink.2,v 1.7 1995/02/27 12:39:13 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)unlink.2	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: March 31 2013 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt UNLINK 2
 .Os
 .Sh NAME
@@ -38,10 +38,11 @@
 .Nm unlinkat
 .Nd remove directory entry
 .Sh SYNOPSIS
-.Fd #include <fcntl.h>
 .Fd #include <unistd.h>
 .Ft int
 .Fn unlink "const char *path"
+.Fd #include <fcntl.h>
+.Fd #include <unistd.h>
 .Ft int
 .Fn unlinkat "int fd" "const char *path" "int flag"
 .Sh DESCRIPTION
diff --git a/lib/libc/sys/wait.2 b/lib/libc/sys/wait.2
index 3b20f19b043..1061da2ea29 100644
--- a/lib/libc/sys/wait.2
+++ b/lib/libc/sys/wait.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wait.2,v 1.22 2011/11/17 14:26:14 schwarze Exp $
+.\"	$OpenBSD: wait.2,v 1.23 2013/04/01 20:16:31 guenther Exp $
 .\"	$NetBSD: wait.2,v 1.6 1995/02/27 12:39:37 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)wait.2	8.2 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: November 17 2011 $
+.Dd $Mdocdate: April 1 2013 $
 .Dt WAIT 2
 .Os
 .Sh NAME
@@ -46,8 +46,8 @@
 .Fn wait "int *status"
 .Ft pid_t
 .Fn waitpid "pid_t wpid" "int *status" "int options"
-.Fd #include <sys/time.h>
 .Fd #include <sys/resource.h>
+.Fd #include <sys/wait.h>
 .Ft pid_t
 .Fn wait3 "int *status" "int options" "struct rusage *rusage"
 .Ft pid_t