Use the fancy .In macro for includes. From Jan Klemkow. ok jmc schwarze

author: tedu <tedu@openbsd.org> 2013-06-05 03:39:22 +0000
committer: tedu <tedu@openbsd.org> 2013-06-05 03:39:22 +0000
commit: 64d4e9871d1af4e50715ace8f2f237ff8e4d36e0 (patch)
tree: 90569bb16bd247c9a0433830994a6bc333a5a4f9 /lib/libc
parent: m_defrag(9) wasnt documented. (diff)
download: wireguard-openbsd-64d4e9871d1af4e50715ace8f2f237ff8e4d36e0.tar.xz
wireguard-openbsd-64d4e9871d1af4e50715ace8f2f237ff8e4d36e0.zip
290 files changed, 962 insertions, 962 deletions
diff --git a/lib/libc/asr/async_resolver.3 b/lib/libc/asr/async_resolver.3
index 5c1c67602a1..8460309360d 100644
--- a/lib/libc/asr/async_resolver.3
+++ b/lib/libc/asr/async_resolver.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: async_resolver.3,v 1.12 2013/04/30 13:05:44 jmc Exp $
+.\"	$OpenBSD: async_resolver.3,v 1.13 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 2012, Eric Faurot <eric@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 30 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ASYN_RESOLVER 3
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nm getnameinfo_async
 .Nd asynchronous resolver functions
 .Sh SYNOPSIS
-.Fd #include <asr.h>
+.In asr.h
 .Ft struct asr *
 .Fn async_resolver "const char *conf"
 .Ft void
diff --git a/lib/libc/compat-43/creat.3 b/lib/libc/compat-43/creat.3
index d10bd07870c..89719ec9af1 100644
--- a/lib/libc/compat-43/creat.3
+++ b/lib/libc/compat-43/creat.3
@@ -25,18 +25,18 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: creat.3,v 1.6 2007/05/31 19:19:27 jmc Exp $
+.\"	$OpenBSD: creat.3,v 1.7 2013/06/05 03:39:22 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt CREAT 3
 .Os
 .Sh NAME
 .Nm creat
 .Nd create a new file
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/stat.h>
-.Fd #include <fcntl.h>
+.In sys/types.h
+.In sys/stat.h
+.In fcntl.h
 .Ft int
 .Fn creat "const char *path" "mode_t mode"
 .Sh DESCRIPTION
diff --git a/lib/libc/compat-43/getdtablesize.3 b/lib/libc/compat-43/getdtablesize.3
index 520c41a7bea..ada55bba477 100644
--- a/lib/libc/compat-43/getdtablesize.3
+++ b/lib/libc/compat-43/getdtablesize.3
@@ -25,16 +25,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: getdtablesize.3,v 1.10 2007/05/31 19:19:27 jmc Exp $
+.\"	$OpenBSD: getdtablesize.3,v 1.11 2013/06/05 03:39:22 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETDTABLESIZE 3
 .Os
 .Sh NAME
 .Nm getdtablesize
 .Nd get descriptor table size
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft int
 .Fn getdtablesize void
 .Sh DESCRIPTION
diff --git a/lib/libc/compat-43/gethostid.3 b/lib/libc/compat-43/gethostid.3
index a1ef4c911ff..b6259db568a 100644
--- a/lib/libc/compat-43/gethostid.3
+++ b/lib/libc/compat-43/gethostid.3
@@ -25,9 +25,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: gethostid.3,v 1.11 2007/05/31 19:19:27 jmc Exp $
+.\"	$OpenBSD: gethostid.3,v 1.12 2013/06/05 03:39:22 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETHOSTID 3
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@
 .Nm sethostid
 .Nd get/set unique identifier of current host
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft long
 .Fn gethostid void
 .Ft int
diff --git a/lib/libc/compat-43/killpg.3 b/lib/libc/compat-43/killpg.3
index 1b3b7132b9f..94fda92ebcc 100644
--- a/lib/libc/compat-43/killpg.3
+++ b/lib/libc/compat-43/killpg.3
@@ -25,16 +25,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: killpg.3,v 1.11 2007/05/31 19:19:27 jmc Exp $
+.\"	$OpenBSD: killpg.3,v 1.12 2013/06/05 03:39:22 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt KILLPG 3
 .Os
 .Sh NAME
 .Nm killpg
 .Nd send signal to a process group
 .Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
 .Ft int
 .Fn killpg "pid_t pgrp" "int sig"
 .Sh DESCRIPTION
diff --git a/lib/libc/compat-43/sigblock.3 b/lib/libc/compat-43/sigblock.3
index 47b9182ac64..c6dfd6b4f28 100644
--- a/lib/libc/compat-43/sigblock.3
+++ b/lib/libc/compat-43/sigblock.3
@@ -25,16 +25,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: sigblock.3,v 1.14 2007/05/31 19:19:27 jmc Exp $
+.\"	$OpenBSD: sigblock.3,v 1.15 2013/06/05 03:39:22 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SIGBLOCK 3
 .Os
 .Sh NAME
 .Nm sigblock
 .Nd block signals
 .Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
 .Ft int
 .Fn sigblock "int mask"
 .Ft int
diff --git a/lib/libc/compat-43/sigpause.3 b/lib/libc/compat-43/sigpause.3
index 8499d804b94..3cc174c8440 100644
--- a/lib/libc/compat-43/sigpause.3
+++ b/lib/libc/compat-43/sigpause.3
@@ -25,16 +25,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: sigpause.3,v 1.12 2007/05/31 19:19:27 jmc Exp $
+.\"	$OpenBSD: sigpause.3,v 1.13 2013/06/05 03:39:22 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SIGPAUSE 3
 .Os
 .Sh NAME
 .Nm sigpause
 .Nd atomically release blocked signals and wait for interrupt
 .Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
 .Ft int
 .Fn sigpause "int sigmask"
 .Sh DESCRIPTION
diff --git a/lib/libc/compat-43/sigsetmask.3 b/lib/libc/compat-43/sigsetmask.3
index 42c00d39c9f..ab972181872 100644
--- a/lib/libc/compat-43/sigsetmask.3
+++ b/lib/libc/compat-43/sigsetmask.3
@@ -25,16 +25,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: sigsetmask.3,v 1.13 2007/05/31 19:19:27 jmc Exp $
+.\"	$OpenBSD: sigsetmask.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SIGSETMASK 3
 .Os
 .Sh NAME
 .Nm sigsetmask
 .Nd set current signal mask
 .Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
 .Ft int
 .Fn sigsetmask "int mask"
 .Fn sigmask "int signum"
diff --git a/lib/libc/compat-43/sigvec.3 b/lib/libc/compat-43/sigvec.3
index 05dca966761..9c959331776 100644
--- a/lib/libc/compat-43/sigvec.3
+++ b/lib/libc/compat-43/sigvec.3
@@ -25,16 +25,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: sigvec.3,v 1.30 2011/11/22 21:13:30 guenther Exp $
+.\"	$OpenBSD: sigvec.3,v 1.31 2013/06/05 03:39:22 tedu Exp $
 .\"
-.Dd $Mdocdate: November 22 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SIGVEC 3
 .Os
 .Sh NAME
 .Nm sigvec
 .Nd software signal facilities
 .Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
 .Bd -literal
 struct sigvec {
 	void	 (*sv_handler)();
diff --git a/lib/libc/crypt/arc4random.3 b/lib/libc/crypt/arc4random.3
index aa2e12fb48e..3cc26bbf185 100644
--- a/lib/libc/crypt/arc4random.3
+++ b/lib/libc/crypt/arc4random.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: arc4random.3,v 1.28 2012/07/26 18:39:48 naddy Exp $
+.\" $OpenBSD: arc4random.3,v 1.29 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
@@ -30,7 +30,7 @@
 .\"
 .\" Manual page, using -mandoc macros
 .\"
-.Dd $Mdocdate: July 26 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ARC4RANDOM 3
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm arc4random_addrandom
 .Nd arc4 random number generator
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft u_int32_t
 .Fn arc4random "void"
 .Ft void
diff --git a/lib/libc/crypt/blowfish.3 b/lib/libc/crypt/blowfish.3
index 4defaecc342..af988c16fbf 100644
--- a/lib/libc/crypt/blowfish.3
+++ b/lib/libc/crypt/blowfish.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: blowfish.3,v 1.20 2007/05/31 19:19:27 jmc Exp $
+.\" $OpenBSD: blowfish.3,v 1.21 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
@@ -30,7 +30,7 @@
 .\"
 .\" Manual page, using -mandoc macros
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt BLOWFISH 3
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@
 .Nm blf_cbc_decrypt
 .Nd Blowfish encryption
 .Sh SYNOPSIS
-.Fd #include <blf.h>
+.In blf.h
 .Ft void
 .Fn blf_key "blf_ctx *state" "const u_int8_t *key" "u_int16_t keylen"
 .Ft void
diff --git a/lib/libc/crypt/crypt.3 b/lib/libc/crypt/crypt.3
index c38710ac33b..ce1db8cae6e 100644
--- a/lib/libc/crypt/crypt.3
+++ b/lib/libc/crypt/crypt.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: crypt.3,v 1.31 2013/04/21 18:07:32 tedu Exp $
+.\" $OpenBSD: crypt.3,v 1.32 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" FreeSec: libcrypt
 .\"
@@ -31,7 +31,7 @@
 .\"
 .\" Manual page, using -mandoc macros
 .\"
-.Dd $Mdocdate: April 21 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt CRYPT 3
 .Os
 .Sh NAME
@@ -45,11 +45,11 @@
 .Nm md5crypt
 .Nd password hashing
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft int
 .Fn setkey "const char *key"
 .Pp
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft char *
 .Fn crypt "const char *key" "const char *setting"
 .Ft int
diff --git a/lib/libc/db/man/btree.3 b/lib/libc/db/man/btree.3
index 38b1361e52e..8b89622734d 100644
--- a/lib/libc/db/man/btree.3
+++ b/lib/libc/db/man/btree.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: btree.3,v 1.19 2007/05/31 19:19:27 jmc Exp $
+.\"	$OpenBSD: btree.3,v 1.20 2013/06/05 03:39:22 tedu Exp $
 .\"	$NetBSD: btree.3,v 1.6 1996/05/03 21:26:48 cgd Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -32,15 +32,15 @@
 .\"
 .\"	@(#)btree.3	8.4 (Berkeley) 8/18/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt BTREE 3
 .Os
 .Sh NAME
 .Nm btree
 .Nd btree database access method
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <db.h>
+.In sys/types.h
+.In db.h
 .Sh DESCRIPTION
 The
 .Fn dbopen
diff --git a/lib/libc/db/man/dbm.3 b/lib/libc/db/man/dbm.3
index b1d6a2f6df5..7a9c9602101 100644
--- a/lib/libc/db/man/dbm.3
+++ b/lib/libc/db/man/dbm.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dbm.3,v 1.11 2007/05/31 19:19:27 jmc Exp $
+.\" $OpenBSD: dbm.3,v 1.12 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1999 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt DBM 3
 .Os
 .Sh NAME
@@ -27,7 +27,7 @@
 .Nm nextkey
 .Nd database subroutines
 .Sh SYNOPSIS
-.Fd #include <dbm.h>
+.In dbm.h
 .Ft int
 .Fn dbminit "const char *file"
 .Ft int
diff --git a/lib/libc/db/man/dbopen.3 b/lib/libc/db/man/dbopen.3
index 888671ab3f1..9ea79defa5c 100644
--- a/lib/libc/db/man/dbopen.3
+++ b/lib/libc/db/man/dbopen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dbopen.3,v 1.25 2007/09/16 19:40:56 otto Exp $
+.\"	$OpenBSD: dbopen.3,v 1.26 2013/06/05 03:39:22 tedu Exp $
 .\"	$NetBSD: dbopen.3,v 1.6 1995/02/27 13:23:25 cgd Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -32,17 +32,17 @@
 .\"
 .\"	@(#)dbopen.3	8.5 (Berkeley) 1/2/94
 .\"
-.Dd $Mdocdate: September 16 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt DBOPEN 3
 .Os
 .Sh NAME
 .Nm dbopen
 .Nd database access methods
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <fcntl.h>
-.Fd #include <limits.h>
-.Fd #include <db.h>
+.In sys/types.h
+.In fcntl.h
+.In limits.h
+.In db.h
 .Ft DB *
 .Fn dbopen "const char *file" "int flags" "int mode" "DBTYPE type" "const void *openinfo"
 .Sh DESCRIPTION
diff --git a/lib/libc/db/man/hash.3 b/lib/libc/db/man/hash.3
index a47aac48ccc..3d024607cf9 100644
--- a/lib/libc/db/man/hash.3
+++ b/lib/libc/db/man/hash.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hash.3,v 1.15 2007/05/31 19:19:27 jmc Exp $
+.\"	$OpenBSD: hash.3,v 1.16 2013/06/05 03:39:22 tedu Exp $
 .\"	$NetBSD: hash.3,v 1.6 1996/05/03 21:26:50 cgd Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -32,15 +32,15 @@
 .\"
 .\"	@(#)hash.3	8.6 (Berkeley) 8/18/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt HASH 3
 .Os
 .Sh NAME
 .Nm hash
 .Nd hash database access method
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <db.h>
+.In sys/types.h
+.In db.h
 .Sh DESCRIPTION
 The routine
 .Fn dbopen
diff --git a/lib/libc/db/man/mpool.3 b/lib/libc/db/man/mpool.3
index 704939783d2..ed81fd95867 100644
--- a/lib/libc/db/man/mpool.3
+++ b/lib/libc/db/man/mpool.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mpool.3,v 1.15 2007/05/31 19:19:27 jmc Exp $
+.\"	$OpenBSD: mpool.3,v 1.16 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)mpool.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MPOOL 3
 .Os
 .Sh NAME
@@ -43,8 +43,8 @@
 .Nm mpool_close
 .Nd shared memory buffer pool
 .Sh SYNOPSIS
-.Fd #include <db.h>
-.Fd #include <mpool.h>
+.In db.h
+.In mpool.h
 .Ft MPOOL *
 .Fn mpool_open "void *key" "int fd" "pgno_t pagesize" "pgno_t maxcache"
 .Ft void
diff --git a/lib/libc/db/man/ndbm.3 b/lib/libc/db/man/ndbm.3
index 25424dec8eb..d004485a0a9 100644
--- a/lib/libc/db/man/ndbm.3
+++ b/lib/libc/db/man/ndbm.3
@@ -1,6 +1,6 @@
 .\" David Leonard, 1998. Placed in the public domain.
-.\" $OpenBSD: ndbm.3,v 1.16 2007/05/31 19:19:28 jmc Exp $
-.Dd $Mdocdate: May 31 2007 $
+.\" $OpenBSD: ndbm.3,v 1.17 2013/06/05 03:39:22 tedu Exp $
+.Dd $Mdocdate: June 5 2013 $
 .Dt NDBM 3
 .Os
 .Sh NAME
@@ -18,7 +18,7 @@
 .Nm dbm_store
 .Nd database access methods
 .Sh SYNOPSIS
-.Fd #include <ndbm.h>
+.In ndbm.h
 .Ft int
 .Fn dbm_clearerr "DBM *db"
 .Ft void
diff --git a/lib/libc/db/man/recno.3 b/lib/libc/db/man/recno.3
index 95b3d424203..9795b8defa8 100644
--- a/lib/libc/db/man/recno.3
+++ b/lib/libc/db/man/recno.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: recno.3,v 1.17 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: recno.3,v 1.18 2013/06/05 03:39:22 tedu Exp $
 .\"	$NetBSD: recno.3,v 1.6 1996/05/03 21:26:51 cgd Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -32,15 +32,15 @@
 .\"
 .\"	@(#)recno.3	8.5 (Berkeley) 8/18/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt RECNO 3
 .Os
 .Sh NAME
 .Nm recno
 .Nd record number database access method
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <db.h>
+.In sys/types.h
+.In db.h
 .Sh DESCRIPTION
 The
 .Fn dbopen
diff --git a/lib/libc/gen/alarm.3 b/lib/libc/gen/alarm.3
index 98476dae0bc..13f3d242847 100644
--- a/lib/libc/gen/alarm.3
+++ b/lib/libc/gen/alarm.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: alarm.3,v 1.11 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: alarm.3,v 1.12 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ALARM 3
 .Os
 .Sh NAME
 .Nm alarm
 .Nd set signal timer alarm
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft unsigned int
 .Fn alarm "unsigned int seconds"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/auth_subr.3 b/lib/libc/gen/auth_subr.3
index 9a0a20ad8a9..3bdc69abb08 100644
--- a/lib/libc/gen/auth_subr.3
+++ b/lib/libc/gen/auth_subr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: auth_subr.3,v 1.19 2009/07/15 07:53:56 schwarze Exp $
+.\"	$OpenBSD: auth_subr.3,v 1.20 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	BSDI $From: auth_subr.3,v 2.5 2000/03/30 19:11:27 polk Exp $
-.Dd $Mdocdate: July 15 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt BSD_AUTH 3
 .Os
 .Sh NAME
@@ -58,9 +58,9 @@
 .Nm auth_setstate
 .Nd interface to the BSD Authentication system
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <login_cap.h>
-.Fd #include <bsd_auth.h>
+.In sys/types.h
+.In login_cap.h
+.In bsd_auth.h
 .Ft auth_session_t *
 .Fn auth_open "void"
 .Ft int
diff --git a/lib/libc/gen/authenticate.3 b/lib/libc/gen/authenticate.3
index d892ed73f6f..2ef92e6f9f8 100644
--- a/lib/libc/gen/authenticate.3
+++ b/lib/libc/gen/authenticate.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: authenticate.3,v 1.13 2011/01/24 01:50:25 schwarze Exp $
+.\"	$OpenBSD: authenticate.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	BSDI $From: authenticate.3,v 2.7 1998/09/03 20:27:20 prb Exp $
-.Dd $Mdocdate: January 24 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt AUTHENTICATE 3
 .Os
 .Sh NAME
@@ -46,9 +46,9 @@
 .Nm auth_verify
 .Nd simplified interface to the BSD Authentication system
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <login_cap.h>
-.Fd #include <bsd_auth.h>
+.In sys/types.h
+.In login_cap.h
+.In bsd_auth.h
 .Ft int
 .Fn auth_userokay "char *name" "char *style" "char *type" "char *password"
 .Ft auth_session_t *
diff --git a/lib/libc/gen/basename.3 b/lib/libc/gen/basename.3
index a2845bbc73b..bba32356db4 100644
--- a/lib/libc/gen/basename.3
+++ b/lib/libc/gen/basename.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: basename.3,v 1.20 2007/05/31 19:19:28 jmc Exp $
+.\" $OpenBSD: basename.3,v 1.21 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -14,14 +14,14 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt BASENAME 3
 .Os
 .Sh NAME
 .Nm basename
 .Nd extract the base portion of a pathname
 .Sh SYNOPSIS
-.Fd #include <libgen.h>
+.In libgen.h
 .Ft char *
 .Fn basename "const char *path"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/clock.3 b/lib/libc/gen/clock.3
index 5c576bb9ea8..1d21746f597 100644
--- a/lib/libc/gen/clock.3
+++ b/lib/libc/gen/clock.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: clock.3,v 1.7 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: clock.3,v 1.8 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt CLOCK 3
 .Os
 .Sh NAME
 .Nm clock
 .Nd determine processor time used
 .Sh SYNOPSIS
-.Fd #include <time.h>
+.In time.h
 .Ft clock_t
 .Fn clock void
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3
index 7ca7554534a..b81f3976e02 100644
--- a/lib/libc/gen/confstr.3
+++ b/lib/libc/gen/confstr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: confstr.3,v 1.18 2013/03/02 07:02:31 jmc Exp $
+.\"	$OpenBSD: confstr.3,v 1.19 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 2 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt CONFSTR 3
 .Os
 .Sh NAME
 .Nm confstr
 .Nd get string-valued configurable variables
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft size_t
 .Fn confstr "int name" "char *buf" "size_t len"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/ctermid.3 b/lib/libc/gen/ctermid.3
index d334f6d495b..c6871bee17b 100644
--- a/lib/libc/gen/ctermid.3
+++ b/lib/libc/gen/ctermid.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ctermid.3,v 1.8 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: ctermid.3,v 1.9 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt CTERMID 3
 .Os
 .Sh NAME
 .Nm ctermid
 .Nd generate terminal pathname
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft char *
 .Fn ctermid "char *buf"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/ctype.3 b/lib/libc/gen/ctype.3
index e0ff87136e9..bc579c1af1e 100644
--- a/lib/libc/gen/ctype.3
+++ b/lib/libc/gen/ctype.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ctype.3,v 1.9 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: ctype.3,v 1.10 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991 Regents of the University of California.
 .\" All rights reserved.
@@ -28,14 +28,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt CTYPE 3
 .Os
 .Sh NAME
 .Nm ctype
 .Nd character classification macros
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn isalpha "int c"
 .Ft int
diff --git a/lib/libc/gen/daemon.3 b/lib/libc/gen/daemon.3
index 5a3b4df3d41..f221c0ede22 100644
--- a/lib/libc/gen/daemon.3
+++ b/lib/libc/gen/daemon.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: daemon.3,v 1.11 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: daemon.3,v 1.12 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt DAEMON 3
 .Os
 .Sh NAME
 .Nm daemon
 .Nd run in the background
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft int
 .Fn daemon "int nochdir" "int noclose"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/devname.3 b/lib/libc/gen/devname.3
index c9bf80fff56..4d626a4ee0b 100644
--- a/lib/libc/gen/devname.3
+++ b/lib/libc/gen/devname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: devname.3,v 1.7 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: devname.3,v 1.8 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,15 +27,15 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt DEVNAME 3
 .Os
 .Sh NAME
 .Nm devname
 .Nd get device name
 .Sh SYNOPSIS
-.Fd #include <sys/stat.h>
-.Fd #include <stdlib.h>
+.In sys/stat.h
+.In stdlib.h
 .Ft char *
 .Fn devname "dev_t dev" "mode_t type"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/directory.3 b/lib/libc/gen/directory.3
index 887d88a24c5..9866bfc5cb1 100644
--- a/lib/libc/gen/directory.3
+++ b/lib/libc/gen/directory.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: directory.3,v 1.21 2011/07/18 23:04:40 matthew Exp $
+.\"	$OpenBSD: directory.3,v 1.22 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 18 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt DIRECTORY 3
 .Os
 .Sh NAME
@@ -42,8 +42,8 @@
 .Nm dirfd
 .Nd directory operations
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <dirent.h>
+.In sys/types.h
+.In dirent.h
 .Ft DIR *
 .Fn opendir "const char *filename"
 .Ft DIR *
diff --git a/lib/libc/gen/dirname.3 b/lib/libc/gen/dirname.3
index 214943c45a9..6558a60d66f 100644
--- a/lib/libc/gen/dirname.3
+++ b/lib/libc/gen/dirname.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dirname.3,v 1.18 2010/04/01 17:06:55 jmc Exp $
+.\" $OpenBSD: dirname.3,v 1.19 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -14,14 +14,14 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 1 2010 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt DIRNAME 3
 .Os
 .Sh NAME
 .Nm dirname
 .Nd extract the directory portion of a pathname
 .Sh SYNOPSIS
-.Fd #include <libgen.h>
+.In libgen.h
 .Ft char *
 .Fn dirname "const char *path"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/err.3 b/lib/libc/gen/err.3
index 4a63bc04294..43439de5a3d 100644
--- a/lib/libc/gen/err.3
+++ b/lib/libc/gen/err.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: err.3,v 1.16 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: err.3,v 1.17 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ERR 3
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm vwarnx
 .Nd formatted error messages
 .Sh SYNOPSIS
-.Fd #include <err.h>
+.In err.h
 .Ft void
 .Fn err "int eval" "const char *fmt" "..."
 .Ft void
diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/exec.3
index 608efecbe4c..c8ad7bada88 100644
--- a/lib/libc/gen/exec.3
+++ b/lib/libc/gen/exec.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: exec.3,v 1.21 2012/03/21 23:20:35 matthew Exp $
+.\"	$OpenBSD: exec.3,v 1.22 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 21 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt EXEC 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm execvpe
 .Nd execute a file
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Vt extern char **environ;
 .Ft int
 .Fn execl "const char *path" "const char *arg" ...
diff --git a/lib/libc/gen/fabs.3 b/lib/libc/gen/fabs.3
index 14e6848136a..433edb9d673 100644
--- a/lib/libc/gen/fabs.3
+++ b/lib/libc/gen/fabs.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fabs.3,v 1.1 2011/07/08 22:58:54 martynas Exp $
+.\"	$OpenBSD: fabs.3,v 1.2 2013/06/05 03:39:22 tedu Exp $
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -29,7 +29,7 @@
 .\"
 .\"     from: @(#)fabs.3	5.1 (Berkeley) 5/2/91
 .\"
-.Dd $Mdocdate: July 8 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FABS 3
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Nm fabsl
 .Nd floating-point absolute value functions
 .Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
 .Ft double
 .Fn fabs "double x"
 .Ft float
diff --git a/lib/libc/gen/fnmatch.3 b/lib/libc/gen/fnmatch.3
index e5c437c9164..06b25b52964 100644
--- a/lib/libc/gen/fnmatch.3
+++ b/lib/libc/gen/fnmatch.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fnmatch.3,v 1.13 2009/03/05 15:13:30 millert Exp $
+.\"	$OpenBSD: fnmatch.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,14 +31,14 @@
 .\"
 .\"     @(#)fnmatch.3	8.3 (Berkeley) 4/28/95
 .\"
-.Dd $Mdocdate: March 5 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FNMATCH 3
 .Os
 .Sh NAME
 .Nm fnmatch
 .Nd match filename or pathname using shell globbing rules
 .Sh SYNOPSIS
-.Fd #include <fnmatch.h>
+.In fnmatch.h
 .Ft int
 .Fn fnmatch "const char *pattern" "const char *string" "int flags"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/fpgetmask.3 b/lib/libc/gen/fpgetmask.3
index d82233684de..8734e130682 100644
--- a/lib/libc/gen/fpgetmask.3
+++ b/lib/libc/gen/fpgetmask.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fpgetmask.3,v 1.8 2011/08/30 12:25:09 jmc Exp $
+.\"	$OpenBSD: fpgetmask.3,v 1.9 2013/06/05 03:39:22 tedu Exp $
 .\"	$NetBSD: fpgetmask.3,v 1.3 2001/09/16 02:57:03 wiz Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 30 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FPGETMASK 3
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nm fpsetsticky
 .Nd IEEE FP mode control
 .Sh SYNOPSIS
-.Fd #include <ieeefp.h>
+.In ieeefp.h
 .Ft fp_except
 .Fn fpgetmask void
 .Ft fp_rnd
diff --git a/lib/libc/gen/frexp.3 b/lib/libc/gen/frexp.3
index 2ba0daa8ce2..febe7457fc7 100644
--- a/lib/libc/gen/frexp.3
+++ b/lib/libc/gen/frexp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: frexp.3,v 1.12 2011/07/08 22:28:33 martynas Exp $
+.\"	$OpenBSD: frexp.3,v 1.13 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 8 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FREXP 3
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nm frexpl
 .Nd convert floating-point number to fractional and integral components
 .Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
 .Ft double
 .Fn frexp "double value" "int *exp"
 .Ft float
diff --git a/lib/libc/gen/ftok.3 b/lib/libc/gen/ftok.3
index 0acc227219d..cb9f63f6e75 100644
--- a/lib/libc/gen/ftok.3
+++ b/lib/libc/gen/ftok.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ftok.3,v 1.14 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: ftok.3,v 1.15 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
 .\" All rights reserved.
@@ -25,15 +25,15 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FTOK 3
 .Os
 .Sh NAME
 .Nm ftok
 .Nd create IPC identifier from a pathname
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/ipc.h>
+.In sys/types.h
+.In sys/ipc.h
 .Ft key_t
 .Fn ftok "const char *path" "int id"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index d6aedad85e0..64620e9239a 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fts.3,v 1.29 2012/01/01 13:32:25 schwarze Exp $
+.\"	$OpenBSD: fts.3,v 1.30 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,16 +29,16 @@
 .\"
 .\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
 .\"
-.Dd $Mdocdate: January 1 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FTS 3
 .Os
 .Sh NAME
 .Nm fts
 .Nd traverse a file hierarchy
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/stat.h>
-.Fd #include <fts.h>
+.In sys/types.h
+.In sys/stat.h
+.In fts.h
 .Ft FTS *
 .Fn fts_open "char * const *path_argv" "int options" "int (*compar)(const FTSENT **, const FTSENT **)"
 .Ft FTSENT *
diff --git a/lib/libc/gen/ftw.3 b/lib/libc/gen/ftw.3
index da40ddb7e5c..58b0d759721 100644
--- a/lib/libc/gen/ftw.3
+++ b/lib/libc/gen/ftw.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ftw.3,v 1.8 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: ftw.3,v 1.9 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -18,14 +18,14 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FTW 3
 .Os
 .Sh NAME
 .Nm ftw, nftw
 .Nd traverse (walk) a file tree
 .Sh SYNOPSIS
-.Fd #include <ftw.h>
+.In ftw.h
 .Ft int
 .Fo ftw
 .Fa "const char *path"
diff --git a/lib/libc/gen/getbsize.3 b/lib/libc/gen/getbsize.3
index 382cc501e0b..a740ae4a65d 100644
--- a/lib/libc/gen/getbsize.3
+++ b/lib/libc/gen/getbsize.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getbsize.3,v 1.9 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: getbsize.3,v 1.10 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETBSIZE 3
 .Os
 .Sh NAME
 .Nm getbsize
 .Nd get user block size
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft char *
 .Fn getbsize "int *headerlenp" "long *blocksizep"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3
index d5efaac4dea..f5a39516e42 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getcap.3,v 1.34 2011/09/14 15:29:15 jmc Exp $
+.\"	$OpenBSD: getcap.3,v 1.35 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 14 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETCAP 3
 .Os
 .Sh NAME
@@ -47,7 +47,7 @@
 .Nm cgetusedb
 .Nd capability database access routines
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft int
 .Fn cgetent "char **buf" "char **db_array" "const char *name"
 .Ft int
diff --git a/lib/libc/gen/getcwd.3 b/lib/libc/gen/getcwd.3
index c831a2da8ca..1b8a09094c9 100644
--- a/lib/libc/gen/getcwd.3
+++ b/lib/libc/gen/getcwd.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getcwd.3,v 1.12 2009/12/10 22:11:12 jmc Exp $
+.\"	$OpenBSD: getcwd.3,v 1.13 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 10 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETCWD 3
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@
 .Nm getwd
 .Nd get working directory pathname
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft char *
 .Fn getcwd "char *buf" "size_t size"
 .Ft char *
diff --git a/lib/libc/gen/getdiskbyname.3 b/lib/libc/gen/getdiskbyname.3
index 56ef268b336..c4b016a5efc 100644
--- a/lib/libc/gen/getdiskbyname.3
+++ b/lib/libc/gen/getdiskbyname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getdiskbyname.3,v 1.10 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: getdiskbyname.3,v 1.11 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,15 +27,15 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETDISKBYNAME 3
 .Os
 .Sh NAME
 .Nm getdiskbyname
 .Nd get generic disk description by its name
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/disklabel.h>
+.In sys/types.h
+.In sys/disklabel.h
 .Ft struct disklabel *
 .Fn getdiskbyname "const char *name"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/getdomainname.3 b/lib/libc/gen/getdomainname.3
index 297d552bd15..831643abdae 100644
--- a/lib/libc/gen/getdomainname.3
+++ b/lib/libc/gen/getdomainname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getdomainname.3,v 1.23 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: getdomainname.3,v 1.24 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETDOMAINNAME 3
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@
 .Nm setdomainname
 .Nd get/set YP domain name of current host
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft int
 .Fn getdomainname "char *name" "size_t namelen"
 .Ft int
diff --git a/lib/libc/gen/getfsent.3 b/lib/libc/gen/getfsent.3
index 4159caa3160..3c87fcf80e0 100644
--- a/lib/libc/gen/getfsent.3
+++ b/lib/libc/gen/getfsent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getfsent.3,v 1.11 2009/04/29 19:06:21 deraadt Exp $
+.\"	$OpenBSD: getfsent.3,v 1.12 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 29 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETFSENT 3
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Nm endfsent
 .Nd get file system descriptor file entry
 .Sh SYNOPSIS
-.Fd #include <fstab.h>
+.In fstab.h
 .Ft struct fstab *
 .Fn getfsent void
 .Ft struct fstab *
diff --git a/lib/libc/gen/getgrent.3 b/lib/libc/gen/getgrent.3
index f9fc9d9a15a..5c27ddaabc1 100644
--- a/lib/libc/gen/getgrent.3
+++ b/lib/libc/gen/getgrent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getgrent.3,v 1.16 2008/07/28 20:19:32 jmc Exp $
+.\"	$OpenBSD: getgrent.3,v 1.17 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 28 2008 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETGRENT 3
 .Os
 .Sh NAME
@@ -42,8 +42,8 @@
 .Nm endgrent
 .Nd group database operations
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <grp.h>
+.In sys/types.h
+.In grp.h
 .Ft struct group *
 .Fn getgrent void
 .Ft struct group *
diff --git a/lib/libc/gen/getgrouplist.3 b/lib/libc/gen/getgrouplist.3
index 18ec46f98c4..1a8a49c235b 100644
--- a/lib/libc/gen/getgrouplist.3
+++ b/lib/libc/gen/getgrouplist.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getgrouplist.3,v 1.16 2009/06/23 18:52:43 schwarze Exp $
+.\"	$OpenBSD: getgrouplist.3,v 1.17 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 23 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETGROUPLIST 3
 .Os
 .Sh NAME
 .Nm getgrouplist
 .Nd calculate group access list
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft int
 .Fn getgrouplist "const char *name" "gid_t basegid" "gid_t *groups" "int *ngroups"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/gethostname.3 b/lib/libc/gen/gethostname.3
index ca3f33a8a1e..f9dde6585c3 100644
--- a/lib/libc/gen/gethostname.3
+++ b/lib/libc/gen/gethostname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gethostname.3,v 1.23 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: gethostname.3,v 1.24 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETHOSTNAME 3
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@
 .Nm sethostname
 .Nd get/set name of current host
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft int
 .Fn gethostname "char *name" "size_t namelen"
 .Ft int
diff --git a/lib/libc/gen/getloadavg.3 b/lib/libc/gen/getloadavg.3
index 29fd1790235..81b2217911a 100644
--- a/lib/libc/gen/getloadavg.3
+++ b/lib/libc/gen/getloadavg.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getloadavg.3,v 1.12 2010/09/20 07:41:17 jmc Exp $
+.\"	$OpenBSD: getloadavg.3,v 1.13 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 20 2010 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETLOADAVG 3
 .Os
 .Sh NAME
 .Nm getloadavg
 .Nd get system load averages
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft int
 .Fn getloadavg "double loadavg[]" "int nelem"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/getmntinfo.3 b/lib/libc/gen/getmntinfo.3
index c7d1828a14f..db700758ef6 100644
--- a/lib/libc/gen/getmntinfo.3
+++ b/lib/libc/gen/getmntinfo.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getmntinfo.3,v 1.11 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: getmntinfo.3,v 1.12 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,15 +27,15 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETMNTINFO 3
 .Os
 .Sh NAME
 .Nm getmntinfo
 .Nd get information about mounted file systems
 .Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/mount.h>
+.In sys/param.h
+.In sys/mount.h
 .Ft int
 .Fn getmntinfo "struct statfs **mntbufp" "int flags"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/getnetgrent.3 b/lib/libc/gen/getnetgrent.3
index 7056f103c42..3e4b3b58224 100644
--- a/lib/libc/gen/getnetgrent.3
+++ b/lib/libc/gen/getnetgrent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getnetgrent.3,v 1.13 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: getnetgrent.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETNETGRENT 3
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nm endnetgrent
 .Nd netgroup database operations
 .Sh SYNOPSIS
-.Fd #include <netgroup.h>
+.In netgroup.h
 .Ft int
 .Fn getnetgrent "const char **host" "const char **user" "const char **domain"
 .Ft int
diff --git a/lib/libc/gen/getpagesize.3 b/lib/libc/gen/getpagesize.3
index 830e2a37900..6d0f95f594e 100644
--- a/lib/libc/gen/getpagesize.3
+++ b/lib/libc/gen/getpagesize.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpagesize.3,v 1.10 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: getpagesize.3,v 1.11 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETPAGESIZE 3
 .Os
 .Sh NAME
 .Nm getpagesize
 .Nd get system page size
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft int
 .Fn getpagesize void
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/getpass.3 b/lib/libc/gen/getpass.3
index bf450b3e80a..6cc72ba150b 100644
--- a/lib/libc/gen/getpass.3
+++ b/lib/libc/gen/getpass.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpass.3,v 1.13 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: getpass.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,15 +27,15 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETPASS 3
 .Os
 .Sh NAME
 .Nm getpass
 .Nd get a password
 .Sh SYNOPSIS
-.Fd #include <pwd.h>
-.Fd #include <unistd.h>
+.In pwd.h
+.In unistd.h
 .Ft char *
 .Fn getpass "const char *prompt"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3
index c0399f3215f..f305189368d 100644
--- a/lib/libc/gen/getpwent.3
+++ b/lib/libc/gen/getpwent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpwent.3,v 1.24 2009/06/01 21:52:03 millert Exp $
+.\"	$OpenBSD: getpwent.3,v 1.25 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 1 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETPWENT 3
 .Os
 .Sh NAME
@@ -36,8 +36,8 @@
 .Nm endpwent
 .Nd sequential password database access
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <pwd.h>
+.In sys/types.h
+.In pwd.h
 .Ft struct passwd *
 .Fn getpwent void
 .Ft void
diff --git a/lib/libc/gen/getpwnam.3 b/lib/libc/gen/getpwnam.3
index 87842cc8b42..93a317fcbd0 100644
--- a/lib/libc/gen/getpwnam.3
+++ b/lib/libc/gen/getpwnam.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpwnam.3,v 1.2 2009/06/02 05:09:16 jmc Exp $
+.\"	$OpenBSD: getpwnam.3,v 1.3 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 2 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETPWNAM 3
 .Os
 .Sh NAME
@@ -38,8 +38,8 @@
 .Nm setpassent
 .Nd password database operations
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <pwd.h>
+.In sys/types.h
+.In pwd.h
 .Ft struct passwd *
 .Fn getpwnam "const char *login"
 .Ft struct passwd *
diff --git a/lib/libc/gen/getttyent.3 b/lib/libc/gen/getttyent.3
index 7039f9e199d..4fbae12d2ec 100644
--- a/lib/libc/gen/getttyent.3
+++ b/lib/libc/gen/getttyent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getttyent.3,v 1.11 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: getttyent.3,v 1.12 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETTTYENT 3
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nm endttyent
 .Nd get ttys file entry
 .Sh SYNOPSIS
-.Fd #include <ttyent.h>
+.In ttyent.h
 .Ft struct ttyent *
 .Fn getttyent "void"
 .Ft struct ttyent *
diff --git a/lib/libc/gen/getusershell.3 b/lib/libc/gen/getusershell.3
index 14cd96f85ee..6f76e2eeace 100644
--- a/lib/libc/gen/getusershell.3
+++ b/lib/libc/gen/getusershell.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getusershell.3,v 1.13 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: getusershell.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETUSERSHELL 3
 .Os
 .Sh NAME
@@ -36,7 +36,7 @@
 .Nm endusershell
 .Nd get legal user shells
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft char *
 .Fn getusershell void
 .Ft void
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index ae75b98f3fd..2ba91e33e93 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: glob.3,v 1.30 2012/01/20 07:09:42 tedu Exp $
+.\"	$OpenBSD: glob.3,v 1.31 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 20 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GLOB 3
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nm globfree
 .Nd generate pathnames matching a pattern
 .Sh SYNOPSIS
-.Fd #include <glob.h>
+.In glob.h
 .Ft int
 .Fn glob "const char *pattern" "int flags" "const int (*errfunc)(const char *, int)" "glob_t *pglob"
 .Ft void
diff --git a/lib/libc/gen/initgroups.3 b/lib/libc/gen/initgroups.3
index 064c2e8d1fc..f1ef7e59b1a 100644
--- a/lib/libc/gen/initgroups.3
+++ b/lib/libc/gen/initgroups.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: initgroups.3,v 1.13 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: initgroups.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt INITGROUPS 3
 .Os
 .Sh NAME
 .Nm initgroups
 .Nd initialize supplementary group IDs
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft int
 .Fn initgroups "const char *name" "gid_t basegid"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/isalnum.3 b/lib/libc/gen/isalnum.3
index ecd3eb13c0b..2f06f31f5aa 100644
--- a/lib/libc/gen/isalnum.3
+++ b/lib/libc/gen/isalnum.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isalnum.3,v 1.8 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: isalnum.3,v 1.9 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISALNUM 3
 .Os
 .Sh NAME
 .Nm isalnum
 .Nd alphanumeric character test
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn isalnum "int c"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/isalpha.3 b/lib/libc/gen/isalpha.3
index 579ccf986b5..805f0994139 100644
--- a/lib/libc/gen/isalpha.3
+++ b/lib/libc/gen/isalpha.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isalpha.3,v 1.9 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: isalpha.3,v 1.10 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISALPHA 3
 .Os
 .Sh NAME
 .Nm isalpha
 .Nd alphabetic character test
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn isalpha "int c"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/isascii.3 b/lib/libc/gen/isascii.3
index a3b8d932553..fc0ba26615f 100644
--- a/lib/libc/gen/isascii.3
+++ b/lib/libc/gen/isascii.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isascii.3,v 1.10 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: isascii.3,v 1.11 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISASCII 3
 .Os
 .Sh NAME
 .Nm isascii
 .Nd ASCII character test
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn isascii "int c"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/isblank.3 b/lib/libc/gen/isblank.3
index e2a8dbc48b7..b30ce0aad71 100644
--- a/lib/libc/gen/isblank.3
+++ b/lib/libc/gen/isblank.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isblank.3,v 1.9 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: isblank.3,v 1.10 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISBLANK 3
 .Os
 .Sh NAME
 .Nm isblank
 .Nd blank-space character test
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn isblank "int c"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/iscntrl.3 b/lib/libc/gen/iscntrl.3
index 456df965ddd..94e006421dd 100644
--- a/lib/libc/gen/iscntrl.3
+++ b/lib/libc/gen/iscntrl.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: iscntrl.3,v 1.8 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: iscntrl.3,v 1.9 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISCNTRL 3
 .Os
 .Sh NAME
 .Nm iscntrl
 .Nd control character test
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn iscntrl "int c"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/isdigit.3 b/lib/libc/gen/isdigit.3
index 3cf03482138..3022a0066c0 100644
--- a/lib/libc/gen/isdigit.3
+++ b/lib/libc/gen/isdigit.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isdigit.3,v 1.8 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: isdigit.3,v 1.9 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISDIGIT 3
 .Os
 .Sh NAME
 .Nm isdigit
 .Nd decimal-digit character test
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn isdigit "int c"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/isfdtype.3 b/lib/libc/gen/isfdtype.3
index 28f3a34275d..1c0168a622e 100644
--- a/lib/libc/gen/isfdtype.3
+++ b/lib/libc/gen/isfdtype.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isfdtype.3,v 1.6 2011/04/24 08:15:29 jmc Exp $
+.\" $OpenBSD: isfdtype.3,v 1.7 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -18,14 +18,14 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd $Mdocdate: April 24 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISFDTYPE 3
 .Os
 .Sh NAME
 .Nm isfdtype
 .Nd "determine whether a file descriptor is of a specific type"
 .Sh SYNOPSIS
-.Fd #include <sys/stat.h>
+.In sys/stat.h
 .Ft int
 .Fn isfdtype "int fd" "int fdtype"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/isgraph.3 b/lib/libc/gen/isgraph.3
index cf4932efd22..fb2f1be14de 100644
--- a/lib/libc/gen/isgraph.3
+++ b/lib/libc/gen/isgraph.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isgraph.3,v 1.9 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: isgraph.3,v 1.10 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISGRAPH 3
 .Os
 .Sh NAME
 .Nm isgraph
 .Nd printing character test (space character exclusive)
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn isgraph "int c"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/islower.3 b/lib/libc/gen/islower.3
index 2d76e0a6420..a14a8e3617d 100644
--- a/lib/libc/gen/islower.3
+++ b/lib/libc/gen/islower.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: islower.3,v 1.9 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: islower.3,v 1.10 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISLOWER 3
 .Os
 .Sh NAME
 .Nm islower
 .Nd lower-case character test
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn islower "int c"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/isprint.3 b/lib/libc/gen/isprint.3
index 02e1be4d49c..29b52109504 100644
--- a/lib/libc/gen/isprint.3
+++ b/lib/libc/gen/isprint.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isprint.3,v 1.8 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: isprint.3,v 1.9 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISPRINT 3
 .Os
 .Sh NAME
 .Nm isprint
 .Nd printing character test (space character inclusive)
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn isprint "int c"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/ispunct.3 b/lib/libc/gen/ispunct.3
index b2c723f8596..7cd2ae29312 100644
--- a/lib/libc/gen/ispunct.3
+++ b/lib/libc/gen/ispunct.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ispunct.3,v 1.8 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: ispunct.3,v 1.9 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISPUNCT 3
 .Os
 .Sh NAME
 .Nm ispunct
 .Nd punctuation character test
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn ispunct "int c"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/isspace.3 b/lib/libc/gen/isspace.3
index 6b8ccf29c78..ee973d5e98e 100644
--- a/lib/libc/gen/isspace.3
+++ b/lib/libc/gen/isspace.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isspace.3,v 1.10 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: isspace.3,v 1.11 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISSPACE 3
 .Os
 .Sh NAME
 .Nm isspace
 .Nd whitespace character test
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn isspace "int c"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/isupper.3 b/lib/libc/gen/isupper.3
index 673821eae6c..02e42cfcfa7 100644
--- a/lib/libc/gen/isupper.3
+++ b/lib/libc/gen/isupper.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isupper.3,v 1.10 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: isupper.3,v 1.11 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISUPPER 3
 .Os
 .Sh NAME
 .Nm isupper
 .Nd upper-case character test
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn isupper "int c"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/isxdigit.3 b/lib/libc/gen/isxdigit.3
index b369208f5d7..6ef3cc8f19d 100644
--- a/lib/libc/gen/isxdigit.3
+++ b/lib/libc/gen/isxdigit.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isxdigit.3,v 1.8 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: isxdigit.3,v 1.9 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISXDIGIT 3
 .Os
 .Sh NAME
 .Nm isxdigit
 .Nd hexadecimal-digit character test
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn isxdigit "int c"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/ldexp.3 b/lib/libc/gen/ldexp.3
index 8c7352384df..01d471dc672 100644
--- a/lib/libc/gen/ldexp.3
+++ b/lib/libc/gen/ldexp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ldexp.3,v 1.7 2011/07/07 13:30:28 jmc Exp $
+.\"	$OpenBSD: ldexp.3,v 1.8 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 7 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt LDEXP 3
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nm ldexpl
 .Nd multiply floating-point number by integral power of 2
 .Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
 .Ft double
 .Fn ldexp "double x" "int exp"
 .Ft float
diff --git a/lib/libc/gen/lockf.3 b/lib/libc/gen/lockf.3
index 2ccc2b21705..fa802a6f6c4 100644
--- a/lib/libc/gen/lockf.3
+++ b/lib/libc/gen/lockf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lockf.3,v 1.12 2008/06/26 05:42:05 ray Exp $
+.\"	$OpenBSD: lockf.3,v 1.13 2013/06/05 03:39:22 tedu Exp $
 .\"	$NetBSD: lockf.3,v 1.1 1997/12/20 20:23:17 kleink Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -28,14 +28,14 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 26 2008 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt LOCKF 3
 .Os
 .Sh NAME
 .Nm lockf
 .Nd record locking on files
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft int
 .Fn lockf "int filedes" "int function" "off_t size"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/login_cap.3 b/lib/libc/gen/login_cap.3
index da839f51b7c..fefc44a3c6c 100644
--- a/lib/libc/gen/login_cap.3
+++ b/lib/libc/gen/login_cap.3
@@ -29,10 +29,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $OpenBSD: login_cap.3,v 1.15 2007/05/31 19:19:28 jmc Exp $
+.\" $OpenBSD: login_cap.3,v 1.16 2013/06/05 03:39:22 tedu Exp $
 .\" BSDI $From: login_cap.3,v 1.4 1997/11/07 16:22:27 jch Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt LOGIN_CAP 3
 .Os
 .Sh NAME
@@ -49,8 +49,8 @@
 .Nm setusercontext
 .Nd query login.conf database about a user class
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <login_cap.h>
+.In sys/types.h
+.In login_cap.h
 .Ft login_cap_t *
 .Fn login_getclass "char *class"
 .Ft char *
diff --git a/lib/libc/gen/modf.3 b/lib/libc/gen/modf.3
index 92d39502ec7..2fe1b98f60b 100644
--- a/lib/libc/gen/modf.3
+++ b/lib/libc/gen/modf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: modf.3,v 1.11 2011/07/08 22:48:19 martynas Exp $
+.\"	$OpenBSD: modf.3,v 1.12 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 8 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MODF 3
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nm modfl
 .Nd extract signed integral and fractional values from floating-point number
 .Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
 .Ft double
 .Fn modf "double value" "double *iptr"
 .Ft float
diff --git a/lib/libc/gen/nice.3 b/lib/libc/gen/nice.3
index 4b2b97d37d7..aa6ff97a54f 100644
--- a/lib/libc/gen/nice.3
+++ b/lib/libc/gen/nice.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nice.3,v 1.16 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: nice.3,v 1.17 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt NICE 3
 .Os
 .Sh NAME
 .Nm nice
 .Nd change process scheduling priority
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft int
 .Fn nice "int incr"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/nlist.3 b/lib/libc/gen/nlist.3
index ab018b9d5ea..2caafea0289 100644
--- a/lib/libc/gen/nlist.3
+++ b/lib/libc/gen/nlist.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nlist.3,v 1.10 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: nlist.3,v 1.11 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt NLIST 3
 .Os
 .Sh NAME
 .Nm nlist
 .Nd retrieve symbol table name list from an executable file
 .Sh SYNOPSIS
-.Fd #include <nlist.h>
+.In nlist.h
 .Ft int
 .Fn nlist "const char *filename" "struct nlist *nl"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/pause.3 b/lib/libc/gen/pause.3
index 86cdf36ddef..0a65363e20c 100644
--- a/lib/libc/gen/pause.3
+++ b/lib/libc/gen/pause.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pause.3,v 1.11 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: pause.3,v 1.12 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt PAUSE 3
 .Os
 .Sh NAME
 .Nm pause
 .Nd stop until signal
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft int
 .Fn pause void
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/popen.3 b/lib/libc/gen/popen.3
index df1a8759a6f..78ef1d608f2 100644
--- a/lib/libc/gen/popen.3
+++ b/lib/libc/gen/popen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: popen.3,v 1.16 2008/04/04 19:30:41 kurt Exp $
+.\"	$OpenBSD: popen.3,v 1.17 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 4 2008 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt POPEN 3
 .Os
 .Sh NAME
@@ -36,7 +36,7 @@
 .Nd process
 .Tn I/O
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft FILE *
 .Fn popen "const char *command" "const char *type"
 .Ft int
diff --git a/lib/libc/gen/psignal.3 b/lib/libc/gen/psignal.3
index aa2ff110c83..24972b156cd 100644
--- a/lib/libc/gen/psignal.3
+++ b/lib/libc/gen/psignal.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: psignal.3,v 1.12 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: psignal.3,v 1.13 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt PSIGNAL 3
 .Os
 .Sh NAME
@@ -36,7 +36,7 @@
 .Nm sys_signame
 .Nd system signal messages
 .Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
 .Ft void
 .Fn psignal "unsigned int sig" "const char *s"
 .Vt extern char *sys_siglist[];
diff --git a/lib/libc/gen/pw_dup.3 b/lib/libc/gen/pw_dup.3
index 3d2a9916157..b2617074808 100644
--- a/lib/libc/gen/pw_dup.3
+++ b/lib/libc/gen/pw_dup.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pw_dup.3,v 1.7 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: pw_dup.3,v 1.8 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -14,14 +14,14 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt PW_DUP 3
 .Os
 .Sh NAME
 .Nm pw_dup
 .Nd make a copy of a struct passwd
 .Sh SYNOPSIS
-.Fd #include <pwd.h>
+.In pwd.h
 .Ft struct passwd *
 .Fn pw_dup "const struct passwd *pw"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/pwcache.3 b/lib/libc/gen/pwcache.3
index 703da3a32de..8356e053ff7 100644
--- a/lib/libc/gen/pwcache.3
+++ b/lib/libc/gen/pwcache.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pwcache.3,v 1.10 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: pwcache.3,v 1.11 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,15 +27,15 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt PWCACHE 3
 .Os
 .Sh NAME
 .Nm pwcache
 .Nd cache password and group entries
 .Sh SYNOPSIS
-.Fd #include <grp.h>
-.Fd #include <pwd.h>
+.In grp.h
+.In pwd.h
 .Ft char *
 .Fn user_from_uid "uid_t uid" "int nouser"
 .Ft char *
diff --git a/lib/libc/gen/raise.3 b/lib/libc/gen/raise.3
index abb9738bdcb..f6d3a479160 100644
--- a/lib/libc/gen/raise.3
+++ b/lib/libc/gen/raise.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: raise.3,v 1.9 2012/11/10 03:51:41 guenther Exp $
+.\"	$OpenBSD: raise.3,v 1.10 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 10 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt RAISE 3
 .Os
 .Sh NAME
 .Nm raise
 .Nd send a signal to the current thread
 .Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
 .Ft int
 .Fn raise "int sig"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/readpassphrase.3 b/lib/libc/gen/readpassphrase.3
index d903ba53ce8..cf9fa69eb20 100644
--- a/lib/libc/gen/readpassphrase.3
+++ b/lib/libc/gen/readpassphrase.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: readpassphrase.3,v 1.17 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: readpassphrase.3,v 1.18 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -18,14 +18,14 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt READPASSPHRASE 3
 .Os
 .Sh NAME
 .Nm readpassphrase
 .Nd get a passphrase from the user
 .Sh SYNOPSIS
-.Fd #include <readpassphrase.h>
+.In readpassphrase.h
 .Ft char *
 .Fn readpassphrase "const char *prompt" "char *buf" "size_t bufsiz" "int flags"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3
index 20c2ab7f005..c2714e6799a 100644
--- a/lib/libc/gen/scandir.3
+++ b/lib/libc/gen/scandir.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scandir.3,v 1.12 2012/11/29 02:15:44 guenther Exp $
+.\"	$OpenBSD: scandir.3,v 1.13 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 29 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SCANDIR 3
 .Os
 .Sh NAME
@@ -35,8 +35,8 @@
 .Nm alphasort
 .Nd scan a directory
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <dirent.h>
+.In sys/types.h
+.In dirent.h
 .Ft int
 .Fn scandir "const char *dirname" "struct dirent ***namelist" "int \*(lp*select\*(rp\*(lpconst struct dirent *\*(rp" "int \*(lp*compar\*(rp\*(lpconst struct dirent **, const struct dirent **\*(rp"
 .Ft int
diff --git a/lib/libc/gen/setjmp.3 b/lib/libc/gen/setjmp.3
index edc6a639e1e..4ecc7ab50f7 100644
--- a/lib/libc/gen/setjmp.3
+++ b/lib/libc/gen/setjmp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: setjmp.3,v 1.22 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: setjmp.3,v 1.23 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SETJMP 3
 .Os
 .Sh NAME
@@ -44,7 +44,7 @@
 .Nm longjmperror
 .Nd non-local jumps
 .Sh SYNOPSIS
-.Fd #include <setjmp.h>
+.In setjmp.h
 .Ft int
 .Fn sigsetjmp "sigjmp_buf env" "int savemask"
 .Ft void
diff --git a/lib/libc/gen/setmode.3 b/lib/libc/gen/setmode.3
index f1acc9a931e..d54ca2e4c49 100644
--- a/lib/libc/gen/setmode.3
+++ b/lib/libc/gen/setmode.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: setmode.3,v 1.13 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: setmode.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SETMODE 3
 .Os
 .Sh NAME
@@ -35,7 +35,7 @@
 .Nm setmode
 .Nd modify mode bits
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft mode_t
 .Fn getmode "const void *set" "mode_t mode"
 .Ft void *
diff --git a/lib/libc/gen/setproctitle.3 b/lib/libc/gen/setproctitle.3
index 9886210857b..1eef7d0ed68 100644
--- a/lib/libc/gen/setproctitle.3
+++ b/lib/libc/gen/setproctitle.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: setproctitle.3,v 1.17 2013/05/31 20:59:23 ajacoutot Exp $
+.\"	$OpenBSD: setproctitle.3,v 1.18 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1994, 1995 Christopher G. Demetriou
 .\" All rights reserved.
@@ -29,14 +29,14 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SETPROCTITLE 3
 .Os
 .Sh NAME
 .Nm setproctitle
 .Nd set process title
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft void
 .Fn setproctitle "const char *fmt" "..."
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/siginterrupt.3 b/lib/libc/gen/siginterrupt.3
index 0e3496fc54d..68d2e038cbd 100644
--- a/lib/libc/gen/siginterrupt.3
+++ b/lib/libc/gen/siginterrupt.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: siginterrupt.3,v 1.13 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: siginterrupt.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SIGINTERRUPT 3
 .Os
 .Sh NAME
 .Nm siginterrupt
 .Nd allow signals to interrupt system calls
 .Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
 .Ft int
 .Fn siginterrupt "int sig" "int flag"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/signal.3 b/lib/libc/gen/signal.3
index 51e13b51c84..c5e837541f2 100644
--- a/lib/libc/gen/signal.3
+++ b/lib/libc/gen/signal.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: signal.3,v 1.40 2013/04/22 21:33:16 tobias Exp $
+.\"	$OpenBSD: signal.3,v 1.41 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 22 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SIGNAL 3
 .Os
 .Sh NAME
 .Nm signal
 .Nd simplified software signal facilities
 .Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
 .\" The following is Quite Ugly, but syntactically correct.
 .\" Don't try to fix it.
 .Ft void
diff --git a/lib/libc/gen/sigsetops.3 b/lib/libc/gen/sigsetops.3
index 233c81e7129..c2db584ce22 100644
--- a/lib/libc/gen/sigsetops.3
+++ b/lib/libc/gen/sigsetops.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sigsetops.3,v 1.10 2007/05/31 19:19:28 jmc Exp $
+.\"	$OpenBSD: sigsetops.3,v 1.11 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SIGSETOPS 3
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Nm sigismember
 .Nd manipulate signal sets
 .Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
 .Ft int
 .Fn sigemptyset "sigset_t *set"
 .Ft int
diff --git a/lib/libc/gen/sleep.3 b/lib/libc/gen/sleep.3
index a112aded241..158c69d43dd 100644
--- a/lib/libc/gen/sleep.3
+++ b/lib/libc/gen/sleep.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sleep.3,v 1.12 2012/10/16 18:35:40 millert Exp $
+.\"	$OpenBSD: sleep.3,v 1.13 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 16 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SLEEP 3
 .Os
 .Sh NAME
 .Nm sleep
 .Nd suspend process execution for interval measured in seconds
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft unsigned int
 .Fn sleep "unsigned int seconds"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/statvfs.3 b/lib/libc/gen/statvfs.3
index e544d787c7d..c0ab284d9c0 100644
--- a/lib/libc/gen/statvfs.3
+++ b/lib/libc/gen/statvfs.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: statvfs.3,v 1.5 2008/03/26 09:37:59 jmc Exp $
+.\"	$OpenBSD: statvfs.3,v 1.6 2013/06/05 03:39:22 tedu Exp $
 .\"	$NetBSD: statfs.2,v 1.10 1995/06/29 11:40:48 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)statfs.2	8.3 (Berkeley) 2/11/94
 .\"
-.Dd $Mdocdate: March 26 2008 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STATVFS 3
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Nm fstatvfs
 .Nd get file system statistics
 .Sh SYNOPSIS
-.Fd #include <sys/statvfs.h>
+.In sys/statvfs.h
 .Ft int
 .Fn statvfs "const char *path" "struct statvfs *buf"
 .Ft int
diff --git a/lib/libc/gen/strtofflags.3 b/lib/libc/gen/strtofflags.3
index 940a58ad765..c9e71040615 100644
--- a/lib/libc/gen/strtofflags.3
+++ b/lib/libc/gen/strtofflags.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strtofflags.3,v 1.6 2007/05/31 19:19:28 jmc Exp $
+.\" $OpenBSD: strtofflags.3,v 1.7 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -30,7 +30,7 @@
 .\"     @(#)setmode.3	8.2 (Berkeley) 4/28/95
 .\" $FreeBSD: src/lib/libc/gen/strtofflags.3,v 1.5 2000/06/17 11:09:24 joe Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRTOFFLAGS 3
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Nm strtofflags
 .Nd convert between file flag bits and their string names
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft char *
 .Fn fflagstostr "u_int32_t flags"
 .Ft int
diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3
index 76400bc91c2..4d00fdf2a7c 100644
--- a/lib/libc/gen/sysconf.3
+++ b/lib/libc/gen/sysconf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysconf.3,v 1.31 2012/09/26 02:43:51 brad Exp $
+.\"	$OpenBSD: sysconf.3,v 1.32 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 26 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SYSCONF 3
 .Os
 .Sh NAME
 .Nm sysconf
 .Nd get configurable system variables
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft long
 .Fn sysconf "int name"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index 35add01daaf..f658c7f78ad 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sysctl.3,v 1.220 2013/06/02 21:37:03 yasuoka Exp $
+.\"	$OpenBSD: sysctl.3,v 1.221 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,15 +27,15 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 2 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SYSCTL 3
 .Os
 .Sh NAME
 .Nm sysctl
 .Nd get or set system information
 .Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/sysctl.h>
+.In sys/param.h
+.In sys/sysctl.h
 .Ft int
 .Fn sysctl "int *name" "u_int namelen" "void *oldp" "size_t *oldlenp" "void *newp" "size_t newlen"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3
index a7114b45451..aa5a9b6978b 100644
--- a/lib/libc/gen/syslog.3
+++ b/lib/libc/gen/syslog.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: syslog.3,v 1.30 2013/06/01 16:57:51 espie Exp $
+.\"	$OpenBSD: syslog.3,v 1.31 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 1 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SYSLOG 3
 .Os
 .Sh NAME
@@ -43,8 +43,8 @@
 .Nm setlogmask_r
 .Nd control system log
 .Sh SYNOPSIS
-.Fd #include <syslog.h>
-.Fd #include <stdarg.h>
+.In syslog.h
+.In stdarg.h
 .Ft void
 .Fn syslog "int priority" "const char *message" "..."
 .Ft void
diff --git a/lib/libc/gen/time.3 b/lib/libc/gen/time.3
index 4f3af415ddd..a95d6c4f9ad 100644
--- a/lib/libc/gen/time.3
+++ b/lib/libc/gen/time.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: time.3,v 1.13 2013/04/19 16:12:05 tedu Exp $
+.\"	$OpenBSD: time.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 19 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TIME 3
 .Os
 .Sh NAME
 .Nm time
 .Nd get time of day
 .Sh SYNOPSIS
-.Fd #include <time.h>
+.In time.h
 .Ft time_t
 .Fn time "time_t *tloc"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/times.3 b/lib/libc/gen/times.3
index 4019cf08f42..db05d178036 100644
--- a/lib/libc/gen/times.3
+++ b/lib/libc/gen/times.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: times.3,v 1.12 2007/05/31 19:19:29 jmc Exp $
+.\"	$OpenBSD: times.3,v 1.13 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TIMES 3
 .Os
 .Sh NAME
 .Nm times
 .Nd process times
 .Sh SYNOPSIS
-.Fd #include <sys/times.h>
+.In sys/times.h
 .Ft clock_t
 .Fn times "struct tms *tp"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/timezone.3 b/lib/libc/gen/timezone.3
index e543f8c9a34..3ae50a2e224 100644
--- a/lib/libc/gen/timezone.3
+++ b/lib/libc/gen/timezone.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: timezone.3,v 1.14 2007/05/31 19:19:29 jmc Exp $
+.\"	$OpenBSD: timezone.3,v 1.15 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TIMEZONE 3
 .Os
 .Sh NAME
 .Nm timezone
 .Nd return the time zone abbreviation
 .Sh SYNOPSIS
-.Fd #include <time.h>
+.In time.h
 .Ft char *
 .Fn timezone "int zone" "int dst"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/toascii.3 b/lib/libc/gen/toascii.3
index 738b254e4f0..7ca0d148e92 100644
--- a/lib/libc/gen/toascii.3
+++ b/lib/libc/gen/toascii.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: toascii.3,v 1.7 2007/05/31 19:19:29 jmc Exp $
+.\"	$OpenBSD: toascii.3,v 1.8 2013/06/05 03:39:22 tedu Exp $
 .\"	$NetBSD: toascii.3,v 1.2 1997/07/16 06:20:20 mikel Exp $
 .\"
 .\" Copyright (c) 1993
@@ -30,14 +30,14 @@
 .\"
 .\"	@(#)toascii.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TOASCII 3
 .Os
 .Sh NAME
 .Nm toascii
 .Nd convert a byte to 7-bit ASCII
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn toascii "int c"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/tolower.3 b/lib/libc/gen/tolower.3
index 77ed3a287ae..a02d395dce5 100644
--- a/lib/libc/gen/tolower.3
+++ b/lib/libc/gen/tolower.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tolower.3,v 1.12 2012/11/23 22:54:08 guenther Exp $
+.\"	$OpenBSD: tolower.3,v 1.13 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 23 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TOLOWER 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm _tolower
 .Nd upper case to lower case letter conversion
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn tolower "int c"
 .Ft int
diff --git a/lib/libc/gen/toupper.3 b/lib/libc/gen/toupper.3
index 5eae1357300..a2aee335926 100644
--- a/lib/libc/gen/toupper.3
+++ b/lib/libc/gen/toupper.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: toupper.3,v 1.14 2012/11/23 22:54:08 guenther Exp $
+.\"	$OpenBSD: toupper.3,v 1.15 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 23 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TOUPPER 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm _toupper
 .Nd lower case to upper case letter conversion
 .Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
 .Ft int
 .Fn toupper "int c"
 .Ft int
diff --git a/lib/libc/gen/ttyname.3 b/lib/libc/gen/ttyname.3
index 420fa423d7d..3c73db18d14 100644
--- a/lib/libc/gen/ttyname.3
+++ b/lib/libc/gen/ttyname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ttyname.3,v 1.17 2007/07/03 14:45:34 jmc Exp $
+.\"	$OpenBSD: ttyname.3,v 1.18 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 3 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TTYNAME 3
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nm ttyslot
 .Nd get name of associated terminal (tty) from file descriptor
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft char *
 .Fn ttyname "int fd"
 .Ft int
diff --git a/lib/libc/gen/ualarm.3 b/lib/libc/gen/ualarm.3
index 17947d69a68..4d6ed221c2a 100644
--- a/lib/libc/gen/ualarm.3
+++ b/lib/libc/gen/ualarm.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ualarm.3,v 1.15 2007/05/31 19:19:29 jmc Exp $
+.\"	$OpenBSD: ualarm.3,v 1.16 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt UALARM 3
 .Os
 .Sh NAME
 .Nm ualarm
 .Nd schedule signal after specified time
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft useconds_t
 .Fn ualarm "useconds_t microseconds" "useconds_t interval"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3
index a7d6689221a..0c3e259b528 100644
--- a/lib/libc/gen/uname.3
+++ b/lib/libc/gen/uname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uname.3,v 1.13 2011/04/19 22:19:46 schwarze Exp $
+.\"	$OpenBSD: uname.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 19 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt UNAME 3
 .Os
 .Sh NAME
 .Nm uname
 .Nd get system identification
 .Sh SYNOPSIS
-.Fd #include <sys/utsname.h>
+.In sys/utsname.h
 .Ft int
 .Fn uname "struct utsname *name"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/unvis.3 b/lib/libc/gen/unvis.3
index ddce3c714dd..e7d80fc5e74 100644
--- a/lib/libc/gen/unvis.3
+++ b/lib/libc/gen/unvis.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: unvis.3,v 1.16 2007/05/31 19:19:29 jmc Exp $
+.\"	$OpenBSD: unvis.3,v 1.17 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt UNVIS 3
 .Os
 .Sh NAME
@@ -36,7 +36,7 @@
 .Nm strnunvis
 .Nd decode a visual representation of characters
 .Sh SYNOPSIS
-.Fd #include <vis.h>
+.In vis.h
 .Ft int
 .Fn unvis "char *cp" "char c" "int *astate" "int flag"
 .Ft int
diff --git a/lib/libc/gen/usleep.3 b/lib/libc/gen/usleep.3
index e282cce13a0..d61af71212c 100644
--- a/lib/libc/gen/usleep.3
+++ b/lib/libc/gen/usleep.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: usleep.3,v 1.18 2012/10/16 18:35:40 millert Exp $
+.\"	$OpenBSD: usleep.3,v 1.19 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 16 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt USLEEP 3
 .Os
 .Sh NAME
 .Nm usleep
 .Nd suspend process execution for interval measured in microseconds
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft int
 .Fn usleep "useconds_t microseconds"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/utime.3 b/lib/libc/gen/utime.3
index 5d8815b7e78..ed83890a1eb 100644
--- a/lib/libc/gen/utime.3
+++ b/lib/libc/gen/utime.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: utime.3,v 1.18 2007/05/31 19:19:29 jmc Exp $
+.\"	$OpenBSD: utime.3,v 1.19 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,15 +27,15 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt UTIME 3
 .Os
 .Sh NAME
 .Nm utime
 .Nd set file times
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <utime.h>
+.In sys/types.h
+.In utime.h
 .Ft int
 .Fn utime "const char *file" "const struct utimbuf *timep"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/valloc.3 b/lib/libc/gen/valloc.3
index cea59620988..279a232ad9a 100644
--- a/lib/libc/gen/valloc.3
+++ b/lib/libc/gen/valloc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: valloc.3,v 1.13 2010/05/18 22:24:55 tedu Exp $
+.\"	$OpenBSD: valloc.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 18 2010 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt VALLOC 3
 .Os
 .Sh NAME
 .Nm valloc
 .Nd aligned memory allocation function
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft void *
 .Fn valloc "size_t size"
 .Sh DESCRIPTION
diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
index ca87c8f968b..be9100e5e7a 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vis.3,v 1.29 2012/01/16 04:10:36 guenther Exp $
+.\"	$OpenBSD: vis.3,v 1.30 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 16 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt VIS 3
 .Os
 .Sh NAME
@@ -37,8 +37,8 @@
 .Nm strvisx
 .Nd visually encode characters
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
-.Fd #include <vis.h>
+.In stdlib.h
+.In vis.h
 .Ft char *
 .Fn vis "char *dst" "int c" "int flag" "int nextc"
 .Ft int
diff --git a/lib/libc/hash/mdX.3 b/lib/libc/hash/mdX.3
index 00e59d01abe..a4e66513e49 100644
--- a/lib/libc/hash/mdX.3
+++ b/lib/libc/hash/mdX.3
@@ -6,9 +6,9 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" 	$OpenBSD: mdX.3,v 1.13 2012/09/27 11:31:57 jmc Exp $
+.\" 	$OpenBSD: mdX.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
 .\"
-.Dd $Mdocdate: September 27 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MDX 3
 .Os
 .Sh NAME
@@ -23,8 +23,8 @@
 .Nm MDXData
 .Nd calculate the RSA Data Security, Inc., ``MDX'' message digest
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <mdX.h>
+.In sys/types.h
+.In mdX.h
 .Ft void
 .Fn MDXInit "MDX_CTX *context"
 .Ft void
diff --git a/lib/libc/hash/rmd160.3 b/lib/libc/hash/rmd160.3
index b6467c5a216..d2f848bf851 100644
--- a/lib/libc/hash/rmd160.3
+++ b/lib/libc/hash/rmd160.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rmd160.3,v 1.30 2010/07/13 07:01:23 jmc Exp $
+.\"	$OpenBSD: rmd160.3,v 1.31 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1997, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -17,7 +17,7 @@
 .\" See http://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html
 .\"	for detailed information about RIPEMD-160.
 .\"
-.Dd $Mdocdate: July 13 2010 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt RMD160 3
 .Os
 .Sh NAME
@@ -32,8 +32,8 @@
 .Nm RMD160Data
 .Nd calculate the ``RIPEMD-160'' message digest
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <rmd160.h>
+.In sys/types.h
+.In rmd160.h
 .Ft void
 .Fn RMD160Init "RMD160_CTX *context"
 .Ft void
diff --git a/lib/libc/hash/sha1.3 b/lib/libc/hash/sha1.3
index 26582ec6af3..70fab8be996 100644
--- a/lib/libc/hash/sha1.3
+++ b/lib/libc/hash/sha1.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sha1.3,v 1.38 2012/09/27 11:31:57 jmc Exp $
+.\"	$OpenBSD: sha1.3,v 1.39 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1997, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -17,7 +17,7 @@
 .\" See http://csrc.nist.gov/publications/fips/fips180-1/fip180-1.txt
 .\" for the detailed standard
 .\"
-.Dd $Mdocdate: September 27 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SHA1 3
 .Os
 .Sh NAME
@@ -32,8 +32,8 @@
 .Nm SHA1Data
 .Nd calculate the NIST Secure Hash Algorithm
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sha1.h>
+.In sys/types.h
+.In sha1.h
 .Ft void
 .Fn SHA1Init "SHA1_CTX *context"
 .Ft void
diff --git a/lib/libc/hash/sha2.3 b/lib/libc/hash/sha2.3
index f267b438d91..ed75c6d6502 100644
--- a/lib/libc/hash/sha2.3
+++ b/lib/libc/hash/sha2.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sha2.3,v 1.18 2013/04/15 15:54:17 millert Exp $
+.\"	$OpenBSD: sha2.3,v 1.19 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 2003, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -20,7 +20,7 @@
 .\"
 .\" See http://www.nist.gov/sha/ for the detailed standard
 .\"
-.Dd $Mdocdate: April 15 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SHA2 3
 .Os
 .Sh NAME
@@ -35,8 +35,8 @@
 .Nm SHA256Data
 .Nd calculate the NIST Secure Hash Standard (version 2)
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sha2.h>
+.In sys/types.h
+.In sha2.h
 .Ft void
 .Fn SHA224Init "SHA2_CTX *context"
 .Ft void
diff --git a/lib/libc/locale/btowc.3 b/lib/libc/locale/btowc.3
index 4170d2f5f4e..109dd308c4e 100644
--- a/lib/libc/locale/btowc.3
+++ b/lib/libc/locale/btowc.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: btowc.3,v 1.2 2007/05/31 19:19:29 jmc Exp $
+.\" $OpenBSD: btowc.3,v 1.3 2013/06/05 03:39:22 tedu Exp $
 .\" $NetBSD: btowc.3,v 1.3 2003/04/16 13:34:40 wiz Exp $
 .\"
 .\" Copyright (c)2003 Citrus Project,
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt BTOWC 3
 .Os
 .\" ----------------------------------------------------------------------
@@ -34,7 +34,7 @@
 .Nd convert a single byte character to a wide character
 .\" ----------------------------------------------------------------------
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft wint_t
 .Fn btowc "int c"
 .\" ----------------------------------------------------------------------
diff --git a/lib/libc/locale/iswalnum.3 b/lib/libc/locale/iswalnum.3
index 572cf38b48b..36339728c9d 100644
--- a/lib/libc/locale/iswalnum.3
+++ b/lib/libc/locale/iswalnum.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: iswalnum.3,v 1.4 2011/04/29 11:24:24 stsp Exp $
+.\"	$OpenBSD: iswalnum.3,v 1.5 2013/06/05 03:39:22 tedu Exp $
 .\"	$NetBSD: iswalnum.3,v 1.8 2003/09/08 17:54:31 wiz Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
@@ -34,7 +34,7 @@
 .\"
 .\"     @(#)isalnum.3	5.2 (Berkeley) 6/29/91
 .\"
-.Dd $Mdocdate: April 29 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISWALNUM 3
 .Os
 .Sh NAME
@@ -52,7 +52,7 @@
 .Nm iswxdigit
 .Nd wide-character classification utilities
 .Sh SYNOPSIS
-.Fd #include <wctype.h>
+.In wctype.h
 .Ft int
 .Fn iswalnum "wint_t wc"
 .Ft int
diff --git a/lib/libc/locale/iswctype.3 b/lib/libc/locale/iswctype.3
index 7deee6d38e1..832cf3d088f 100644
--- a/lib/libc/locale/iswctype.3
+++ b/lib/libc/locale/iswctype.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iswctype.3,v 1.2 2007/05/31 19:19:29 jmc Exp $
+.\" $OpenBSD: iswctype.3,v 1.3 2013/06/05 03:39:22 tedu Exp $
 .\" $NetBSD: iswctype.3,v 1.5 2003/04/16 13:34:40 wiz Exp $
 .\"
 .\" Copyright (c)2003 Citrus Project,
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ISWCTYPE 3
 .Os
 .\" ----------------------------------------------------------------------
@@ -34,7 +34,7 @@
 .Nd test a character for character class identifier
 .\" ----------------------------------------------------------------------
 .Sh SYNOPSIS
-.Fd #include <wctype.h>
+.In wctype.h
 .Ft int
 .Fn iswctype "wint_t wc" "wctype_t charclass"
 .\" ----------------------------------------------------------------------
diff --git a/lib/libc/locale/mblen.3 b/lib/libc/locale/mblen.3
index 06d3e8d82d4..7ff46e57da7 100644
--- a/lib/libc/locale/mblen.3
+++ b/lib/libc/locale/mblen.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mblen.3,v 1.2 2007/05/31 19:19:29 jmc Exp $
+.\" $OpenBSD: mblen.3,v 1.3 2013/06/05 03:39:22 tedu Exp $
 .\" $NetBSD: mblen.3,v 1.4 2003/04/16 13:34:40 wiz Exp $
 .\"
 .\" Copyright (c)2002 Citrus Project,
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MBLEN 3
 .Os
 .\" ----------------------------------------------------------------------
@@ -34,7 +34,7 @@
 .Nd get number of bytes in a multibyte character
 .\" ----------------------------------------------------------------------
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft int
 .Fn mblen "const char *s" "size_t n"
 .\" ----------------------------------------------------------------------
diff --git a/lib/libc/locale/mbrlen.3 b/lib/libc/locale/mbrlen.3
index d44c6166e32..fba21820bdb 100644
--- a/lib/libc/locale/mbrlen.3
+++ b/lib/libc/locale/mbrlen.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mbrlen.3,v 1.3 2009/11/09 06:46:28 nicm Exp $
+.\" $OpenBSD: mbrlen.3,v 1.4 2013/06/05 03:39:22 tedu Exp $
 .\" $NetBSD: mbrlen.3,v 1.5 2003/09/08 17:54:31 wiz Exp $
 .\"
 .\" Copyright (c)2002 Citrus Project,
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 9 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MBRLEN 3
 .Os
 .\" ----------------------------------------------------------------------
@@ -34,7 +34,7 @@
 .Nd get number of bytes in a multibyte character (restartable)
 .\" ----------------------------------------------------------------------
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft size_t
 .Fn mbrlen "const char * restrict s" "size_t n" "mbstate_t * restrict ps"
 .\" ----------------------------------------------------------------------
diff --git a/lib/libc/locale/mbrtowc.3 b/lib/libc/locale/mbrtowc.3
index 23c79bb5cf6..f19621ba571 100644
--- a/lib/libc/locale/mbrtowc.3
+++ b/lib/libc/locale/mbrtowc.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mbrtowc.3,v 1.3 2010/12/05 14:59:49 stsp Exp $
+.\" $OpenBSD: mbrtowc.3,v 1.4 2013/06/05 03:39:22 tedu Exp $
 .\" $NetBSD: mbrtowc.3,v 1.5 2003/09/08 17:54:31 wiz Exp $
 .\"
 .\" Copyright (c)2002 Citrus Project,
@@ -25,14 +25,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 5 2010 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MBRTOWC 3
 .Os
 .Sh NAME
 .Nm mbrtowc
 .Nd converts a multibyte character to a wide character (restartable)
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft size_t
 .Fn mbrtowc "wchar_t * restrict wc" "const char * restrict s" "size_t n" \
 "mbstate_t * restrict mbs"
diff --git a/lib/libc/locale/mbsinit.3 b/lib/libc/locale/mbsinit.3
index 6d54320ac9c..897b46e8317 100644
--- a/lib/libc/locale/mbsinit.3
+++ b/lib/libc/locale/mbsinit.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mbsinit.3,v 1.2 2007/05/31 19:19:29 jmc Exp $
+.\" $OpenBSD: mbsinit.3,v 1.3 2013/06/05 03:39:22 tedu Exp $
 .\" $NetBSD: mbsinit.3,v 1.4 2003/04/16 13:34:40 wiz Exp $
 .\"
 .\" Copyright (c)2002 Citrus Project,
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MBSINIT 3
 .Os
 .\" ----------------------------------------------------------------------
@@ -34,7 +34,7 @@
 .Nd determines whether the state object is in initial state
 .\" ----------------------------------------------------------------------
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft int
 .Fn mbsinit "const mbstate_t *ps"
 .\" ----------------------------------------------------------------------
diff --git a/lib/libc/locale/mbsrtowcs.3 b/lib/libc/locale/mbsrtowcs.3
index 32e9099d1b3..bed81ad27dd 100644
--- a/lib/libc/locale/mbsrtowcs.3
+++ b/lib/libc/locale/mbsrtowcs.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mbsrtowcs.3,v 1.4 2012/06/07 19:47:40 matthew Exp $
+.\" $OpenBSD: mbsrtowcs.3,v 1.5 2013/06/05 03:39:22 tedu Exp $
 .\" $NetBSD: mbsrtowcs.3,v 1.6 2003/09/08 17:54:31 wiz Exp $
 .\"
 .\" Copyright (c)2002 Citrus Project,
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 7 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MBSRTOWCS 3
 .Os
 .\" ----------------------------------------------------------------------
@@ -36,7 +36,7 @@
 (restartable)
 .\" ----------------------------------------------------------------------
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft size_t
 .Fn mbsrtowcs "wchar_t * restrict dst" "const char ** restrict src" "size_t len" \
 "mbstate_t * restrict ps"
diff --git a/lib/libc/locale/mbstowcs.3 b/lib/libc/locale/mbstowcs.3
index 50eb86ba466..d12eaf07477 100644
--- a/lib/libc/locale/mbstowcs.3
+++ b/lib/libc/locale/mbstowcs.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mbstowcs.3,v 1.4 2011/11/16 13:06:21 stsp Exp $
+.\" $OpenBSD: mbstowcs.3,v 1.5 2013/06/05 03:39:22 tedu Exp $
 .\" $NetBSD: mbstowcs.3,v 1.6 2003/09/08 17:54:31 wiz Exp $
 .\"
 .\" Copyright (c)2002 Citrus Project,
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 16 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MBSTOWCS 3
 .Os
 .\" ----------------------------------------------------------------------
@@ -34,7 +34,7 @@
 .Nd converts a multibyte character string to a wide-character string
 .\" ----------------------------------------------------------------------
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft size_t
 .Fn mbstowcs "wchar_t * restrict pwcs" "const char * restrict s" "size_t n"
 .\" ----------------------------------------------------------------------
diff --git a/lib/libc/locale/mbtowc.3 b/lib/libc/locale/mbtowc.3
index c5b3039f198..3d963ec0415 100644
--- a/lib/libc/locale/mbtowc.3
+++ b/lib/libc/locale/mbtowc.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mbtowc.3,v 1.3 2010/11/20 18:23:19 stsp Exp $
+.\" $OpenBSD: mbtowc.3,v 1.4 2013/06/05 03:39:22 tedu Exp $
 .\" $NetBSD: mbtowc.3,v 1.5 2003/09/08 17:54:31 wiz Exp $
 .\"
 .\" Copyright (c)2002 Citrus Project,
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 20 2010 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MBTOWC 3
 .Os
 .\" ----------------------------------------------------------------------
@@ -34,7 +34,7 @@
 .Nd converts a multibyte character to a wide character
 .\" ----------------------------------------------------------------------
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft int
 .Fn mbtowc "wchar_t * restrict pwc" "const char * restrict s" "size_t n"
 .Sh DESCRIPTION
diff --git a/lib/libc/locale/nl_langinfo.3 b/lib/libc/locale/nl_langinfo.3
index 5d387e837a7..57bda8ec63f 100644
--- a/lib/libc/locale/nl_langinfo.3
+++ b/lib/libc/locale/nl_langinfo.3
@@ -1,16 +1,16 @@
-.\"	$OpenBSD: nl_langinfo.3,v 1.8 2011/03/16 03:13:37 guenther Exp $
+.\"	$OpenBSD: nl_langinfo.3,v 1.9 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Written by J.T. Conklin <jtc@netbsd.org>.
 .\" Public domain.
 .\"
-.Dd $Mdocdate: March 16 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt NL_LANGINFO 3
 .Os
 .Sh NAME
 .Nm nl_langinfo
 .Nd get locale information
 .Sh SYNOPSIS
-.Fd #include <langinfo.h>
+.In langinfo.h
 .Ft char *
 .Fn nl_langinfo "nl_item item"
 .Sh DESCRIPTION
diff --git a/lib/libc/locale/setlocale.3 b/lib/libc/locale/setlocale.3
index 6bd8fe6f7f2..b570f19331d 100644
--- a/lib/libc/locale/setlocale.3
+++ b/lib/libc/locale/setlocale.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: setlocale.3,v 1.13 2011/03/09 01:27:37 schwarze Exp $
+.\"	$OpenBSD: setlocale.3,v 1.14 2013/06/05 03:39:22 tedu Exp $
 .\"	$NetBSD: setlocale.3,v 1.3 1997/07/14 23:19:47 kleink Exp $
 .\"
 .\" Copyright (c) 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)setlocale.3	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: March 9 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SETLOCALE 3
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm localeconv
 .Nd natural language formatting for C
 .Sh SYNOPSIS
-.Fd #include <locale.h>
+.In locale.h
 .Ft char *
 .Fn setlocale "int category" "const char *locale"
 .Ft struct lconv *
diff --git a/lib/libc/locale/wcrtomb.3 b/lib/libc/locale/wcrtomb.3
index b264b6372ec..8a4bf7db79f 100644
--- a/lib/libc/locale/wcrtomb.3
+++ b/lib/libc/locale/wcrtomb.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wcrtomb.3,v 1.4 2010/03/26 19:30:41 jmc Exp $
+.\" $OpenBSD: wcrtomb.3,v 1.5 2013/06/05 03:39:22 tedu Exp $
 .\" $NetBSD: wcrtomb.3,v 1.4 2003/09/08 17:54:31 wiz Exp $
 .\"
 .\" Copyright (c)2002 Citrus Project,
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 26 2010 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCRTOMB 3
 .Os
 .\" ----------------------------------------------------------------------
@@ -34,7 +34,7 @@
 .Nd converts a wide character to a multibyte character (restartable)
 .\" ----------------------------------------------------------------------
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft size_t
 .Fn wcrtomb "const char * restrict s" "wchar_t wc" "mbstate_t * restrict ps"
 .\" ----------------------------------------------------------------------
diff --git a/lib/libc/locale/wcsrtombs.3 b/lib/libc/locale/wcsrtombs.3
index 3e1ff72b370..40192a543e6 100644
--- a/lib/libc/locale/wcsrtombs.3
+++ b/lib/libc/locale/wcsrtombs.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wcsrtombs.3,v 1.4 2012/06/07 19:47:40 matthew Exp $
+.\" $OpenBSD: wcsrtombs.3,v 1.5 2013/06/05 03:39:22 tedu Exp $
 .\" $NetBSD: wcsrtombs.3,v 1.6 2003/09/08 17:54:32 wiz Exp $
 .\"
 .\" Copyright (c)2002 Citrus Project,
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 7 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSRTOMBS 3
 .Os
 .\" ----------------------------------------------------------------------
@@ -36,7 +36,7 @@
 (restartable)
 .\" ----------------------------------------------------------------------
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft size_t
 .Fn wcsrtombs "const char * restrict dst" "const wchar_t ** restrict src" \
 "size_t len" "mbstate_t * restrict ps"
diff --git a/lib/libc/locale/wcstombs.3 b/lib/libc/locale/wcstombs.3
index 81ccc6086b4..4cc04013dc6 100644
--- a/lib/libc/locale/wcstombs.3
+++ b/lib/libc/locale/wcstombs.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wcstombs.3,v 1.4 2010/09/10 18:38:19 jmc Exp $
+.\" $OpenBSD: wcstombs.3,v 1.5 2013/06/05 03:39:22 tedu Exp $
 .\" $NetBSD: wcstombs.3,v 1.5 2003/09/08 17:54:32 wiz Exp $
 .\"
 .\" Copyright (c)2002 Citrus Project,
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 10 2010 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSTOMBS 3
 .Os
 .\" ----------------------------------------------------------------------
@@ -34,7 +34,7 @@
 .Nd converts a wide-character string to a multibyte character string
 .\" ----------------------------------------------------------------------
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft size_t
 .Fn wcstombs "char * restrict s" "const wchar_t * restrict pwcs" "size_t n"
 .\" ----------------------------------------------------------------------
diff --git a/lib/libc/locale/wctomb.3 b/lib/libc/locale/wctomb.3
index 407120e07a0..c1197d3632d 100644
--- a/lib/libc/locale/wctomb.3
+++ b/lib/libc/locale/wctomb.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wctomb.3,v 1.2 2007/05/31 19:19:29 jmc Exp $
+.\" $OpenBSD: wctomb.3,v 1.3 2013/06/05 03:39:22 tedu Exp $
 .\" $NetBSD: wctomb.3,v 1.3 2003/04/16 13:34:41 wiz Exp $
 .\"
 .\" Copyright (c)2002 Citrus Project,
@@ -25,14 +25,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCTOMB 3
 .Os
 .Sh NAME
 .Nm wctomb
 .Nd converts a wide character to a multibyte character
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft int
 .Fn wctomb "char * s" "const wchar_t wchar"
 .Sh DESCRIPTION
diff --git a/lib/libc/locale/wctype.3 b/lib/libc/locale/wctype.3
index 50ee5070d39..61c83d297c8 100644
--- a/lib/libc/locale/wctype.3
+++ b/lib/libc/locale/wctype.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wctype.3,v 1.2 2007/05/31 19:19:30 jmc Exp $
+.\" $OpenBSD: wctype.3,v 1.3 2013/06/05 03:39:22 tedu Exp $
 .\" $NetBSD: wctype.3,v 1.4 2003/04/16 13:34:41 wiz Exp $
 .\"
 .\" Copyright (c)2003 Citrus Project,
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCTYPE 3
 .Os
 .\" ----------------------------------------------------------------------
@@ -34,7 +34,7 @@
 .Nd get character class identifier by name
 .\" ----------------------------------------------------------------------
 .Sh SYNOPSIS
-.Fd #include <wctype.h>
+.In wctype.h
 .Ft wctype_t
 .Fn wctype "const char *charclass"
 .\" ----------------------------------------------------------------------
diff --git a/lib/libc/net/byteorder.3 b/lib/libc/net/byteorder.3
index ba9798a137f..53f9fd071d5 100644
--- a/lib/libc/net/byteorder.3
+++ b/lib/libc/net/byteorder.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: byteorder.3,v 1.17 2012/03/20 06:06:03 dlg Exp $
+.\"	$OpenBSD: byteorder.3,v 1.18 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 20 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt BYTEORDER 3
 .Os
 .Sh NAME
@@ -52,7 +52,7 @@
 .Nm swap16
 .Nd convert values between different byte orderings
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
+.In sys/types.h
 .Ft u_int32_t
 .Fn htonl "u_int32_t host32"
 .Ft u_int16_t
diff --git a/lib/libc/net/ethers.3 b/lib/libc/net/ethers.3
index 041ee981ec7..f14ad6d3f57 100644
--- a/lib/libc/net/ethers.3
+++ b/lib/libc/net/ethers.3
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: ethers.3,v 1.21 2011/04/19 22:38:26 matthew Exp $
+.\"	$OpenBSD: ethers.3,v 1.22 2013/06/05 03:39:22 tedu Exp $
 .\"
 .\" Written by roland@frob.com.  Public domain.
 .\"
-.Dd $Mdocdate: April 19 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ETHERS 3
 .Os
 .Sh NAME
@@ -13,11 +13,11 @@
 .Nm ether_line
 .Nd get ethers entry
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <net/if.h>
-.Fd #include <netinet/in.h>
-.Fd #include <netinet/if_ether.h>
+.In sys/types.h
+.In sys/socket.h
+.In net/if.h
+.In netinet/in.h
+.In netinet/if_ether.h
 .Ft char *
 .Fn ether_ntoa "struct ether_addr *e"
 .Ft struct ether_addr *
diff --git a/lib/libc/net/gai_strerror.3 b/lib/libc/net/gai_strerror.3
index 6ce94e30a13..680c8d4e4a6 100644
--- a/lib/libc/net/gai_strerror.3
+++ b/lib/libc/net/gai_strerror.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gai_strerror.3,v 1.7 2009/06/02 16:47:50 jasper Exp $
+.\"	$OpenBSD: gai_strerror.3,v 1.8 2013/06/05 03:39:22 tedu Exp $
 .\"	$KAME: gai_strerror.3,v 1.1 2005/01/05 03:04:47 itojun Exp $
 .\"
 .\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
@@ -16,16 +16,16 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: June 2 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GAI_STRERROR 3
 .Os
 .Sh NAME
 .Nm gai_strerror
 .Nd get error message string from EAI_xxx error code
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <netdb.h>
+.In sys/types.h
+.In sys/socket.h
+.In netdb.h
 .Ft "const char *"
 .Fn gai_strerror "int ecode"
 .Sh DESCRIPTION
diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index 82a988c42c9..cea57624ef4 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getaddrinfo.3,v 1.52 2013/03/31 19:17:47 brad Exp $
+.\"	$OpenBSD: getaddrinfo.3,v 1.53 2013/06/05 03:39:22 tedu Exp $
 .\"	$KAME: getaddrinfo.3,v 1.36 2005/01/05 03:23:05 itojun Exp $
 .\"
 .\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 31 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETADDRINFO 3
 .Os
 .Sh NAME
@@ -24,9 +24,9 @@
 .Nm freeaddrinfo
 .Nd host and service name to socket address structure
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <netdb.h>
+.In sys/types.h
+.In sys/socket.h
+.In netdb.h
 .Ft int
 .Fn getaddrinfo "const char *hostname" "const char *servname" \
     "const struct addrinfo *hints" "struct addrinfo **res"
diff --git a/lib/libc/net/gethostbyname.3 b/lib/libc/net/gethostbyname.3
index 1a05460da45..206750a2c34 100644
--- a/lib/libc/net/gethostbyname.3
+++ b/lib/libc/net/gethostbyname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gethostbyname.3,v 1.25 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: gethostbyname.3,v 1.26 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETHOSTBYNAME 3
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm herror
 .Nd get network host entry
 .Sh SYNOPSIS
-.Fd #include <netdb.h>
+.In netdb.h
 .Vt extern int h_errno ;
 .Ft struct hostent *
 .Fn gethostbyname "const char *name"
diff --git a/lib/libc/net/getifaddrs.3 b/lib/libc/net/getifaddrs.3
index 6fc5a8d4049..9d62ece23d4 100644
--- a/lib/libc/net/getifaddrs.3
+++ b/lib/libc/net/getifaddrs.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getifaddrs.3,v 1.15 2012/07/13 09:32:23 krw Exp $
+.\"	$OpenBSD: getifaddrs.3,v 1.16 2013/06/05 03:39:23 tedu Exp $
 .\"	BSDI	getifaddrs.3,v 2.5 2000/02/23 14:51:59 dab Exp
 .\"
 .\" Copyright (c) 1995, 1999
@@ -21,16 +21,16 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.Dd $Mdocdate: July 13 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETIFADDRS 3
 .Os
 .Sh NAME
 .Nm getifaddrs
 .Nd get interface addresses
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <ifaddrs.h>
+.In sys/types.h
+.In sys/socket.h
+.In ifaddrs.h
 .Ft int
 .Fn getifaddrs "struct ifaddrs **ifap"
 .Ft void
diff --git a/lib/libc/net/getnameinfo.3 b/lib/libc/net/getnameinfo.3
index 05d41b96e72..8087b4e72e4 100644
--- a/lib/libc/net/getnameinfo.3
+++ b/lib/libc/net/getnameinfo.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getnameinfo.3,v 1.43 2012/09/27 11:31:58 jmc Exp $
+.\"	$OpenBSD: getnameinfo.3,v 1.44 2013/06/05 03:39:23 tedu Exp $
 .\"	$KAME: getnameinfo.3,v 1.37 2005/01/05 03:23:05 itojun Exp $
 .\"
 .\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
@@ -16,16 +16,16 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 27 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETNAMEINFO 3
 .Os
 .Sh NAME
 .Nm getnameinfo
 .Nd socket address structure to hostname and service name
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <netdb.h>
+.In sys/types.h
+.In sys/socket.h
+.In netdb.h
 .Ft int
 .Fn getnameinfo "const struct sockaddr *sa" "socklen_t salen" "char *host" \
     "size_t hostlen" "char *serv" "size_t servlen" "int flags"
diff --git a/lib/libc/net/getnetent.3 b/lib/libc/net/getnetent.3
index 00fd543ec48..e0344e2dd09 100644
--- a/lib/libc/net/getnetent.3
+++ b/lib/libc/net/getnetent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getnetent.3,v 1.15 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: getnetent.3,v 1.16 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETNETENT 3
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Nm endnetent
 .Nd get network entry
 .Sh SYNOPSIS
-.Fd #include <netdb.h>
+.In netdb.h
 .Ft struct netent *
 .Fn getnetent "void"
 .Ft struct netent *
diff --git a/lib/libc/net/getpeereid.3 b/lib/libc/net/getpeereid.3
index 8e777d3ca6a..9c5742a245f 100644
--- a/lib/libc/net/getpeereid.3
+++ b/lib/libc/net/getpeereid.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpeereid.3,v 1.2 2012/04/22 02:21:49 matthew Exp $
+.\"	$OpenBSD: getpeereid.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -26,15 +26,15 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.Dd $Mdocdate: April 22 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETPEEREID 3
 .Os
 .Sh NAME
 .Nm getpeereid
 .Nd get effective user and group identification of locally-connected peer
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
+.In sys/types.h
+.In sys/socket.h
 .Ft int
 .Fn getpeereid "int s" "uid_t *euid" "gid_t *egid"
 .Sh DESCRIPTION
diff --git a/lib/libc/net/getprotoent.3 b/lib/libc/net/getprotoent.3
index df4cd0c323f..cc2c69836a5 100644
--- a/lib/libc/net/getprotoent.3
+++ b/lib/libc/net/getprotoent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getprotoent.3,v 1.17 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: getprotoent.3,v 1.18 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETPROTOENT 3
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@
 .Nm endprotoent_r
 .Nd get protocol entry
 .Sh SYNOPSIS
-.Fd #include <netdb.h>
+.In netdb.h
 .Ft struct protoent *
 .Fn getprotoent "void"
 .Ft int
diff --git a/lib/libc/net/getrrsetbyname.3 b/lib/libc/net/getrrsetbyname.3
index 121cb67fccf..7fbdd744a55 100644
--- a/lib/libc/net/getrrsetbyname.3
+++ b/lib/libc/net/getrrsetbyname.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: getrrsetbyname.3,v 1.15 2007/05/31 19:19:30 jmc Exp $
+.\" $OpenBSD: getrrsetbyname.3,v 1.16 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (C) 2000, 2001  Internet Software Consortium.
 .\"
@@ -15,7 +15,7 @@
 .\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 .\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETRRSETBYNAME 3
 .Os
 .Sh NAME
@@ -23,7 +23,7 @@
 .Nm getrrsetbyname
 .Nd retrieve DNS records
 .Sh SYNOPSIS
-.Fd #include <netdb.h>
+.In netdb.h
 .Ft int
 .Fn getrrsetbyname "const char *hostname" "unsigned int rdclass" \
 "unsigned int rdtype" "unsigned int flags" "struct rrsetinfo **res"
diff --git a/lib/libc/net/getservent.3 b/lib/libc/net/getservent.3
index 7888b5f1b84..29dd3eb5f47 100644
--- a/lib/libc/net/getservent.3
+++ b/lib/libc/net/getservent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getservent.3,v 1.20 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: getservent.3,v 1.21 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETSERVENT 3
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@
 .Nm endservent_r
 .Nd get service entry
 .Sh SYNOPSIS
-.Fd #include <netdb.h>
+.In netdb.h
 .Ft struct servent *
 .Fn getservent "void"
 .Ft int
diff --git a/lib/libc/net/if_indextoname.3 b/lib/libc/net/if_indextoname.3
index df173899173..7ca28c6b92a 100644
--- a/lib/libc/net/if_indextoname.3
+++ b/lib/libc/net/if_indextoname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: if_indextoname.3,v 1.13 2012/09/27 11:31:58 jmc Exp $
+.\"	$OpenBSD: if_indextoname.3,v 1.14 2013/06/05 03:39:23 tedu Exp $
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -28,7 +28,7 @@
 .\"
 .\"     From: @(#)rcmd.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: September 27 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt IF_NAMETOINDEX 3
 .Os
 .Sh NAME
@@ -38,9 +38,9 @@
 .Nm if_freenameindex
 .Nd convert interface index to name, and vice versa
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <net/if.h>
+.In sys/types.h
+.In sys/socket.h
+.In net/if.h
 .Ft "unsigned int"
 .Fn if_nametoindex "const char *ifname"
 .Ft "char *"
diff --git a/lib/libc/net/inet.3 b/lib/libc/net/inet.3
index d96a8245325..e56ca0a59a5 100644
--- a/lib/libc/net/inet.3
+++ b/lib/libc/net/inet.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet.3,v 1.25 2012/09/27 11:31:58 jmc Exp $
+.\"	$OpenBSD: inet.3,v 1.26 2013/06/05 03:39:23 tedu Exp $
 .\"	$NetBSD: inet.3,v 1.7 1997/06/18 02:25:24 lukem Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)inet.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: September 27 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt INET 3
 .Os
 .Sh NAME
@@ -45,10 +45,10 @@
 .Nm inet_lnaof
 .Nd Internet address manipulation routines
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <netinet/in.h>
-.Fd #include <arpa/inet.h>
+.In sys/types.h
+.In sys/socket.h
+.In netinet/in.h
+.In arpa/inet.h
 .Ft int
 .Fn inet_aton "const char *cp" "struct in_addr *addr"
 .Ft in_addr_t
diff --git a/lib/libc/net/inet_net.3 b/lib/libc/net/inet_net.3
index 11cc1d67c60..a0231b45370 100644
--- a/lib/libc/net/inet_net.3
+++ b/lib/libc/net/inet_net.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet_net.3,v 1.15 2012/06/24 18:06:42 gilles Exp $
+.\"	$OpenBSD: inet_net.3,v 1.16 2013/06/05 03:39:23 tedu Exp $
 .\"	$NetBSD: inet_net.3,v 1.1 1997/06/18 02:25:27 lukem Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 24 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt INET_NET 3
 .Os
 .Sh NAME
@@ -36,10 +36,10 @@
 .Nm inet_net_pton
 .Nd Internet network number manipulation routines
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <netinet/in.h>
-.Fd #include <arpa/inet.h>
+.In sys/types.h
+.In sys/socket.h
+.In netinet/in.h
+.In arpa/inet.h
 .Ft char *
 .Fn inet_net_ntop "int af" "const void *src" "int bits" "char *dst" "size_t size"
 .Ft int
diff --git a/lib/libc/net/link_addr.3 b/lib/libc/net/link_addr.3
index e6210ef2d03..f234fe84cc8 100644
--- a/lib/libc/net/link_addr.3
+++ b/lib/libc/net/link_addr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: link_addr.3,v 1.12 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: link_addr.3,v 1.13 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt LINK_ADDR 3
 .Os
 .Sh NAME
@@ -38,9 +38,9 @@
 .Nm link_ntoa
 .Nd elementary address specification routines for link level access
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <net/if_dl.h>
+.In sys/types.h
+.In sys/socket.h
+.In net/if_dl.h
 .Ft void
 .Fn link_addr "const char *addr" "struct sockaddr_dl *sdl"
 .Ft char *
diff --git a/lib/libc/net/rcmd.3 b/lib/libc/net/rcmd.3
index 87e9a760a8a..77659c28b73 100644
--- a/lib/libc/net/rcmd.3
+++ b/lib/libc/net/rcmd.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rcmd.3,v 1.27 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: rcmd.3,v 1.28 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt RCMD 3
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nm iruserok_sa
 .Nd routines for returning a stream to a remote command
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft int
 .Fn rcmd "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p"
 .Ft int
diff --git a/lib/libc/net/rcmdsh.3 b/lib/libc/net/rcmdsh.3
index f7de0808f55..c84a2e4d93c 100644
--- a/lib/libc/net/rcmdsh.3
+++ b/lib/libc/net/rcmdsh.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rcmdsh.3,v 1.13 2009/12/29 10:25:43 sobrado Exp $
+.\"	$OpenBSD: rcmdsh.3,v 1.14 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 29 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt RCMDSH 3
 .Os
 .Sh NAME
 .Nm rcmdsh
 .Nd return a stream to a remote command without superuser
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft int
 .Fn rcmdsh "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "char *rshprog"
 .Sh DESCRIPTION
diff --git a/lib/libc/net/resolver.3 b/lib/libc/net/resolver.3
index ea181e3685e..fb67c83b053 100644
--- a/lib/libc/net/resolver.3
+++ b/lib/libc/net/resolver.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: resolver.3,v 1.27 2012/12/12 14:48:18 jmc Exp $
+.\"	$OpenBSD: resolver.3,v 1.28 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 12 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt RESOLVER 3
 .Os
 .Sh NAME
@@ -40,10 +40,10 @@
 .Nm dn_expand
 .Nd resolver routines
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netinet/in.h>
-.Fd #include <arpa/nameser.h>
-.Fd #include <resolv.h>
+.In sys/types.h
+.In netinet/in.h
+.In arpa/nameser.h
+.In resolv.h
 .Ft int
 .Fo res_query
 .Fa "const char *dname"
diff --git a/lib/libc/nls/catclose.3 b/lib/libc/nls/catclose.3
index 417217f2813..a17f7eb05f8 100644
--- a/lib/libc/nls/catclose.3
+++ b/lib/libc/nls/catclose.3
@@ -1,16 +1,16 @@
-.\"	$OpenBSD: catclose.3,v 1.6 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: catclose.3,v 1.7 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Written by J.T. Conklin <jtc@netbsd.org>.
 .\" Public domain.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt CATCLOSE 3
 .Os
 .Sh NAME
 .Nm catclose
 .Nd close message catalog
 .Sh SYNOPSIS
-.Fd #include <nl_types.h>
+.In nl_types.h
 .Ft int
 .Fn catclose "nl_catd catd"
 .Sh DESCRIPTION
diff --git a/lib/libc/nls/catgets.3 b/lib/libc/nls/catgets.3
index 11baa3d2ff2..3b5a03eb082 100644
--- a/lib/libc/nls/catgets.3
+++ b/lib/libc/nls/catgets.3
@@ -1,16 +1,16 @@
-.\"	$OpenBSD: catgets.3,v 1.6 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: catgets.3,v 1.7 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Written by J.T. Conklin <jtc@netbsd.org>.
 .\" Public domain.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt CATGETS 3
 .Os
 .Sh NAME
 .Nm catgets
 .Nd retrieve string from message catalog
 .Sh SYNOPSIS
-.Fd #include <nl_types.h>
+.In nl_types.h
 .Ft char *
 .Fn catgets "nl_catd catd" "int set_id" "int msg_id" "const char *s"
 .Sh DESCRIPTION
diff --git a/lib/libc/nls/catopen.3 b/lib/libc/nls/catopen.3
index 2bd99aa21c4..81bf22e9c91 100644
--- a/lib/libc/nls/catopen.3
+++ b/lib/libc/nls/catopen.3
@@ -1,16 +1,16 @@
-.\"	$OpenBSD: catopen.3,v 1.7 2013/06/01 21:26:17 stsp Exp $
+.\"	$OpenBSD: catopen.3,v 1.8 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Written by J.T. Conklin <jtc@netbsd.org>.
 .\" Public domain.
 .\"
-.Dd $Mdocdate: June 1 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt CATOPEN 3
 .Os
 .Sh NAME
 .Nm catopen
 .Nd open message catalog
 .Sh SYNOPSIS
-.Fd #include <nl_types.h>
+.In nl_types.h
 .Ft nl_catd
 .Fn catopen "const char *name" "int oflag"
 .Sh DESCRIPTION
diff --git a/lib/libc/ohash/ohash_init.3 b/lib/libc/ohash/ohash_init.3
index e24346a2e07..fc924acf45f 100644
--- a/lib/libc/ohash/ohash_init.3
+++ b/lib/libc/ohash/ohash_init.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ohash_init.3,v 1.16 2012/06/01 02:49:07 lteo Exp $
+.\"	$OpenBSD: ohash_init.3,v 1.17 2013/06/05 03:39:23 tedu Exp $
 .\" Copyright (c) 1999 Marc Espie <espie@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: June 1 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt OHASH_INIT 3
 .Os
 .Sh NAME
@@ -29,9 +29,9 @@
 .Nm ohash_entries
 .Nd light-weight open hashing
 .Sh SYNOPSIS
-.Fd #include <stdint.h>
-.Fd #include <stddef.h>
-.Fd #include <ohash.h>
+.In stdint.h
+.In stddef.h
+.In ohash.h
 .Ft void
 .Fn ohash_init "struct ohash *h" "unsigned int size" "struct ohash_info *info"
 .Ft void
diff --git a/lib/libc/ohash/ohash_interval.3 b/lib/libc/ohash/ohash_interval.3
index 28cf5b025f7..c96d992b915 100644
--- a/lib/libc/ohash/ohash_interval.3
+++ b/lib/libc/ohash/ohash_interval.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ohash_interval.3,v 1.13 2012/09/23 15:05:23 espie Exp $
+.\"	$OpenBSD: ohash_interval.3,v 1.14 2013/06/05 03:39:23 tedu Exp $
 .\" Copyright (c) 2001 Marc Espie <espie@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -13,7 +13,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 23 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt OHASH_INTERVAL 3
 .Os
 .Sh NAME
@@ -23,9 +23,9 @@
 .Nm ohash_qlookupi
 .Nd helper functions for open hashing
 .Sh SYNOPSIS
-.Fd #include <stdint.h>
-.Fd #include <stddef.h>
-.Fd #include <ohash.h>
+.In stdint.h
+.In stddef.h
+.In ohash.h
 .Ft uint32_t
 .Fn ohash_interval "const char *start" "const char **pend"
 .Ft "void *"
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index c851b8d8e9c..24fc5ddcf1b 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: regex.3,v 1.21 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: regex.3,v 1.22 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
 .\"
@@ -35,7 +35,7 @@
 .\"
 .\"	@(#)regex.3	8.4 (Berkeley) 3/20/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt REGEX 3
 .Os
 .Sh NAME
@@ -45,8 +45,8 @@
 .Nm regfree
 .Nd regular expression routines
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <regex.h>
+.In sys/types.h
+.In regex.h
 .Ft int
 .Fn regcomp "regex_t *preg" "const char *pattern" "int cflags"
 .Pp
diff --git a/lib/libc/rpc/authnone_create.3 b/lib/libc/rpc/authnone_create.3
index 700343538d2..40946f9e34e 100644
--- a/lib/libc/rpc/authnone_create.3
+++ b/lib/libc/rpc/authnone_create.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: authnone_create.3,v 1.2 2012/09/27 11:31:58 jmc Exp $
+.\"	$OpenBSD: authnone_create.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\" Mostly converted to mandoc by Theo de Raadt, Tue Feb 24 04:04:46 MST 1998
 .\"
 .\" Copyright (c) 2010, Oracle America, Inc.
@@ -30,7 +30,7 @@
 .\"   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\"   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 27 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt AUTHNONE_CREATE 3
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm set_rpc_maxgrouplist
 .Nd library routines for remote procedure calls
 .Sh SYNOPSIS
-.Fd #include <rpc/rpc.h>
+.In rpc/rpc.h
 .Ft void
 .Fn auth_destroy "AUTH *auth"
 .Ft AUTH *
diff --git a/lib/libc/rpc/bindresvport.3 b/lib/libc/rpc/bindresvport.3
index c844a81266c..ce7d1ac6451 100644
--- a/lib/libc/rpc/bindresvport.3
+++ b/lib/libc/rpc/bindresvport.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bindresvport.3,v 1.24 2010/09/07 19:52:37 schwarze Exp $
+.\"	$OpenBSD: bindresvport.3,v 1.25 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 2010, Oracle America, Inc.
 .\"
@@ -29,7 +29,7 @@
 .\"   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\"   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 7 2010 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt BINDRESVPORT 3
 .Os
 .Sh NAME
@@ -37,8 +37,8 @@
 .Nm bindresvport_sa
 .Nd bind a socket to a privileged IP port
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netinet/in.h>
+.In sys/types.h
+.In netinet/in.h
 .Ft int
 .Fn bindresvport "int sd" "struct sockaddr_in *sin"
 .Ft int
diff --git a/lib/libc/rpc/getrpcent.3 b/lib/libc/rpc/getrpcent.3
index e84c49e6a9c..eeb7076f5c6 100644
--- a/lib/libc/rpc/getrpcent.3
+++ b/lib/libc/rpc/getrpcent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getrpcent.3,v 1.12 2010/09/01 14:43:34 millert Exp $
+.\"	$OpenBSD: getrpcent.3,v 1.13 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 2010, Oracle America, Inc.
 .\"
@@ -29,7 +29,7 @@
 .\"   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\"   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 1 2010 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETRPCENT 3
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nm setrpcent
 .Nd get RPC entry
 .Sh SYNOPSIS
-.Fd #include <rpc/rpc.h>
+.In rpc/rpc.h
 .Ft struct rpcent *
 .Fn getrpcent void
 .Ft struct rpcent *
diff --git a/lib/libc/rpc/getrpcport.3 b/lib/libc/rpc/getrpcport.3
index 45438e262ba..09180937aa7 100644
--- a/lib/libc/rpc/getrpcport.3
+++ b/lib/libc/rpc/getrpcport.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getrpcport.3,v 1.9 2010/09/01 14:43:34 millert Exp $
+.\"	$OpenBSD: getrpcport.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 2010, Oracle America, Inc.
 .\"
@@ -29,14 +29,14 @@
 .\"   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\"   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 1 2010 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETRPCPORT 3
 .Os
 .Sh NAME
 .Nm getrpcport
 .Nd get RPC port number
 .Sh SYNOPSIS
-.Fd #include <rpc/rpc.h>
+.In rpc/rpc.h
 .Ft int
 .Fn getrpcport "char *host" "int prognum" "int versnum" "int proto"
 .Sh DESCRIPTION
diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
index 45646fab10c..10f899bb99f 100644
--- a/lib/libc/rpc/rpc.3
+++ b/lib/libc/rpc/rpc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rpc.3,v 1.45 2012/09/27 11:31:58 jmc Exp $
+.\"	$OpenBSD: rpc.3,v 1.46 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt
 .\" All rights reserved.
@@ -52,7 +52,7 @@
 .\"   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\"   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 27 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt RPC 3
 .Os
 .Sh NAME
@@ -124,7 +124,7 @@
 .Nm xprt_unregister
 .Nd library routines for remote procedure calls
 .Sh SYNOPSIS
-.Fd #include <rpc/rpc.h>
+.In rpc/rpc.h
 .Ft int
 .Fn callrpc "char *host" "u_long prognum" "u_long versnum" "u_long procnum" "xdrproc_t inproc" "char *in" "xdrproc_t outproc" "char *out"
 .Ft "enum clnt_stat"
diff --git a/lib/libc/rpc/xdr.3 b/lib/libc/rpc/xdr.3
index 81acf464ed8..a9b89fc654c 100644
--- a/lib/libc/rpc/xdr.3
+++ b/lib/libc/rpc/xdr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xdr.3,v 1.23 2012/09/27 11:31:58 jmc Exp $
+.\"	$OpenBSD: xdr.3,v 1.24 2013/06/05 03:39:23 tedu Exp $
 .\" Mostly converted to mandoc by Theo de Raadt, Tue Feb 24 04:04:46 MST 1998
 .\"
 .\" Copyright (c) 2010, Oracle America, Inc.
@@ -30,7 +30,7 @@
 .\"   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\"   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 27 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt XDR 3
 .Os
 .Sh NAME
@@ -71,8 +71,8 @@
 .Nm xdr_wrapstring
 .Nd library routines for external data representation
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <rpc/xdr.h>
+.In sys/types.h
+.In rpc/xdr.h
 .Ft int
 .Fn xdr_array "XDR *xdrs" "char **arrp" "u_int *sizep" "u_int maxsize" "u_int elsize" "xdrproc_t elproc"
 .Ft int
diff --git a/lib/libc/stdio/fclose.3 b/lib/libc/stdio/fclose.3
index 7b47c482b10..57d3217fce7 100644
--- a/lib/libc/stdio/fclose.3
+++ b/lib/libc/stdio/fclose.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fclose.3,v 1.6 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: fclose.3,v 1.7 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FCLOSE 3
 .Os
 .Sh NAME
 .Nm fclose
 .Nd close a stream
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft int
 .Fn fclose "FILE *stream"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdio/ferror.3 b/lib/libc/stdio/ferror.3
index f4466937555..8add5bd3779 100644
--- a/lib/libc/stdio/ferror.3
+++ b/lib/libc/stdio/ferror.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ferror.3,v 1.8 2009/01/29 16:37:16 jmc Exp $
+.\"	$OpenBSD: ferror.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 29 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FERROR 3
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm fileno
 .Nd check and reset stream status
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft void
 .Fn clearerr "FILE *stream"
 .Ft int
diff --git a/lib/libc/stdio/fflush.3 b/lib/libc/stdio/fflush.3
index c6a2de95650..75eb5ae5fdf 100644
--- a/lib/libc/stdio/fflush.3
+++ b/lib/libc/stdio/fflush.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fflush.3,v 1.8 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: fflush.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FFLUSH 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm fpurge
 .Nd flush a stream
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft int
 .Fn fflush "FILE *stream"
 .Ft int
diff --git a/lib/libc/stdio/fgetln.3 b/lib/libc/stdio/fgetln.3
index fd877f01295..b2806616cb5 100644
--- a/lib/libc/stdio/fgetln.3
+++ b/lib/libc/stdio/fgetln.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fgetln.3,v 1.15 2007/06/21 13:47:07 moritz Exp $
+.\"	$OpenBSD: fgetln.3,v 1.16 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 21 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FGETLN 3
 .Os
 .Sh NAME
 .Nm fgetln
 .Nd get a line from a stream
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft char *
 .Fn fgetln "FILE *stream" "size_t *len"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdio/fgets.3 b/lib/libc/stdio/fgets.3
index 13b213088ef..6b0365f2bbe 100644
--- a/lib/libc/stdio/fgets.3
+++ b/lib/libc/stdio/fgets.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fgets.3,v 1.29 2009/06/02 22:28:18 ray Exp $
+.\"	$OpenBSD: fgets.3,v 1.30 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 2 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FGETS 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm gets
 .Nd get a line from a stream
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft char *
 .Fn fgets "char *str" "int size" "FILE *stream"
 .Ft char *
diff --git a/lib/libc/stdio/fmemopen.3 b/lib/libc/stdio/fmemopen.3
index 972f25aa587..a0ce544d8a7 100644
--- a/lib/libc/stdio/fmemopen.3
+++ b/lib/libc/stdio/fmemopen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fmemopen.3,v 1.3 2013/03/28 09:37:55 mpi Exp $
+.\"	$OpenBSD: fmemopen.3,v 1.4 2013/06/05 03:39:23 tedu Exp $
 .\"	$NetBSD: fmemopen.3,v 1.5 2010/10/07 00:14:14 enami Exp $
 .\"
 .\" Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -35,14 +35,14 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 28 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FMEMOPEN 3
 .Os
 .Sh NAME
 .Nm fmemopen
 .Nd open a stream that points to the given buffer
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft FILE *
 .Fn fmemopen "void *buffer" "size_t size" "const char *mode"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdio/fopen.3 b/lib/libc/stdio/fopen.3
index 474212670fe..fda35fbb772 100644
--- a/lib/libc/stdio/fopen.3
+++ b/lib/libc/stdio/fopen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fopen.3,v 1.26 2012/10/03 06:27:14 jmc Exp $
+.\"	$OpenBSD: fopen.3,v 1.27 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 3 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FOPEN 3
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nm freopen
 .Nd stream open functions
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft FILE *
 .Fn fopen "const char *path" "const char *mode"
 .Ft FILE *
diff --git a/lib/libc/stdio/fputs.3 b/lib/libc/stdio/fputs.3
index 0a43784dcf4..dbe9c528fff 100644
--- a/lib/libc/stdio/fputs.3
+++ b/lib/libc/stdio/fputs.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fputs.3,v 1.8 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: fputs.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FPUTS 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm puts
 .Nd output a line to a stream
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft int
 .Fn fputs "const char *str" "FILE *stream"
 .Ft int
diff --git a/lib/libc/stdio/fread.3 b/lib/libc/stdio/fread.3
index 754636f8d01..0949edb4758 100644
--- a/lib/libc/stdio/fread.3
+++ b/lib/libc/stdio/fread.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fread.3,v 1.5 2009/07/12 18:45:21 millert Exp $
+.\"	$OpenBSD: fread.3,v 1.6 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 12 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FREAD 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm fwrite
 .Nd binary stream input/output
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft size_t
 .Fn fread "void *ptr" "size_t size" "size_t nmemb" "FILE *stream"
 .Ft size_t
diff --git a/lib/libc/stdio/fseek.3 b/lib/libc/stdio/fseek.3
index 665cfea0aac..a2bf17cc8d3 100644
--- a/lib/libc/stdio/fseek.3
+++ b/lib/libc/stdio/fseek.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fseek.3,v 1.14 2012/05/22 23:43:40 matthew Exp $
+.\"	$OpenBSD: fseek.3,v 1.15 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 22 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FSEEK 3
 .Os
 .Sh NAME
@@ -44,7 +44,7 @@
 .Nm rewind
 .Nd reposition a stream
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft int
 .Fn fgetpos "FILE *stream" "fpos_t *pos"
 .Ft int
diff --git a/lib/libc/stdio/funopen.3 b/lib/libc/stdio/funopen.3
index f12b461cc61..a57bba64681 100644
--- a/lib/libc/stdio/funopen.3
+++ b/lib/libc/stdio/funopen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: funopen.3,v 1.14 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: funopen.3,v 1.15 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FUNOPEN 3
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Nm fwopen
 .Nd open a stream
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft FILE *
 .Fn funopen "const void *cookie" "int (*readfn)(void *, char *, int)" \
     "int (*writefn)(void *, const char *, int)" \
diff --git a/lib/libc/stdio/getc.3 b/lib/libc/stdio/getc.3
index 58d01c09926..2b189179b93 100644
--- a/lib/libc/stdio/getc.3
+++ b/lib/libc/stdio/getc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getc.3,v 1.13 2012/01/15 21:03:05 schwarze Exp $
+.\"	$OpenBSD: getc.3,v 1.14 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 15 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETC 3
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm getw
 .Nd get next character or word from input stream
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft int
 .Fn fgetc "FILE *stream"
 .Ft int
diff --git a/lib/libc/stdio/mktemp.3 b/lib/libc/stdio/mktemp.3
index 56c7df3b88e..70559fb8185 100644
--- a/lib/libc/stdio/mktemp.3
+++ b/lib/libc/stdio/mktemp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mktemp.3,v 1.50 2013/03/12 16:47:11 guenther Exp $
+.\"	$OpenBSD: mktemp.3,v 1.51 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 12 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MKTEMP 3
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nm mkdtemp
 .Nd make temporary file name (unique)
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft char *
 .Fn mktemp "char *template"
 .Ft int
diff --git a/lib/libc/stdio/open_memstream.3 b/lib/libc/stdio/open_memstream.3
index 4ff18284d7d..c08fc210c44 100644
--- a/lib/libc/stdio/open_memstream.3
+++ b/lib/libc/stdio/open_memstream.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: open_memstream.3,v 1.3 2013/03/28 09:37:55 mpi Exp $
+.\"	$OpenBSD: open_memstream.3,v 1.4 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 2011 Martin Pieuchot <mpi@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 28 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt OPEN_MEMSTREAM 3
 .Os
 .Sh NAME
@@ -22,10 +22,10 @@
 .Nm open_wmemstream
 .Nd open a memory buffer stream
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft FILE *
 .Fn open_memstream "char **pbuf" "size_t *psize"
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft FILE *
 .Fn open_wmemstream "wchar_t **pbuf" "size_t *psize"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdio/perror.3 b/lib/libc/stdio/perror.3
index 17817777809..8bb200e42e7 100644
--- a/lib/libc/stdio/perror.3
+++ b/lib/libc/stdio/perror.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: perror.3,v 1.8 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: perror.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt PERROR 3
 .Os
 .Sh NAME
 .Nm perror
 .Nd write error messages to standard error
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft void
 .Fn perror "const char *string"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index d540a97f8e8..f1fc86b85d5 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: printf.3,v 1.62 2013/04/01 20:16:31 guenther Exp $
+.\"	$OpenBSD: printf.3,v 1.63 2013/06/05 03:39:23 tedu 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: April 1 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt PRINTF 3
 .Os
 .Sh NAME
@@ -51,7 +51,7 @@
 .Nm vdprintf
 .Nd formatted output conversion
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft int
 .Fn printf "const char *format" ...
 .Ft int
@@ -64,8 +64,8 @@
 .Fn asprintf "char **ret" "const char *format" ...
 .Ft int
 .Fn dprintf "int fd" "const char * restrict format" ...
-.Fd #include <stdarg.h>
-.Fd #include <stdio.h>
+.In stdarg.h
+.In stdio.h
 .Ft int
 .Fn vprintf "const char *format" "va_list ap"
 .Ft int
diff --git a/lib/libc/stdio/putc.3 b/lib/libc/stdio/putc.3
index 737d9f670bd..13813ef3be4 100644
--- a/lib/libc/stdio/putc.3
+++ b/lib/libc/stdio/putc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: putc.3,v 1.10 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: putc.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt PUTC 3
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm putw
 .Nd output a character or word to a stream
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft int
 .Fn fputc "int c" "FILE *stream"
 .Ft int
diff --git a/lib/libc/stdio/remove.3 b/lib/libc/stdio/remove.3
index 6a9bd27745c..82081ef4605 100644
--- a/lib/libc/stdio/remove.3
+++ b/lib/libc/stdio/remove.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: remove.3,v 1.11 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: remove.3,v 1.12 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,14 +33,14 @@
 .\"
 .\"	@(#)remove.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt REMOVE 3
 .Os
 .Sh NAME
 .Nm remove
 .Nd remove a file or directory
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft int
 .Fn remove "const char *path"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdio/setbuf.3 b/lib/libc/stdio/setbuf.3
index e3aaaed54d6..f6e7a0fd1fb 100644
--- a/lib/libc/stdio/setbuf.3
+++ b/lib/libc/stdio/setbuf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: setbuf.3,v 1.12 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: setbuf.3,v 1.13 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SETBUF 3
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm setvbuf
 .Nd stream buffering operations
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft void
 .Fn setbuf "FILE *stream" "char *buf"
 .Ft void
diff --git a/lib/libc/stdio/stdio.3 b/lib/libc/stdio/stdio.3
index 1aea9147013..07a947bba97 100644
--- a/lib/libc/stdio/stdio.3
+++ b/lib/libc/stdio/stdio.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stdio.3,v 1.26 2013/03/04 01:50:01 brad Exp $
+.\"	$OpenBSD: stdio.3,v 1.27 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -27,14 +27,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: March 4 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STDIO 3
 .Os
 .Sh NAME
 .Nm stdio
 .Nd standard input/output library functions
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Pp
 .Fd FILE *stdin;
 .Fd FILE *stdout;
diff --git a/lib/libc/stdio/tmpnam.3 b/lib/libc/stdio/tmpnam.3
index 5e08dfa247a..b3c07392ca2 100644
--- a/lib/libc/stdio/tmpnam.3
+++ b/lib/libc/stdio/tmpnam.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tmpnam.3,v 1.17 2012/09/07 05:37:06 jmc Exp $
+.\"	$OpenBSD: tmpnam.3,v 1.18 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 7 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TMPFILE 3
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nm tmpnam
 .Nd temporary file routines
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft FILE *
 .Fn tmpfile void
 .Ft char *
diff --git a/lib/libc/stdio/ungetc.3 b/lib/libc/stdio/ungetc.3
index 85392075e84..ea4c9fd5d36 100644
--- a/lib/libc/stdio/ungetc.3
+++ b/lib/libc/stdio/ungetc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ungetc.3,v 1.7 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: ungetc.3,v 1.8 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt UNGETC 3
 .Os
 .Sh NAME
 .Nm ungetc
 .Nd un-get character from input stream
 .Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
 .Ft int
 .Fn ungetc "int c" "FILE *stream"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/a64l.3 b/lib/libc/stdlib/a64l.3
index da0aae33c90..11a74604aca 100644
--- a/lib/libc/stdlib/a64l.3
+++ b/lib/libc/stdlib/a64l.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: a64l.3,v 1.11 2010/04/01 17:06:55 jmc Exp $
+.\" $OpenBSD: a64l.3,v 1.12 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 1 2010 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt A64L 3
 .Os
 .Sh NAME
@@ -22,7 +22,7 @@
 .Nm l64a
 .Nd convert between 32-bit integer and radix-64 ASCII string
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft long
 .Fn a64l "const char *s"
 .Ft char *
diff --git a/lib/libc/stdlib/abort.3 b/lib/libc/stdlib/abort.3
index 4ec85882b29..b0197bf824d 100644
--- a/lib/libc/stdlib/abort.3
+++ b/lib/libc/stdlib/abort.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: abort.3,v 1.8 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: abort.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ABORT 3
 .Os
 .Sh NAME
 .Nm abort
 .Nd cause abnormal program termination
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft void
 .Fn abort void
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/abs.3 b/lib/libc/stdlib/abs.3
index 473aea1cd63..6925456c213 100644
--- a/lib/libc/stdlib/abs.3
+++ b/lib/libc/stdlib/abs.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: abs.3,v 1.9 2011/07/07 13:30:28 jmc Exp $
+.\"	$OpenBSD: abs.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 7 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ABS 3
 .Os
 .Sh NAME
 .Nm abs
 .Nd integer absolute value function
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft int
 .Fn abs "int j"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/alloca.3 b/lib/libc/stdlib/alloca.3
index 8cc5c42ff5f..47e9b97143a 100644
--- a/lib/libc/stdlib/alloca.3
+++ b/lib/libc/stdlib/alloca.3
@@ -25,16 +25,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: alloca.3,v 1.12 2012/04/12 15:46:57 deraadt Exp $
+.\"	$OpenBSD: alloca.3,v 1.13 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: April 12 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ALLOCA 3
 .Os
 .Sh NAME
 .Nm alloca
 .Nd memory allocator
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft void *
 .Fn alloca "size_t size"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/atexit.3 b/lib/libc/stdlib/atexit.3
index 0615feabb14..8e3ac3e60fa 100644
--- a/lib/libc/stdlib/atexit.3
+++ b/lib/libc/stdlib/atexit.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: atexit.3,v 1.8 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: atexit.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ATEXIT 3
 .Os
 .Sh NAME
 .Nm atexit
 .Nd register a function to be called on exit
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft int
 .Fn atexit "void (*function)(void)"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/atof.3 b/lib/libc/stdlib/atof.3
index 2538d0c8799..3fe1214c95e 100644
--- a/lib/libc/stdlib/atof.3
+++ b/lib/libc/stdlib/atof.3
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: atof.3,v 1.5 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: atof.3,v 1.6 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ATOF 3
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Tn ASCII
 string to double
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft double
 .Fn atof "const char *nptr"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/atoi.3 b/lib/libc/stdlib/atoi.3
index 0c6b62b25f3..0572f1faa57 100644
--- a/lib/libc/stdlib/atoi.3
+++ b/lib/libc/stdlib/atoi.3
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: atoi.3,v 1.9 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: atoi.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ATOI 3
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Tn ASCII
 string to integer
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft int
 .Fn atoi "const char *nptr"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/atol.3 b/lib/libc/stdlib/atol.3
index 3c5551182dd..ae4cbc7c3d2 100644
--- a/lib/libc/stdlib/atol.3
+++ b/lib/libc/stdlib/atol.3
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: atol.3,v 1.7 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: atol.3,v 1.8 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ATOL 3
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Tn ASCII
 string to long integer
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft long
 .Fn atol "const char *nptr"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/atoll.3 b/lib/libc/stdlib/atoll.3
index 608a61f4ce9..a9614ae7bb4 100644
--- a/lib/libc/stdlib/atoll.3
+++ b/lib/libc/stdlib/atoll.3
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: atoll.3,v 1.5 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: atoll.3,v 1.6 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ATOLL 3
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Tn ASCII
 string to long long integer
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft long long
 .Fn atoll "const char *nptr"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/bsearch.3 b/lib/libc/stdlib/bsearch.3
index 305dd48f509..270086df36d 100644
--- a/lib/libc/stdlib/bsearch.3
+++ b/lib/libc/stdlib/bsearch.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: bsearch.3,v 1.8 2012/07/08 10:25:55 guenther Exp $
+.\"	$OpenBSD: bsearch.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 8 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt BSEARCH 3
 .Os
 .Sh NAME
 .Nm bsearch
 .Nd binary search of a sorted table
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft void *
 .Fn bsearch "const void *key" "const void *base" "size_t nmemb" "size_t size" "int (*compar)(const void *, const void *)"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/div.3 b/lib/libc/stdlib/div.3
index 2403fcb0e85..1a2a3262690 100644
--- a/lib/libc/stdlib/div.3
+++ b/lib/libc/stdlib/div.3
@@ -27,16 +27,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: div.3,v 1.10 2011/07/07 13:30:28 jmc Exp $
+.\"	$OpenBSD: div.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 7 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt DIV 3
 .Os
 .Sh NAME
 .Nm div
 .Nd return quotient and remainder from division
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft div_t
 .Fn div "int num" "int denom"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/ecvt.3 b/lib/libc/stdlib/ecvt.3
index 0191a3420ec..d8a3489b1f9 100644
--- a/lib/libc/stdlib/ecvt.3
+++ b/lib/libc/stdlib/ecvt.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ecvt.3,v 1.10 2012/06/01 01:01:57 guenther Exp $
+.\" $OpenBSD: ecvt.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -18,7 +18,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd $Mdocdate: June 1 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt ECVT 3
 .Os
 .Sh NAME
@@ -29,7 +29,7 @@
 .Tn ASCII
 string
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft char *
 .Fn ecvt "double value" "int ndigit" "int *decpt" "int *sign"
 .Ft char *
diff --git a/lib/libc/stdlib/exit.3 b/lib/libc/stdlib/exit.3
index e452d454a88..11d4bc2304e 100644
--- a/lib/libc/stdlib/exit.3
+++ b/lib/libc/stdlib/exit.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: exit.3,v 1.12 2011/11/17 14:26:14 schwarze Exp $
+.\"	$OpenBSD: exit.3,v 1.13 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: November 17 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt EXIT 3
 .Os
 .Sh NAME
 .Nm exit, _Exit
 .Nd perform normal program termination
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft void
 .Fn exit "int status"
 .Ft void
diff --git a/lib/libc/stdlib/getenv.3 b/lib/libc/stdlib/getenv.3
index f987eb13a1c..5239d1b0d5c 100644
--- a/lib/libc/stdlib/getenv.3
+++ b/lib/libc/stdlib/getenv.3
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: getenv.3,v 1.18 2012/09/23 16:08:04 jeremy Exp $
+.\"	$OpenBSD: getenv.3,v 1.19 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: September 23 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETENV 3
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm unsetenv
 .Nd environment variable functions
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft char *
 .Fn getenv "const char *name"
 .Ft int
diff --git a/lib/libc/stdlib/getopt.3 b/lib/libc/stdlib/getopt.3
index ecdf42ab766..9e37f52c103 100644
--- a/lib/libc/stdlib/getopt.3
+++ b/lib/libc/stdlib/getopt.3
@@ -25,16 +25,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: getopt.3,v 1.42 2011/03/05 22:10:11 guenther Exp $
+.\"	$OpenBSD: getopt.3,v 1.43 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: March 5 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETOPT 3
 .Os
 .Sh NAME
 .Nm getopt
 .Nd get option character from command line argument list
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Vt extern char *optarg;
 .Vt extern int   opterr;
 .Vt extern int   optind;
diff --git a/lib/libc/stdlib/getopt_long.3 b/lib/libc/stdlib/getopt_long.3
index eaa5ead1c7a..a5973d6c995 100644
--- a/lib/libc/stdlib/getopt_long.3
+++ b/lib/libc/stdlib/getopt_long.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getopt_long.3,v 1.19 2011/03/21 13:41:50 espie Exp $
+.\"	$OpenBSD: getopt_long.3,v 1.20 2013/06/05 03:39:23 tedu Exp $
 .\"	$NetBSD: getopt_long.3,v 1.11 2002/10/02 10:54:19 wiz Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)getopt.3	8.5 (Berkeley) 4/27/95
 .\"
-.Dd $Mdocdate: March 21 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETOPT_LONG 3
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Nm getopt_long_only
 .Nd get long options from command line argument list
 .Sh SYNOPSIS
-.Fd #include <getopt.h>
+.In getopt.h
 .Vt extern char *optarg;
 .Vt extern int optind;
 .Vt extern int optopt;
diff --git a/lib/libc/stdlib/getsubopt.3 b/lib/libc/stdlib/getsubopt.3
index 9f35df703f1..ef813430de3 100644
--- a/lib/libc/stdlib/getsubopt.3
+++ b/lib/libc/stdlib/getsubopt.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: getsubopt.3,v 1.12 2007/05/31 19:19:31 jmc Exp $
+.\" $OpenBSD: getsubopt.3,v 1.13 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,14 +29,14 @@
 .\"
 .\"     @(#)getsubopt.3	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt GETSUBOPT 3
 .Os
 .Sh NAME
 .Nm getsubopt
 .Nd get sub options from an argument
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Vt extern char *suboptarg;
 .Ft int
 .Fn getsubopt "char **optionp" "char * const *tokens" "char **valuep"
diff --git a/lib/libc/stdlib/imaxabs.3 b/lib/libc/stdlib/imaxabs.3
index 74b724fcbfd..6c4793477e4 100644
--- a/lib/libc/stdlib/imaxabs.3
+++ b/lib/libc/stdlib/imaxabs.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: imaxabs.3,v 1.5 2011/07/07 13:30:28 jmc Exp $
+.\"	$OpenBSD: imaxabs.3,v 1.6 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 7 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt IMAXABS 3
 .Os
 .Sh NAME
 .Nm imaxabs
 .Nd integer absolute value function
 .Sh SYNOPSIS
-.Fd #include <inttypes.h>
+.In inttypes.h
 .Ft intmax_t
 .Fn imaxabs "intmax_t j"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/imaxdiv.3 b/lib/libc/stdlib/imaxdiv.3
index 2448f3f0546..40ac0bc236f 100644
--- a/lib/libc/stdlib/imaxdiv.3
+++ b/lib/libc/stdlib/imaxdiv.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: imaxdiv.3,v 1.4 2011/07/07 13:30:28 jmc Exp $
+.\"	$OpenBSD: imaxdiv.3,v 1.5 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 7 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt IMAXDIV 3
 .Os
 .Sh NAME
 .Nm imaxdiv
 .Nd return quotient and remainder from division
 .Sh SYNOPSIS
-.Fd #include <inttypes.h>
+.In inttypes.h
 .Ft imaxdiv_t
 .Fn imaxdiv "intmax_t num" "intmax_t denom"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/insque.3 b/lib/libc/stdlib/insque.3
index dbda059c435..64da36a898a 100644
--- a/lib/libc/stdlib/insque.3
+++ b/lib/libc/stdlib/insque.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: insque.3,v 1.8 2011/01/14 07:33:47 jmc Exp $
+.\"	$OpenBSD: insque.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
 .\" Copyright (c) 1993 John Brezak
 .\" All rights reserved.
 .\"
@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: January 14 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt INSQUE 3
 .Os
 .Sh NAME
@@ -34,7 +34,7 @@
 .Nm remque
 .Nd insert/remove element from a queue
 .Sh SYNOPSIS
-.Fd #include <search.h>
+.In search.h
 .Ft void
 .Fn insque "void *elem" "void *pred"
 .Ft void
diff --git a/lib/libc/stdlib/labs.3 b/lib/libc/stdlib/labs.3
index 9658c3ad51d..9937afbf0af 100644
--- a/lib/libc/stdlib/labs.3
+++ b/lib/libc/stdlib/labs.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: labs.3,v 1.10 2011/07/07 13:30:28 jmc Exp $
+.\"	$OpenBSD: labs.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 7 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt LABS 3
 .Os
 .Sh NAME
 .Nm labs, llabs
 .Nd return the absolute value of a long integer
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft long
 .Fn labs "long i"
 .Ft long long
diff --git a/lib/libc/stdlib/ldiv.3 b/lib/libc/stdlib/ldiv.3
index d300187887b..5ee6f947496 100644
--- a/lib/libc/stdlib/ldiv.3
+++ b/lib/libc/stdlib/ldiv.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: ldiv.3,v 1.10 2011/07/07 13:30:28 jmc Exp $
+.\"	$OpenBSD: ldiv.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 7 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt LDIV 3
 .Os
 .Sh NAME
 .Nm ldiv
 .Nd return quotient and remainder from division
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft ldiv_t
 .Fn ldiv "long num" "long denom"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/lldiv.3 b/lib/libc/stdlib/lldiv.3
index 4c97d7c9b76..9181f8b7c59 100644
--- a/lib/libc/stdlib/lldiv.3
+++ b/lib/libc/stdlib/lldiv.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: lldiv.3,v 1.3 2011/07/07 13:30:28 jmc Exp $
+.\"	$OpenBSD: lldiv.3,v 1.4 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 7 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt LLDIV 3
 .Os
 .Sh NAME
 .Nm lldiv
 .Nd return quotient and remainder from division
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft lldiv_t
 .Fn lldiv "long long num" "long long denom"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/lsearch.3 b/lib/libc/stdlib/lsearch.3
index 86638ae6210..c5a55980e1d 100644
--- a/lib/libc/stdlib/lsearch.3
+++ b/lib/libc/stdlib/lsearch.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lsearch.3,v 1.9 2009/02/10 21:47:56 jmc Exp $
+.\"	$OpenBSD: lsearch.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)lsearch.3	8.1 (Berkeley) 6/4/93
 .\"
-.Dd $Mdocdate: February 10 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt LSEARCH 3
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nm lfind
 .Nd linear searching routines
 .Sh SYNOPSIS
-.Fd #include <search.h>
+.In search.h
 .Ft char *
 .Fn lsearch "const void *key" "const void *base" "size_t *nelp" \
     "size_t width" "int (*compar)(const void *, const void *)"
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index 74df922f4bc..07971b9a006 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -30,9 +30,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: malloc.3,v 1.71 2012/11/02 18:18:15 djm Exp $
+.\"	$OpenBSD: malloc.3,v 1.72 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: November 2 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MALLOC 3
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@
 .Nm cfree
 .Nd memory allocation and deallocation
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft void *
 .Fn malloc "size_t size"
 .Ft void *
diff --git a/lib/libc/stdlib/qabs.3 b/lib/libc/stdlib/qabs.3
index b12dc59276b..6703072e720 100644
--- a/lib/libc/stdlib/qabs.3
+++ b/lib/libc/stdlib/qabs.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: qabs.3,v 1.12 2011/07/07 13:30:28 jmc Exp $
+.\"	$OpenBSD: qabs.3,v 1.13 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 7 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt QABS 3
 .Os
 .Sh NAME
 .Nm qabs
 .Nd return the absolute value of a quad integer
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft quad_t
 .Fn qabs "quad_t j"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/qdiv.3 b/lib/libc/stdlib/qdiv.3
index 94e3bdffb6a..5f5275493eb 100644
--- a/lib/libc/stdlib/qdiv.3
+++ b/lib/libc/stdlib/qdiv.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: qdiv.3,v 1.9 2011/07/07 13:30:28 jmc Exp $
+.\"	$OpenBSD: qdiv.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 7 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt QDIV 3
 .Os
 .Sh NAME
 .Nm qdiv
 .Nd return quotient and remainder from division
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft qdiv_t
 .Fn qdiv "quad_t num" "quad_t denom"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/qsort.3 b/lib/libc/stdlib/qsort.3
index 92c75d53659..f134741aa33 100644
--- a/lib/libc/stdlib/qsort.3
+++ b/lib/libc/stdlib/qsort.3
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: qsort.3,v 1.15 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: qsort.3,v 1.16 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt QSORT 3
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nm mergesort
 .Nd sort functions
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft void
 .Fn qsort "void *base" "size_t nmemb" "size_t size" "int (*compar)(const void *, const void *)"
 .Ft int
diff --git a/lib/libc/stdlib/radixsort.3 b/lib/libc/stdlib/radixsort.3
index b90a557718a..e62f7602706 100644
--- a/lib/libc/stdlib/radixsort.3
+++ b/lib/libc/stdlib/radixsort.3
@@ -25,9 +25,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: radixsort.3,v 1.11 2007/05/31 19:19:31 jmc Exp $
+.\"	$OpenBSD: radixsort.3,v 1.12 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt RADIXSORT 3
 .Os
 .Sh NAME
@@ -35,8 +35,8 @@
 .Nm sradixsort
 .Nd radix sort
 .Sh SYNOPSIS
-.Fd #include <limits.h>
-.Fd #include <stdlib.h>
+.In limits.h
+.In stdlib.h
 .Ft int
 .Fn radixsort "const u_char **base" "int nmemb" "const u_char *table" "u_int endbyte"
 .Ft int
diff --git a/lib/libc/stdlib/rand.3 b/lib/libc/stdlib/rand.3
index 50fe67d1095..f1bff691bee 100644
--- a/lib/libc/stdlib/rand.3
+++ b/lib/libc/stdlib/rand.3
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: rand.3,v 1.11 2012/06/02 00:14:16 guenther Exp $
+.\"	$OpenBSD: rand.3,v 1.12 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: June 2 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt RAND 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm srand
 .Nd bad random number generator
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft void
 .Fn srand "unsigned int seed"
 .Ft int
diff --git a/lib/libc/stdlib/rand48.3 b/lib/libc/stdlib/rand48.3
index 340e6461bd9..c105f85aa50 100644
--- a/lib/libc/stdlib/rand48.3
+++ b/lib/libc/stdlib/rand48.3
@@ -9,9 +9,9 @@
 .\" of any kind. I shall in no event be liable for anything that happens
 .\" to anyone/anything when using this software.
 .\"
-.\"	$OpenBSD: rand48.3,v 1.12 2012/06/02 00:14:16 guenther Exp $
+.\"	$OpenBSD: rand48.3,v 1.13 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: June 2 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt RAND48 3
 .Os
 .Sh NAME
@@ -26,7 +26,7 @@
 .Nm lcong48
 .Nd pseudo-random number generators and initialization routines
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft double
 .Fn drand48 void
 .Ft double
diff --git a/lib/libc/stdlib/random.3 b/lib/libc/stdlib/random.3
index 84756bb3e35..fdb78848d8e 100644
--- a/lib/libc/stdlib/random.3
+++ b/lib/libc/stdlib/random.3
@@ -25,9 +25,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: random.3,v 1.20 2012/06/01 01:01:57 guenther Exp $
+.\"	$OpenBSD: random.3,v 1.21 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: June 1 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt RANDOM 3
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Nm setstate
 .Nd better random number generator; routines for changing generators
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft long
 .Fn random void
 .Ft void
diff --git a/lib/libc/stdlib/realpath.3 b/lib/libc/stdlib/realpath.3
index 68ed088161d..c57e5a57889 100644
--- a/lib/libc/stdlib/realpath.3
+++ b/lib/libc/stdlib/realpath.3
@@ -28,17 +28,17 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: realpath.3,v 1.17 2011/07/24 22:29:05 jmc Exp $
+.\"	$OpenBSD: realpath.3,v 1.18 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 24 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt REALPATH 3
 .Os
 .Sh NAME
 .Nm realpath
 .Nd returns the canonicalized absolute pathname
 .Sh SYNOPSIS
-.Fd #include <limits.h>
-.Fd #include <stdlib.h>
+.In limits.h
+.In stdlib.h
 .Ft "char *"
 .Fn realpath "const char *pathname" "char *resolved"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/strtod.3 b/lib/libc/stdlib/strtod.3
index cc9104065fb..cb819c6f39a 100644
--- a/lib/libc/stdlib/strtod.3
+++ b/lib/libc/stdlib/strtod.3
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: strtod.3,v 1.17 2013/01/15 05:44:41 martynas Exp $
+.\"	$OpenBSD: strtod.3,v 1.18 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: January 15 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRTOD 3
 .Os
 .Sh NAME
@@ -42,7 +42,7 @@
 .Tn ASCII
 string to double, float or long double
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft double
 .Fn strtod "const char *nptr" "char **endptr"
 .Pp
diff --git a/lib/libc/stdlib/strtol.3 b/lib/libc/stdlib/strtol.3
index 6f9037a645d..10cc102caae 100644
--- a/lib/libc/stdlib/strtol.3
+++ b/lib/libc/stdlib/strtol.3
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: strtol.3,v 1.22 2011/09/03 23:24:51 jmc Exp $
+.\"	$OpenBSD: strtol.3,v 1.23 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: September 3 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRTOL 3
 .Os
 .Sh NAME
@@ -41,21 +41,21 @@
 .Nm strtoq ,
 .Nd "convert string value to a long, long long or intmax_t integer"
 .Sh SYNOPSIS
-.Fd #include <limits.h>
-.Fd #include <stdlib.h>
+.In limits.h
+.In stdlib.h
 .Ft long
 .Fn strtol "const char *nptr" "char **endptr" "int base"
 .Pp
 .Ft long long
 .Fn strtoll "const char *nptr" "char **endptr" "int base"
 .Pp
-.Fd #include <inttypes.h>
+.In inttypes.h
 .Ft intmax_t
 .Fn strtoimax "const char *nptr" "char **endptr" "int base"
 .Pp
-.Fd #include <sys/types.h>
-.Fd #include <limits.h>
-.Fd #include <stdlib.h>
+.In sys/types.h
+.In limits.h
+.In stdlib.h
 .Ft quad_t
 .Fn strtoq "const char *nptr" "char **endptr" "int base"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/strtonum.3 b/lib/libc/stdlib/strtonum.3
index bd66711e6c9..419a2db61d4 100644
--- a/lib/libc/stdlib/strtonum.3
+++ b/lib/libc/stdlib/strtonum.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strtonum.3,v 1.15 2013/04/17 18:53:27 tedu Exp $
+.\" $OpenBSD: strtonum.3,v 1.16 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 2004 Ted Unangst
 .\"
@@ -14,14 +14,14 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 17 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRTONUM 3
 .Os
 .Sh NAME
 .Nm strtonum
 .Nd "reliably convert string value to an integer"
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft long long
 .Fo strtonum
 .Fa "const char *nptr"
diff --git a/lib/libc/stdlib/strtoul.3 b/lib/libc/stdlib/strtoul.3
index 5e86772ef01..04c9e18d741 100644
--- a/lib/libc/stdlib/strtoul.3
+++ b/lib/libc/stdlib/strtoul.3
@@ -29,9 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: strtoul.3,v 1.20 2010/04/07 18:32:53 jmc Exp $
+.\"	$OpenBSD: strtoul.3,v 1.21 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: April 7 2010 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRTOUL 3
 .Os
 .Sh NAME
@@ -41,18 +41,18 @@
 .Nm strtouq
 .Nd "convert a string to an unsigned long, unsigned long long or uintmax_t integer"
 .Sh SYNOPSIS
-.Fd #include <limits.h>
-.Fd #include <stdlib.h>
+.In limits.h
+.In stdlib.h
 .Ft unsigned long
 .Fn strtoul "const char *nptr" "char **endptr" "int base"
 .Ft unsigned long long
 .Fn strtoull "const char *nptr" "char **endptr" "int base"
-.Fd #include <inttypes.h>
+.In inttypes.h
 .Ft uintmax_t
 .Fn strtoumax "const char *nptr" "char **endptr" "int base"
-.Fd #include <sys/types.h>
-.Fd #include <limits.h>
-.Fd #include <stdlib.h>
+.In sys/types.h
+.In limits.h
+.In stdlib.h
 .Ft u_quad_t
 .Fn strtouq "const char *nptr" "char **endptr" "int base"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/system.3 b/lib/libc/stdlib/system.3
index a49e595bc0a..7c0a5490b97 100644
--- a/lib/libc/stdlib/system.3
+++ b/lib/libc/stdlib/system.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $OpenBSD: system.3,v 1.11 2008/04/04 19:30:41 kurt Exp $
+.\"     $OpenBSD: system.3,v 1.12 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: April 4 2008 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SYSTEM 3
 .Os
 .Sh NAME
 .Nm system
 .Nd pass a command to the shell
 .Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
 .Ft int
 .Fn system "const char *string"
 .Sh DESCRIPTION
diff --git a/lib/libc/stdlib/tsearch.3 b/lib/libc/stdlib/tsearch.3
index 829c4edf72e..46d0bba10c1 100644
--- a/lib/libc/stdlib/tsearch.3
+++ b/lib/libc/stdlib/tsearch.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tsearch.3,v 1.18 2012/07/08 10:25:55 guenther Exp $
+.\" $OpenBSD: tsearch.3,v 1.19 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 8 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TSEARCH 3
 .Os
 .Sh NAME
@@ -24,7 +24,7 @@
 .Nm twalk
 .Nd manipulate binary search trees
 .Sh SYNOPSIS
-.Fd #include <search.h>
+.In search.h
 .Ft void *
 .Fn tdelete "const void *key" "void **rootp" "int (*compar)(const void *, const void *)"
 .Ft void *
diff --git a/lib/libc/string/bcmp.3 b/lib/libc/string/bcmp.3
index 1660b4356bf..52584b4b838 100644
--- a/lib/libc/string/bcmp.3
+++ b/lib/libc/string/bcmp.3
@@ -27,9 +27,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: bcmp.3,v 1.9 2011/07/25 00:38:52 schwarze Exp $
+.\"	$OpenBSD: bcmp.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt BCMP 3
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nm timingsafe_bcmp
 .Nd compare byte string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft int
 .Fn bcmp "const void *b1" "const void *b2" "size_t len"
 .Ft int
diff --git a/lib/libc/string/bcopy.3 b/lib/libc/string/bcopy.3
index 3beaf09aca1..94a8231fcb2 100644
--- a/lib/libc/string/bcopy.3
+++ b/lib/libc/string/bcopy.3
@@ -28,16 +28,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: bcopy.3,v 1.10 2011/07/25 00:38:52 schwarze Exp $
+.\"	$OpenBSD: bcopy.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt BCOPY 3
 .Os
 .Sh NAME
 .Nm bcopy
 .Nd copy bytes
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft void
 .Fn bcopy "const void *src" "void *dst" "size_t len"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/bm.3 b/lib/libc/string/bm.3
index 6c74848ecc5..d4928061968 100644
--- a/lib/libc/string/bm.3
+++ b/lib/libc/string/bm.3
@@ -28,9 +28,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: bm.3,v 1.10 2011/07/25 00:38:52 schwarze Exp $
+.\"	$OpenBSD: bm.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt BM 3
 .Os
 .Sh NAME
@@ -39,8 +39,8 @@
 .Nm bm_free
 .Nd Boyer-Moore string search
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <bm.h>
+.In sys/types.h
+.In bm.h
 .Ft bm_pat *
 .Fn bm_comp "const unsigned char *pattern" "size_t patlen" \
     "const unsigned char freq[256]"
diff --git a/lib/libc/string/bstring.3 b/lib/libc/string/bstring.3
index c44c5386c6b..d88b78f504e 100644
--- a/lib/libc/string/bstring.3
+++ b/lib/libc/string/bstring.3
@@ -27,16 +27,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: bstring.3,v 1.9 2011/07/25 00:38:52 schwarze Exp $
+.\"	$OpenBSD: bstring.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt BSTRING 3
 .Os
 .Sh NAME
 .Nm bstring
 .Nd byte string operations
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft int
 .Fn bcmp "const void *b1" "const void *b2" "size_t len"
 .Ft void
diff --git a/lib/libc/string/bzero.3 b/lib/libc/string/bzero.3
index c79470377f1..1fd5da81b5c 100644
--- a/lib/libc/string/bzero.3
+++ b/lib/libc/string/bzero.3
@@ -27,16 +27,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: bzero.3,v 1.8 2011/07/25 00:38:52 schwarze Exp $
+.\"	$OpenBSD: bzero.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt BZERO 3
 .Os
 .Sh NAME
 .Nm bzero
 .Nd write zeroes to a byte string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft void
 .Fn bzero "void *b" "size_t len"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/ffs.3 b/lib/libc/string/ffs.3
index eea0994cb19..c0ed7baa9ed 100644
--- a/lib/libc/string/ffs.3
+++ b/lib/libc/string/ffs.3
@@ -27,16 +27,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: ffs.3,v 1.8 2012/01/14 13:31:32 jmc Exp $
+.\"	$OpenBSD: ffs.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: January 14 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt FFS 3
 .Os
 .Sh NAME
 .Nm ffs
 .Nd find first bit set in a bit string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft int
 .Fn ffs "int value"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3
index f8f880e3b13..076e8f64abe 100644
--- a/lib/libc/string/memccpy.3
+++ b/lib/libc/string/memccpy.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: memccpy.3,v 1.10 2011/07/25 00:38:52 schwarze Exp $
+.\"	$OpenBSD: memccpy.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,14 +29,14 @@
 .\"
 .\"     @(#)memccpy.3	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MEMCCPY 3
 .Os
 .Sh NAME
 .Nm memccpy
 .Nd copy string until character found
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft void *
 .Fn memccpy "void *dst" "const void *src" "int c" "size_t len"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/memchr.3 b/lib/libc/string/memchr.3
index 56a4e4780e8..1373e147356 100644
--- a/lib/libc/string/memchr.3
+++ b/lib/libc/string/memchr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: memchr.3,v 1.10 2011/07/25 00:38:52 schwarze Exp $
+.\"	$OpenBSD: memchr.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MEMCHR 3
 .Os
 .Sh NAME
 .Nm memchr
 .Nd locate byte in byte string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft void *
 .Fn memchr "const void *b" "int c" "size_t len"
 .Ft void *
diff --git a/lib/libc/string/memcmp.3 b/lib/libc/string/memcmp.3
index 951a04ed8a4..ebd838825ad 100644
--- a/lib/libc/string/memcmp.3
+++ b/lib/libc/string/memcmp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: memcmp.3,v 1.7 2011/07/25 00:38:52 schwarze Exp $
+.\"	$OpenBSD: memcmp.3,v 1.8 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MEMCMP 3
 .Os
 .Sh NAME
 .Nm memcmp
 .Nd compare byte string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft int
 .Fn memcmp "const void *b1" "const void *b2" "size_t len"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/memcpy.3 b/lib/libc/string/memcpy.3
index 51c458ee3ec..8df2a785b99 100644
--- a/lib/libc/string/memcpy.3
+++ b/lib/libc/string/memcpy.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: memcpy.3,v 1.9 2013/06/04 03:02:09 deraadt Exp $
+.\"	$OpenBSD: memcpy.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 4 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MEMCPY 3
 .Os
 .Sh NAME
 .Nm memcpy
 .Nd copy bytes
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft void *
 .Fn memcpy "void *dst" "const void *src" "size_t len"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/memmove.3 b/lib/libc/string/memmove.3
index ae8569a1c7b..8665e4abcfb 100644
--- a/lib/libc/string/memmove.3
+++ b/lib/libc/string/memmove.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: memmove.3,v 1.8 2011/07/25 00:38:52 schwarze Exp $
+.\"	$OpenBSD: memmove.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MEMMOVE 3
 .Os
 .Sh NAME
 .Nm memmove
 .Nd copy bytes
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft void *
 .Fn memmove "void *dst" "const void *src" "size_t len"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/memset.3 b/lib/libc/string/memset.3
index db94cb9ba61..ac5b7e90ad2 100644
--- a/lib/libc/string/memset.3
+++ b/lib/libc/string/memset.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: memset.3,v 1.7 2011/07/25 00:38:52 schwarze Exp $
+.\"	$OpenBSD: memset.3,v 1.8 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt MEMSET 3
 .Os
 .Sh NAME
 .Nm memset
 .Nd write a byte to byte string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft void *
 .Fn memset "void *b" "int c" "size_t len"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/stpcpy.3 b/lib/libc/string/stpcpy.3
index 447bfc20a91..ed1b830b56e 100644
--- a/lib/libc/string/stpcpy.3
+++ b/lib/libc/string/stpcpy.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stpcpy.3,v 1.2 2012/01/17 08:12:12 jmc Exp $
+.\"	$OpenBSD: stpcpy.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 17 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STPCPY 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm stpncpy
 .Nd copy strings
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft char *
 .Fn stpcpy "char *dst" "const char *src"
 .Ft char *
diff --git a/lib/libc/string/strcasecmp.3 b/lib/libc/string/strcasecmp.3
index 0900c8a97a4..8bd7387dc59 100644
--- a/lib/libc/string/strcasecmp.3
+++ b/lib/libc/string/strcasecmp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strcasecmp.3,v 1.11 2011/07/25 00:38:52 schwarze Exp $
+.\"	$OpenBSD: strcasecmp.3,v 1.12 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)strcasecmp.3	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRCASECMP 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm strncasecmp
 .Nd compare strings, ignoring case
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft int
 .Fn strcasecmp "const char *s1" "const char *s2"
 .Ft int
diff --git a/lib/libc/string/strcat.3 b/lib/libc/string/strcat.3
index 81aae19a63b..79302dba04c 100644
--- a/lib/libc/string/strcat.3
+++ b/lib/libc/string/strcat.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strcat.3,v 1.13 2011/07/25 00:38:52 schwarze Exp $
+.\"	$OpenBSD: strcat.3,v 1.14 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRCAT 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm strncat
 .Nd concatenate strings
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft char *
 .Fn strcat "char *s" "const char *append"
 .Ft char *
diff --git a/lib/libc/string/strchr.3 b/lib/libc/string/strchr.3
index d3194dffab6..eb9ac8e8338 100644
--- a/lib/libc/string/strchr.3
+++ b/lib/libc/string/strchr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strchr.3,v 1.10 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: strchr.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRCHR 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm index
 .Nd locate first occurrence of a character in a string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft char *
 .Fn strchr "const char *s" "int c"
 .Ft char *
diff --git a/lib/libc/string/strcmp.3 b/lib/libc/string/strcmp.3
index 5b0794208ac..156021b08c9 100644
--- a/lib/libc/string/strcmp.3
+++ b/lib/libc/string/strcmp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strcmp.3,v 1.12 2011/07/25 07:51:30 jmc Exp $
+.\"	$OpenBSD: strcmp.3,v 1.13 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRCMP 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm strncmp
 .Nd compare strings
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft int
 .Fn strcmp "const char *s1" "const char *s2"
 .Ft int
diff --git a/lib/libc/string/strcoll.3 b/lib/libc/string/strcoll.3
index 72e398c44cd..d421200b628 100644
--- a/lib/libc/string/strcoll.3
+++ b/lib/libc/string/strcoll.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: strcoll.3,v 1.8 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: strcoll.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRCOLL 3
 .Os
 .Sh NAME
 .Nm strcoll
 .Nd compare strings according to current collation
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft int
 .Fn strcoll "const char *s1" "const char *s2"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/strcpy.3 b/lib/libc/string/strcpy.3
index 400eeee622a..11f996a4ea4 100644
--- a/lib/libc/string/strcpy.3
+++ b/lib/libc/string/strcpy.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strcpy.3,v 1.16 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: strcpy.3,v 1.17 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRCPY 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm strncpy
 .Nd copy strings
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft char *
 .Fn strcpy "char *dst" "const char *src"
 .Ft char *
diff --git a/lib/libc/string/strcspn.3 b/lib/libc/string/strcspn.3
index 70c8ef76120..07eb9ca26fe 100644
--- a/lib/libc/string/strcspn.3
+++ b/lib/libc/string/strcspn.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strcspn.3,v 1.10 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: strcspn.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRCSPN 3
 .Os
 .Sh NAME
 .Nm strcspn
 .Nd span the complement of a string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft size_t
 .Fn strcspn "const char *s" "const char *charset"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/strdup.3 b/lib/libc/string/strdup.3
index 45a7bd18264..2d7fa0bb963 100644
--- a/lib/libc/string/strdup.3
+++ b/lib/libc/string/strdup.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strdup.3,v 1.19 2011/12/08 08:06:19 lum Exp $
+.\"	$OpenBSD: strdup.3,v 1.20 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)strdup.3	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: December 8 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRDUP 3
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nm strndup
 .Nd save a copy of a string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft char *
 .Fn strdup "const char *s"
 .Ft char *
diff --git a/lib/libc/string/strerror.3 b/lib/libc/string/strerror.3
index bab48af308f..5b59235ef67 100644
--- a/lib/libc/string/strerror.3
+++ b/lib/libc/string/strerror.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: strerror.3,v 1.11 2012/03/26 05:07:38 guenther Exp $
+.\"	$OpenBSD: strerror.3,v 1.12 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: March 26 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRERROR 3
 .Os
 .Sh NAME
 .Nm strerror
 .Nd get error message string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft char *
 .Fn strerror "int errnum"
 .Ft int
diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3
index 4d47ad444da..2373d1fb9c1 100644
--- a/lib/libc/string/string.3
+++ b/lib/libc/string/string.3
@@ -27,16 +27,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: string.3,v 1.12 2007/05/31 19:19:32 jmc Exp $
+.\"	$OpenBSD: string.3,v 1.13 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRING 3
 .Os
 .Sh NAME
 .Nm string
 .Nd string specific functions
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft char *
 .Fn strcat "char *s" "const char *append"
 .Ft char *
diff --git a/lib/libc/string/strlcpy.3 b/lib/libc/string/strlcpy.3
index acce0f7d436..3c0eb2b9a96 100644
--- a/lib/libc/string/strlcpy.3
+++ b/lib/libc/string/strlcpy.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strlcpy.3,v 1.22 2012/04/03 14:01:55 jmc Exp $
+.\"	$OpenBSD: strlcpy.3,v 1.23 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1998, 2000 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 3 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRLCPY 3
 .Os
 .Sh NAME
@@ -22,7 +22,7 @@
 .Nm strlcat
 .Nd size-bounded string copying and concatenation
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft size_t
 .Fn strlcpy "char *dst" "const char *src" "size_t dstsize"
 .Ft size_t
diff --git a/lib/libc/string/strlen.3 b/lib/libc/string/strlen.3
index 9187496a00c..4d416e200a8 100644
--- a/lib/libc/string/strlen.3
+++ b/lib/libc/string/strlen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strlen.3,v 1.10 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: strlen.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRLEN 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm strnlen
 .Nd find length of a string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft size_t
 .Fn strlen "const char *s"
 .Ft size_t
diff --git a/lib/libc/string/strmode.3 b/lib/libc/string/strmode.3
index 5d371b38c8a..bebda2ca1ce 100644
--- a/lib/libc/string/strmode.3
+++ b/lib/libc/string/strmode.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strmode.3,v 1.15 2011/07/25 00:38:53 schwarze Exp $
+.\" $OpenBSD: strmode.3,v 1.16 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,14 +29,14 @@
 .\"
 .\"     @(#)strmode.3	8.3 (Berkeley) 7/28/94
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRMODE 3
 .Os
 .Sh NAME
 .Nm strmode
 .Nd convert inode status information into a symbolic string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft void
 .Fn strmode "mode_t mode" "char *bp"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/strpbrk.3 b/lib/libc/string/strpbrk.3
index 9e13c42ad08..b758df68543 100644
--- a/lib/libc/string/strpbrk.3
+++ b/lib/libc/string/strpbrk.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strpbrk.3,v 1.9 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: strpbrk.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRPBRK 3
 .Os
 .Sh NAME
 .Nm strpbrk
 .Nd locate multiple characters in string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft char *
 .Fn strpbrk "const char *s" "const char *charset"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/strrchr.3 b/lib/libc/string/strrchr.3
index 9eea08b0a92..046b28ce567 100644
--- a/lib/libc/string/strrchr.3
+++ b/lib/libc/string/strrchr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strrchr.3,v 1.9 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: strrchr.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRRCHR 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm rindex
 .Nd locate last occurrence of a character in a string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft char *
 .Fn strrchr "const char *s" "int c"
 .Ft char *
diff --git a/lib/libc/string/strsep.3 b/lib/libc/string/strsep.3
index 63cdf2333ad..77053f66d73 100644
--- a/lib/libc/string/strsep.3
+++ b/lib/libc/string/strsep.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strsep.3,v 1.13 2011/07/25 00:38:53 schwarze Exp $
+.\" $OpenBSD: strsep.3,v 1.14 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,14 +32,14 @@
 .\"
 .\"	@(#)strsep.3	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRSEP 3
 .Os
 .Sh NAME
 .Nm strsep
 .Nd separate strings
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft char *
 .Fn strsep "char **stringp" "const char *delim"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/strsignal.3 b/lib/libc/string/strsignal.3
index 7128d811fd5..3261f699d88 100644
--- a/lib/libc/string/strsignal.3
+++ b/lib/libc/string/strsignal.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: strsignal.3,v 1.7 2012/03/26 05:06:35 guenther Exp $
+.\"	$OpenBSD: strsignal.3,v 1.8 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: March 26 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRSIGNAL 3
 .Os
 .Sh NAME
 .Nm strsignal
 .Nd get signal description string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft char *
 .Fn strsignal "int sig"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/strspn.3 b/lib/libc/string/strspn.3
index b1a2ae30146..e339d9b6af4 100644
--- a/lib/libc/string/strspn.3
+++ b/lib/libc/string/strspn.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strspn.3,v 1.10 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: strspn.3,v 1.11 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRSPN 3
 .Os
 .Sh NAME
 .Nm strspn
 .Nd span a string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft size_t
 .Fn strspn "const char *s" "const char *charset"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/strstr.3 b/lib/libc/string/strstr.3
index 4069d55ed2b..1f79d455902 100644
--- a/lib/libc/string/strstr.3
+++ b/lib/libc/string/strstr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strstr.3,v 1.11 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: strstr.3,v 1.12 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRSTR 3
 .Os
 .Sh NAME
 .Nm strstr , strcasestr
 .Nd locate a substring in a string
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft char *
 .Fn strstr "const char *big" "const char *little"
 .Ft char *
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
index fbf0abfc269..046a43b6b1b 100644
--- a/lib/libc/string/strtok.3
+++ b/lib/libc/string/strtok.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strtok.3,v 1.20 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: strtok.3,v 1.21 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1988, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRTOK 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm strtok_r
 .Nd string token operations
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft char *
 .Fn strtok "char *str" "const char *sep"
 .Ft char *
diff --git a/lib/libc/string/strxfrm.3 b/lib/libc/string/strxfrm.3
index e4472946bef..481f741cb79 100644
--- a/lib/libc/string/strxfrm.3
+++ b/lib/libc/string/strxfrm.3
@@ -29,16 +29,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: strxfrm.3,v 1.9 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: strxfrm.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRXFRM 3
 .Os
 .Sh NAME
 .Nm strxfrm
 .Nd transform a string under locale
 .Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
 .Ft size_t
 .Fn strxfrm "char *dst" "const char *src" "size_t n"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/swab.3 b/lib/libc/string/swab.3
index 5ebaa485e9e..77e5a9ccbc7 100644
--- a/lib/libc/string/swab.3
+++ b/lib/libc/string/swab.3
@@ -25,16 +25,16 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: swab.3,v 1.7 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: swab.3,v 1.8 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt SWAB 3
 .Os
 .Sh NAME
 .Nm swab
 .Nd swap adjacent bytes
 .Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
 .Ft void
 .Fn swab "const void *src" "void *dst" "size_t len"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/wcscasecmp.3 b/lib/libc/string/wcscasecmp.3
index 94cd6e0c380..743224a1238 100644
--- a/lib/libc/string/wcscasecmp.3
+++ b/lib/libc/string/wcscasecmp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wcscasecmp.3,v 1.2 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: wcscasecmp.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)strcasecmp.3	8.1 (Berkeley) 6/9/93
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSCASECMP 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm wcsncasecmp
 .Nd compare wide strings, ignoring case
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft int
 .Fn wcscasecmp "const wchar_t *s1" "const wchar_t *s2"
 .Ft int
diff --git a/lib/libc/string/wcscat.3 b/lib/libc/string/wcscat.3
index d0281b8bd1a..9b7588cf9e7 100644
--- a/lib/libc/string/wcscat.3
+++ b/lib/libc/string/wcscat.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wcscat.3,v 1.2 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: wcscat.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSCAT 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm wcsncat
 .Nd concatenate wide strings
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft wchar_t *
 .Fn wcscat "wchar_t * restrict s" "const wchar_t * restrict append"
 .Ft wchar_t *
diff --git a/lib/libc/string/wcschr.3 b/lib/libc/string/wcschr.3
index ca2c0ed7438..bb714b2099d 100644
--- a/lib/libc/string/wcschr.3
+++ b/lib/libc/string/wcschr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wcschr.3,v 1.3 2011/07/25 07:51:30 jmc Exp $
+.\"	$OpenBSD: wcschr.3,v 1.4 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSCHR 3
 .Os
 .Sh NAME
 .Nm wcschr
 .Nd locate first occurrence of a wide character in a wide string
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft wchar_t *
 .Fn wcschr "const wchar_t *s" "wchar_t c"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/wcscmp.3 b/lib/libc/string/wcscmp.3
index b34e5c2168b..53cd15a1f01 100644
--- a/lib/libc/string/wcscmp.3
+++ b/lib/libc/string/wcscmp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wcscmp.3,v 1.2 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: wcscmp.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSCMP 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm wcsncmp
 .Nd compare wide strings
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft int
 .Fn wcscmp "const wchar_t *s1" "const wchar_t *s2"
 .Ft int
diff --git a/lib/libc/string/wcscpy.3 b/lib/libc/string/wcscpy.3
index dcc375acbf1..c366103565d 100644
--- a/lib/libc/string/wcscpy.3
+++ b/lib/libc/string/wcscpy.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wcscpy.3,v 1.2 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: wcscpy.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSCPY 3
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nm wcsncpy
 .Nd copy wide strings
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft wchar_t *
 .Fn wcscpy "wchar_t * restrict dst" "const wchar_t * restrict src"
 .Ft wchar_t *
diff --git a/lib/libc/string/wcscspn.3 b/lib/libc/string/wcscspn.3
index c17992501f0..520a7392029 100644
--- a/lib/libc/string/wcscspn.3
+++ b/lib/libc/string/wcscspn.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wcscspn.3,v 1.2 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: wcscspn.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSCSPN 3
 .Os
 .Sh NAME
 .Nm wcscspn
 .Nd span the complement of a wide string
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft size_t
 .Fn wcscspn "const wchar_t *s" "const wchar_t *charset"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/wcslcpy.3 b/lib/libc/string/wcslcpy.3
index 98ecf0aabc5..4288b98e015 100644
--- a/lib/libc/string/wcslcpy.3
+++ b/lib/libc/string/wcslcpy.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wcslcpy.3,v 1.3 2011/07/25 07:51:30 jmc Exp $
+.\"	$OpenBSD: wcslcpy.3,v 1.4 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1998, 2000 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSLCPY 3
 .Os
 .Sh NAME
@@ -22,7 +22,7 @@
 .Nm wcslcat
 .Nd size-bounded wide string copying and concatenation
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft size_t
 .Fn wcslcpy "wchar_t *dst" "const wchar_t *src" "size_t size"
 .Ft size_t
diff --git a/lib/libc/string/wcslen.3 b/lib/libc/string/wcslen.3
index 1b2eceab933..12f81763ba3 100644
--- a/lib/libc/string/wcslen.3
+++ b/lib/libc/string/wcslen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wcslen.3,v 1.2 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: wcslen.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSLEN 3
 .Os
 .Sh NAME
 .Nm wcslen
 .Nd find length of a wide string
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft size_t
 .Fn wcslen "const wchar_t *s"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/wcspbrk.3 b/lib/libc/string/wcspbrk.3
index 6589e83c83e..602bfdc3d6e 100644
--- a/lib/libc/string/wcspbrk.3
+++ b/lib/libc/string/wcspbrk.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wcspbrk.3,v 1.2 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: wcspbrk.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSPBRK 3
 .Os
 .Sh NAME
 .Nm wcspbrk
 .Nd locate multiple wide characters in a wide string
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft wchar_t *
 .Fn wcspbrk "const wchar_t *s" "const wchar_t *charset"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/wcsrchr.3 b/lib/libc/string/wcsrchr.3
index d65caa42929..d4a2e7cf787 100644
--- a/lib/libc/string/wcsrchr.3
+++ b/lib/libc/string/wcsrchr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wcsrchr.3,v 1.2 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: wcsrchr.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSRCHR 3
 .Os
 .Sh NAME
 .Nm wcsrchr
 .Nd locate last occurrence of a wide character in a wide string
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft wchar_t *
 .Fn wcsrchr "const wchar_t *s" "wchar_t c"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/wcsspn.3 b/lib/libc/string/wcsspn.3
index 66505c59d19..3be82344dd5 100644
--- a/lib/libc/string/wcsspn.3
+++ b/lib/libc/string/wcsspn.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wcsspn.3,v 1.2 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: wcsspn.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSSPN 3
 .Os
 .Sh NAME
 .Nm wcsspn
 .Nd span a wide string
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft size_t
 .Fn wcsspn "const wchar_t *s" "const wchar_t *charset"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/wcsstr.3 b/lib/libc/string/wcsstr.3
index 73f85c35044..203a76ded37 100644
--- a/lib/libc/string/wcsstr.3
+++ b/lib/libc/string/wcsstr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wcsstr.3,v 1.2 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: wcsstr.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSSTR 3
 .Os
 .Sh NAME
 .Nm wcsstr
 .Nd locate a wide substring in a wide string
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft wchar_t *
 .Fn wcsstr "const wchar_t *big" "const wchar_t *little"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/wmemchr.3 b/lib/libc/string/wmemchr.3
index 21df1aaa88f..17fbc9dbc52 100644
--- a/lib/libc/string/wmemchr.3
+++ b/lib/libc/string/wmemchr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wmemchr.3,v 1.9 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: wmemchr.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WMEMCHR 3
 .Os
 .Sh NAME
 .Nm wmemchr
 .Nd locate wide character in wide string
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft wchar_t *
 .Fn wmemchr "const wchar_t *b" "wchar_t c" "size_t len"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/wmemcmp.3 b/lib/libc/string/wmemcmp.3
index 6006b4e5c10..bd8ddfd120e 100644
--- a/lib/libc/string/wmemcmp.3
+++ b/lib/libc/string/wmemcmp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wmemcmp.3,v 1.2 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: wmemcmp.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WMEMCMP 3
 .Os
 .Sh NAME
 .Nm wmemcmp
 .Nd compare wide strings
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft int
 .Fn wmemcmp "const wchar_t *s1" "const wchar_t *s2" "size_t len"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/wmemcpy.3 b/lib/libc/string/wmemcpy.3
index 4bbab2909fc..2a6d528a1a6 100644
--- a/lib/libc/string/wmemcpy.3
+++ b/lib/libc/string/wmemcpy.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wmemcpy.3,v 1.4 2013/06/04 03:02:09 deraadt Exp $
+.\"	$OpenBSD: wmemcpy.3,v 1.5 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 4 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WMEMCPY 3
 .Os
 .Sh NAME
 .Nm wmemcpy
 .Nd copy wide characters
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft wchar_t *
 .Fn wmemcpy "wchar_t * restrict dst" "const wchar_t * restrict src" "size_t len"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/wmemmove.3 b/lib/libc/string/wmemmove.3
index 45daa854baf..46942e7928b 100644
--- a/lib/libc/string/wmemmove.3
+++ b/lib/libc/string/wmemmove.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wmemmove.3,v 1.2 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: wmemmove.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WMEMMOVE 3
 .Os
 .Sh NAME
 .Nm wmemmove
 .Nd copy wide characters
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft wchar_t *
 .Fn wmemmove "wchar_t *dst" "const wchar_t *src" "size_t len"
 .Sh DESCRIPTION
diff --git a/lib/libc/string/wmemset.3 b/lib/libc/string/wmemset.3
index 1b840762ec5..2655d68bcb1 100644
--- a/lib/libc/string/wmemset.3
+++ b/lib/libc/string/wmemset.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wmemset.3,v 1.3 2011/07/25 00:38:53 schwarze Exp $
+.\"	$OpenBSD: wmemset.3,v 1.4 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -31,14 +31,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 25 2011 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WMEMSET 3
 .Os
 .Sh NAME
 .Nm wmemset
 .Nd write a wide string
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft wchar_t *
 .Fn wmemset "wchar_t *s" "wchar_t c" "size_t len"
 .Sh DESCRIPTION
diff --git a/lib/libc/termios/tcgetpgrp.3 b/lib/libc/termios/tcgetpgrp.3
index e26b706fb6f..3cf01375026 100644
--- a/lib/libc/termios/tcgetpgrp.3
+++ b/lib/libc/termios/tcgetpgrp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcgetpgrp.3,v 1.8 2007/05/31 19:19:34 jmc Exp $
+.\"	$OpenBSD: tcgetpgrp.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -27,15 +27,15 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TCGETPGRP 3
 .Os
 .Sh NAME
 .Nm tcgetpgrp
 .Nd get foreground process group ID
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <unistd.h>
+.In sys/types.h
+.In unistd.h
 .Ft pid_t
 .Fn tcgetpgrp "int fd"
 .Sh DESCRIPTION
diff --git a/lib/libc/termios/tcsendbreak.3 b/lib/libc/termios/tcsendbreak.3
index f0cf87336eb..da04c8f3e62 100644
--- a/lib/libc/termios/tcsendbreak.3
+++ b/lib/libc/termios/tcsendbreak.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcsendbreak.3,v 1.8 2007/05/31 19:19:34 jmc Exp $
+.\"	$OpenBSD: tcsendbreak.3,v 1.9 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TCSENDBREAK 3
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nm tcsendbreak
 .Nd line control functions
 .Sh SYNOPSIS
-.Fd #include <termios.h>
+.In termios.h
 .Ft int
 .Fn tcdrain "int fd"
 .Ft int
diff --git a/lib/libc/termios/tcsetattr.3 b/lib/libc/termios/tcsetattr.3
index 7eaa895f153..6c15c0ce036 100644
--- a/lib/libc/termios/tcsetattr.3
+++ b/lib/libc/termios/tcsetattr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcsetattr.3,v 1.15 2007/05/31 19:19:34 jmc Exp $
+.\"	$OpenBSD: tcsetattr.3,v 1.16 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TCSETATTR 3
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nm tcsetattr
 .Nd manipulating the termios structure
 .Sh SYNOPSIS
-.Fd #include <termios.h>
+.In termios.h
 .Ft speed_t
 .Fn cfgetispeed "const struct termios *tp"
 .Ft int
diff --git a/lib/libc/termios/tcsetpgrp.3 b/lib/libc/termios/tcsetpgrp.3
index d1dae3eef76..58eeacfc131 100644
--- a/lib/libc/termios/tcsetpgrp.3
+++ b/lib/libc/termios/tcsetpgrp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcsetpgrp.3,v 1.9 2007/05/31 19:19:34 jmc Exp $
+.\"	$OpenBSD: tcsetpgrp.3,v 1.10 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -27,15 +27,15 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TCSETPGRP 3
 .Os
 .Sh NAME
 .Nm tcsetpgrp
 .Nd set foreground process group ID
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <unistd.h>
+.In sys/types.h
+.In unistd.h
 .Ft int
 .Fn tcsetpgrp "int fd" "pid_t pgrp_id"
 .Sh DESCRIPTION
diff --git a/lib/libc/time/ctime.3 b/lib/libc/time/ctime.3
index 0796ed997d2..c4d5a83c3da 100644
--- a/lib/libc/time/ctime.3
+++ b/lib/libc/time/ctime.3
@@ -1,7 +1,7 @@
-.\"	$OpenBSD: ctime.3,v 1.38 2012/09/13 11:14:20 millert Exp $
+.\"	$OpenBSD: ctime.3,v 1.39 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\"
-.Dd $Mdocdate: September 13 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt CTIME 3
 .Os
 .Sh NAME
@@ -19,8 +19,8 @@
 .Nm timelocal
 .Nd convert date and time to ASCII
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <time.h>
+.In sys/types.h
+.In time.h
 .Pp
 .Fd extern char *tzname[2];
 .Ft "char *"
diff --git a/lib/libc/time/strftime.3 b/lib/libc/time/strftime.3
index fae70c0cdf0..0a31a68fd56 100644
--- a/lib/libc/time/strftime.3
+++ b/lib/libc/time/strftime.3
@@ -30,16 +30,16 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)strftime.3    5.12 (Berkeley) 6/29/91
-.\"	$OpenBSD: strftime.3,v 1.30 2013/01/05 12:55:10 krw Exp $
+.\"	$OpenBSD: strftime.3,v 1.31 2013/06/05 03:39:23 tedu Exp $
 .\"
-.Dd $Mdocdate: January 5 2013 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRFTIME 3
 .Os
 .Sh NAME
 .Nm strftime
 .Nd format date and time
 .Sh SYNOPSIS
-.Fd #include <time.h>
+.In time.h
 .Ft size_t
 .Fn strftime "char *buf" "size_t maxsize" "const char *format" "const struct tm *timeptr"
 .Sh DESCRIPTION
diff --git a/lib/libc/time/strptime.3 b/lib/libc/time/strptime.3
index b7533be2fe5..00f508987b9 100644
--- a/lib/libc/time/strptime.3
+++ b/lib/libc/time/strptime.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strptime.3,v 1.21 2012/08/18 16:25:20 jmc Exp $
+.\"	$OpenBSD: strptime.3,v 1.22 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -26,14 +26,14 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 18 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt STRPTIME 3
 .Os
 .Sh NAME
 .Nm strptime
 .Nd converts a character string to a time value
 .Sh SYNOPSIS
-.Fd #include <time.h>
+.In time.h
 .Ft char *
 .Fn strptime "const char *buf" "const char *format" "struct tm *tm"
 .Sh DESCRIPTION
diff --git a/lib/libc/time/time2posix.3 b/lib/libc/time/time2posix.3
index c469805c676..7b135811cef 100644
--- a/lib/libc/time/time2posix.3
+++ b/lib/libc/time/time2posix.3
@@ -1,5 +1,5 @@
-.\"	$OpenBSD: time2posix.3,v 1.18 2012/09/13 11:14:20 millert Exp $
-.Dd $Mdocdate: September 13 2012 $
+.\"	$OpenBSD: time2posix.3,v 1.19 2013/06/05 03:39:23 tedu Exp $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TIME2POSIX 3
 .Os
 .Sh NAME
@@ -7,8 +7,8 @@
 .Nm posix2time
 .Nd convert seconds since the Epoch
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <time.h>
+.In sys/types.h
+.In time.h
 .Ft time_t
 .Fn time2posix "time_t t"
 .Ft time_t
diff --git a/lib/libc/time/tzset.3 b/lib/libc/time/tzset.3
index 760dc44d2a4..af18bf43650 100644
--- a/lib/libc/time/tzset.3
+++ b/lib/libc/time/tzset.3
@@ -1,12 +1,12 @@
-.\"	$OpenBSD: tzset.3,v 1.19 2012/09/13 11:14:20 millert Exp $
-.Dd $Mdocdate: September 13 2012 $
+.\"	$OpenBSD: tzset.3,v 1.20 2013/06/05 03:39:23 tedu Exp $
+.Dd $Mdocdate: June 5 2013 $
 .Dt TZSET 3
 .Os
 .Sh NAME
 .Nm tzset
 .Nd initialize time conversion information
 .Sh SYNOPSIS
-.Fd #include <time.h>
+.In time.h
 .Ft void
 .Fn tzset "void"
 .Sh DESCRIPTION
diff --git a/lib/libc/time/wcsftime.3 b/lib/libc/time/wcsftime.3
index 9e668515feb..2c5ce8c8ca0 100644
--- a/lib/libc/time/wcsftime.3
+++ b/lib/libc/time/wcsftime.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wcsftime.3,v 1.2 2012/02/26 19:15:20 haesbaert Exp $
+.\"	$OpenBSD: wcsftime.3,v 1.3 2013/06/05 03:39:23 tedu Exp $
 .\" Copyright (c) 2011 Marc Espie <espie@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -13,14 +13,14 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: February 26 2012 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt WCSFTIME 3
 .Os
 .Sh NAME
 .Nm wcsftime
 .Nd format date and time to wide characters string
 .Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
 .Ft size_t
 .Fn wcsftime "wchar_t *buf" "size_t maxsize" "const wchar_t *format" "const struct tm *timeptr"
 .Sh DESCRIPTION
diff --git a/lib/libc/yp/ypclnt.3 b/lib/libc/yp/ypclnt.3
index 4330b50b430..ebc817925b7 100644
--- a/lib/libc/yp/ypclnt.3
+++ b/lib/libc/yp/ypclnt.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypclnt.3,v 1.22 2009/06/12 16:28:49 schwarze Exp $
+.\"	$OpenBSD: ypclnt.3,v 1.23 2013/06/05 03:39:23 tedu Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 12 2009 $
+.Dd $Mdocdate: June 5 2013 $
 .Dt YPCLNT 3
 .Os
 .Sh NAME
@@ -45,10 +45,10 @@
 .Nm ypprot_err
 .Nd Interface to the YP subsystem
 .Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <rpc/rpc.h>
-.Fd #include <rpcsvc/ypclnt.h>
-.Fd #include <rpcsvc/yp_prot.h>
+.In sys/types.h
+.In rpc/rpc.h
+.In rpcsvc/ypclnt.h
+.In rpcsvc/yp_prot.h
 .Ft int
 .Fn yp_all "char *indomain" "char *inmap" "struct ypall_callback *incallback"
 .Ft int
author	tedu <tedu@openbsd.org>	2013-06-05 03:39:22 +0000
committer	tedu <tedu@openbsd.org>	2013-06-05 03:39:22 +0000
commit	64d4e9871d1af4e50715ace8f2f237ff8e4d36e0 (patch)
tree	90569bb16bd247c9a0433830994a6bc333a5a4f9 /lib/libc
parent	m_defrag(9) wasnt documented. (diff)
download	wireguard-openbsd-64d4e9871d1af4e50715ace8f2f237ff8e4d36e0.tar.xz wireguard-openbsd-64d4e9871d1af4e50715ace8f2f237ff8e4d36e0.zip