diff --git a/src/lib/libc/crypt/arc4random.3 b/src/lib/libc/crypt/arc4random.3
index aa2e12fb..3cc26bbf 100644
--- a/src/lib/libc/crypt/arc4random.3
+++ b/src/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/src/lib/libc/crypt/blowfish.3 b/src/lib/libc/crypt/blowfish.3
index 4defaecc..af988c16 100644
--- a/src/lib/libc/crypt/blowfish.3
+++ b/src/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/src/lib/libc/crypt/crypt.3 b/src/lib/libc/crypt/crypt.3
index c38710ac..ce1db8ca 100644
--- a/src/lib/libc/crypt/crypt.3
+++ b/src/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/src/lib/libc/hash/mdX.3 b/src/lib/libc/hash/mdX.3
index 00e59d01..a4e66513 100644
--- a/src/lib/libc/hash/mdX.3
+++ b/src/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/src/lib/libc/hash/rmd160.3 b/src/lib/libc/hash/rmd160.3
index b6467c5a..d2f848bf 100644
--- a/src/lib/libc/hash/rmd160.3
+++ b/src/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/src/lib/libc/hash/sha1.3 b/src/lib/libc/hash/sha1.3
index 26582ec6..70fab8be 100644
--- a/src/lib/libc/hash/sha1.3
+++ b/src/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/src/lib/libc/hash/sha2.3 b/src/lib/libc/hash/sha2.3
index f267b438..ed75c6d6 100644
--- a/src/lib/libc/hash/sha2.3
+++ b/src/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/src/lib/libc/stdlib/a64l.3 b/src/lib/libc/stdlib/a64l.3
index da0aae33..11a74604 100644
--- a/src/lib/libc/stdlib/a64l.3
+++ b/src/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/src/lib/libc/stdlib/abort.3 b/src/lib/libc/stdlib/abort.3
index 4ec85882..b0197bf8 100644
--- a/src/lib/libc/stdlib/abort.3
+++ b/src/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/src/lib/libc/stdlib/abs.3 b/src/lib/libc/stdlib/abs.3
index 473aea1c..6925456c 100644
--- a/src/lib/libc/stdlib/abs.3
+++ b/src/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/src/lib/libc/stdlib/alloca.3 b/src/lib/libc/stdlib/alloca.3
index 8cc5c42f..47e9b971 100644
--- a/src/lib/libc/stdlib/alloca.3
+++ b/src/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/src/lib/libc/stdlib/atexit.3 b/src/lib/libc/stdlib/atexit.3
index 0615feab..8e3ac3e6 100644
--- a/src/lib/libc/stdlib/atexit.3
+++ b/src/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/src/lib/libc/stdlib/atof.3 b/src/lib/libc/stdlib/atof.3
index 2538d0c8..3fe1214c 100644
--- a/src/lib/libc/stdlib/atof.3
+++ b/src/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/src/lib/libc/stdlib/atoi.3 b/src/lib/libc/stdlib/atoi.3
index 0c6b62b2..0572f1fa 100644
--- a/src/lib/libc/stdlib/atoi.3
+++ b/src/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/src/lib/libc/stdlib/atol.3 b/src/lib/libc/stdlib/atol.3
index 3c555118..ae4cbc7c 100644
--- a/src/lib/libc/stdlib/atol.3
+++ b/src/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/src/lib/libc/stdlib/atoll.3 b/src/lib/libc/stdlib/atoll.3
index 608a61f4..a9614ae7 100644
--- a/src/lib/libc/stdlib/atoll.3
+++ b/src/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/src/lib/libc/stdlib/bsearch.3 b/src/lib/libc/stdlib/bsearch.3
index 305dd48f..270086df 100644
--- a/src/lib/libc/stdlib/bsearch.3
+++ b/src/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/src/lib/libc/stdlib/div.3 b/src/lib/libc/stdlib/div.3
index 2403fcb0..1a2a3262 100644
--- a/src/lib/libc/stdlib/div.3
+++ b/src/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/src/lib/libc/stdlib/ecvt.3 b/src/lib/libc/stdlib/ecvt.3
index 0191a342..d8a3489b 100644
--- a/src/lib/libc/stdlib/ecvt.3
+++ b/src/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/src/lib/libc/stdlib/exit.3 b/src/lib/libc/stdlib/exit.3
index e452d454..11d4bc23 100644
--- a/src/lib/libc/stdlib/exit.3
+++ b/src/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/src/lib/libc/stdlib/getenv.3 b/src/lib/libc/stdlib/getenv.3
index f987eb13..5239d1b0 100644
--- a/src/lib/libc/stdlib/getenv.3
+++ b/src/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/src/lib/libc/stdlib/getopt.3 b/src/lib/libc/stdlib/getopt.3
index ecdf42ab..9e37f52c 100644
--- a/src/lib/libc/stdlib/getopt.3
+++ b/src/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/src/lib/libc/stdlib/getopt_long.3 b/src/lib/libc/stdlib/getopt_long.3
index eaa5ead1..a5973d6c 100644
--- a/src/lib/libc/stdlib/getopt_long.3
+++ b/src/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/src/lib/libc/stdlib/getsubopt.3 b/src/lib/libc/stdlib/getsubopt.3
index 9f35df70..ef813430 100644
--- a/src/lib/libc/stdlib/getsubopt.3
+++ b/src/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/src/lib/libc/stdlib/imaxabs.3 b/src/lib/libc/stdlib/imaxabs.3
index 74b724fc..6c479347 100644
--- a/src/lib/libc/stdlib/imaxabs.3
+++ b/src/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/src/lib/libc/stdlib/imaxdiv.3 b/src/lib/libc/stdlib/imaxdiv.3
index 2448f3f0..40ac0bc2 100644
--- a/src/lib/libc/stdlib/imaxdiv.3
+++ b/src/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/src/lib/libc/stdlib/insque.3 b/src/lib/libc/stdlib/insque.3
index dbda059c..64da36a8 100644
--- a/src/lib/libc/stdlib/insque.3
+++ b/src/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/src/lib/libc/stdlib/labs.3 b/src/lib/libc/stdlib/labs.3
index 9658c3ad..9937afbf 100644
--- a/src/lib/libc/stdlib/labs.3
+++ b/src/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/src/lib/libc/stdlib/ldiv.3 b/src/lib/libc/stdlib/ldiv.3
index d3001878..5ee6f947 100644
--- a/src/lib/libc/stdlib/ldiv.3
+++ b/src/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/src/lib/libc/stdlib/lldiv.3 b/src/lib/libc/stdlib/lldiv.3
index 4c97d7c9..9181f8b7 100644
--- a/src/lib/libc/stdlib/lldiv.3
+++ b/src/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/src/lib/libc/stdlib/lsearch.3 b/src/lib/libc/stdlib/lsearch.3
index 86638ae6..c5a55980 100644
--- a/src/lib/libc/stdlib/lsearch.3
+++ b/src/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/src/lib/libc/stdlib/malloc.3 b/src/lib/libc/stdlib/malloc.3
index 74df922f..07971b9a 100644
--- a/src/lib/libc/stdlib/malloc.3
+++ b/src/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/src/lib/libc/stdlib/qabs.3 b/src/lib/libc/stdlib/qabs.3
index b12dc592..6703072e 100644
--- a/src/lib/libc/stdlib/qabs.3
+++ b/src/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/src/lib/libc/stdlib/qdiv.3 b/src/lib/libc/stdlib/qdiv.3
index 94e3bdff..5f527549 100644
--- a/src/lib/libc/stdlib/qdiv.3
+++ b/src/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/src/lib/libc/stdlib/qsort.3 b/src/lib/libc/stdlib/qsort.3
index 92c75d53..f134741a 100644
--- a/src/lib/libc/stdlib/qsort.3
+++ b/src/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/src/lib/libc/stdlib/radixsort.3 b/src/lib/libc/stdlib/radixsort.3
index b90a5577..e62f7602 100644
--- a/src/lib/libc/stdlib/radixsort.3
+++ b/src/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/src/lib/libc/stdlib/rand.3 b/src/lib/libc/stdlib/rand.3
index 50fe67d1..f1bff691 100644
--- a/src/lib/libc/stdlib/rand.3
+++ b/src/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/src/lib/libc/stdlib/rand48.3 b/src/lib/libc/stdlib/rand48.3
index 340e6461..c105f85a 100644
--- a/src/lib/libc/stdlib/rand48.3
+++ b/src/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/src/lib/libc/stdlib/random.3 b/src/lib/libc/stdlib/random.3
index 84756bb3..fdb78848 100644
--- a/src/lib/libc/stdlib/random.3
+++ b/src/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/src/lib/libc/stdlib/realpath.3 b/src/lib/libc/stdlib/realpath.3
index 68ed0881..c57e5a57 100644
--- a/src/lib/libc/stdlib/realpath.3
+++ b/src/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/src/lib/libc/stdlib/strtod.3 b/src/lib/libc/stdlib/strtod.3
index cc910406..cb819c6f 100644
--- a/src/lib/libc/stdlib/strtod.3
+++ b/src/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/src/lib/libc/stdlib/strtol.3 b/src/lib/libc/stdlib/strtol.3
index 6f9037a6..10cc102c 100644
--- a/src/lib/libc/stdlib/strtol.3
+++ b/src/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/src/lib/libc/stdlib/strtonum.3 b/src/lib/libc/stdlib/strtonum.3
index bd66711e..419a2db6 100644
--- a/src/lib/libc/stdlib/strtonum.3
+++ b/src/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/src/lib/libc/stdlib/strtoul.3 b/src/lib/libc/stdlib/strtoul.3
index 5e86772e..04c9e18d 100644
--- a/src/lib/libc/stdlib/strtoul.3
+++ b/src/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/src/lib/libc/stdlib/system.3 b/src/lib/libc/stdlib/system.3
index a49e595b..7c0a5490 100644
--- a/src/lib/libc/stdlib/system.3
+++ b/src/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/src/lib/libc/stdlib/tsearch.3 b/src/lib/libc/stdlib/tsearch.3
index 829c4edf..46d0bba1 100644
--- a/src/lib/libc/stdlib/tsearch.3
+++ b/src/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/src/lib/libc/string/bcmp.3 b/src/lib/libc/string/bcmp.3
index 1660b435..52584b4b 100644
--- a/src/lib/libc/string/bcmp.3
+++ b/src/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/src/lib/libc/string/bcopy.3 b/src/lib/libc/string/bcopy.3
index 3beaf09a..94a8231f 100644
--- a/src/lib/libc/string/bcopy.3
+++ b/src/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/src/lib/libc/string/bm.3 b/src/lib/libc/string/bm.3
index 6c74848e..d4928061 100644
--- a/src/lib/libc/string/bm.3
+++ b/src/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/src/lib/libc/string/bstring.3 b/src/lib/libc/string/bstring.3
index c44c5386..d88b78f5 100644
--- a/src/lib/libc/string/bstring.3
+++ b/src/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/src/lib/libc/string/bzero.3 b/src/lib/libc/string/bzero.3
index c7947037..1fd5da81 100644
--- a/src/lib/libc/string/bzero.3
+++ b/src/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/src/lib/libc/string/ffs.3 b/src/lib/libc/string/ffs.3
index eea0994c..c0ed7baa 100644
--- a/src/lib/libc/string/ffs.3
+++ b/src/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/src/lib/libc/string/memccpy.3 b/src/lib/libc/string/memccpy.3
index f8f880e3..076e8f64 100644
--- a/src/lib/libc/string/memccpy.3
+++ b/src/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/src/lib/libc/string/memchr.3 b/src/lib/libc/string/memchr.3
index 56a4e478..1373e147 100644
--- a/src/lib/libc/string/memchr.3
+++ b/src/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/src/lib/libc/string/memcmp.3 b/src/lib/libc/string/memcmp.3
index 951a04ed..ebd83882 100644
--- a/src/lib/libc/string/memcmp.3
+++ b/src/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/src/lib/libc/string/memcpy.3 b/src/lib/libc/string/memcpy.3
index 51c458ee..8df2a785 100644
--- a/src/lib/libc/string/memcpy.3
+++ b/src/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/src/lib/libc/string/memmove.3 b/src/lib/libc/string/memmove.3
index ae8569a1..8665e4ab 100644
--- a/src/lib/libc/string/memmove.3
+++ b/src/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/src/lib/libc/string/memset.3 b/src/lib/libc/string/memset.3
index db94cb9b..ac5b7e90 100644
--- a/src/lib/libc/string/memset.3
+++ b/src/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/src/lib/libc/string/stpcpy.3 b/src/lib/libc/string/stpcpy.3
index 447bfc20..ed1b830b 100644
--- a/src/lib/libc/string/stpcpy.3
+++ b/src/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/src/lib/libc/string/strcasecmp.3 b/src/lib/libc/string/strcasecmp.3
index 0900c8a9..8bd7387d 100644
--- a/src/lib/libc/string/strcasecmp.3
+++ b/src/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/src/lib/libc/string/strcat.3 b/src/lib/libc/string/strcat.3
index 81aae19a..79302dba 100644
--- a/src/lib/libc/string/strcat.3
+++ b/src/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/src/lib/libc/string/strchr.3 b/src/lib/libc/string/strchr.3
index d3194dff..eb9ac8e8 100644
--- a/src/lib/libc/string/strchr.3
+++ b/src/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/src/lib/libc/string/strcmp.3 b/src/lib/libc/string/strcmp.3
index 5b079420..156021b0 100644
--- a/src/lib/libc/string/strcmp.3
+++ b/src/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/src/lib/libc/string/strcoll.3 b/src/lib/libc/string/strcoll.3
index 72e398c4..d421200b 100644
--- a/src/lib/libc/string/strcoll.3
+++ b/src/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/src/lib/libc/string/strcpy.3 b/src/lib/libc/string/strcpy.3
index 400eeee6..11f996a4 100644
--- a/src/lib/libc/string/strcpy.3
+++ b/src/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/src/lib/libc/string/strcspn.3 b/src/lib/libc/string/strcspn.3
index 70c8ef76..07eb9ca2 100644
--- a/src/lib/libc/string/strcspn.3
+++ b/src/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/src/lib/libc/string/strdup.3 b/src/lib/libc/string/strdup.3
index 45a7bd18..2d7fa0bb 100644
--- a/src/lib/libc/string/strdup.3
+++ b/src/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/src/lib/libc/string/strerror.3 b/src/lib/libc/string/strerror.3
index bab48af3..5b59235e 100644
--- a/src/lib/libc/string/strerror.3
+++ b/src/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/src/lib/libc/string/string.3 b/src/lib/libc/string/string.3
index 4d47ad44..2373d1fb 100644
--- a/src/lib/libc/string/string.3
+++ b/src/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/src/lib/libc/string/strlcpy.3 b/src/lib/libc/string/strlcpy.3
index acce0f7d..3c0eb2b9 100644
--- a/src/lib/libc/string/strlcpy.3
+++ b/src/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/src/lib/libc/string/strlen.3 b/src/lib/libc/string/strlen.3
index 9187496a..4d416e20 100644
--- a/src/lib/libc/string/strlen.3
+++ b/src/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/src/lib/libc/string/strmode.3 b/src/lib/libc/string/strmode.3
index 5d371b38..bebda2ca 100644
--- a/src/lib/libc/string/strmode.3
+++ b/src/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/src/lib/libc/string/strpbrk.3 b/src/lib/libc/string/strpbrk.3
index 9e13c42a..b758df68 100644
--- a/src/lib/libc/string/strpbrk.3
+++ b/src/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/src/lib/libc/string/strrchr.3 b/src/lib/libc/string/strrchr.3
index 9eea08b0..046b28ce 100644
--- a/src/lib/libc/string/strrchr.3
+++ b/src/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/src/lib/libc/string/strsep.3 b/src/lib/libc/string/strsep.3
index 63cdf233..77053f66 100644
--- a/src/lib/libc/string/strsep.3
+++ b/src/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/src/lib/libc/string/strsignal.3 b/src/lib/libc/string/strsignal.3
index 7128d811..3261f699 100644
--- a/src/lib/libc/string/strsignal.3
+++ b/src/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/src/lib/libc/string/strspn.3 b/src/lib/libc/string/strspn.3
index b1a2ae30..e339d9b6 100644
--- a/src/lib/libc/string/strspn.3
+++ b/src/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/src/lib/libc/string/strstr.3 b/src/lib/libc/string/strstr.3
index 4069d55e..1f79d455 100644
--- a/src/lib/libc/string/strstr.3
+++ b/src/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/src/lib/libc/string/strtok.3 b/src/lib/libc/string/strtok.3
index fbf0abfc..046a43b6 100644
--- a/src/lib/libc/string/strtok.3
+++ b/src/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/src/lib/libc/string/strxfrm.3 b/src/lib/libc/string/strxfrm.3
index e4472946..481f741c 100644
--- a/src/lib/libc/string/strxfrm.3
+++ b/src/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/src/lib/libc/string/swab.3 b/src/lib/libc/string/swab.3
index 5ebaa485..77e5a9cc 100644
--- a/src/lib/libc/string/swab.3
+++ b/src/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/src/lib/libc/string/wcscasecmp.3 b/src/lib/libc/string/wcscasecmp.3
index 94cd6e0c..743224a1 100644
--- a/src/lib/libc/string/wcscasecmp.3
+++ b/src/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/src/lib/libc/string/wcscat.3 b/src/lib/libc/string/wcscat.3
index d0281b8b..9b7588cf 100644
--- a/src/lib/libc/string/wcscat.3
+++ b/src/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/src/lib/libc/string/wcschr.3 b/src/lib/libc/string/wcschr.3
index ca2c0ed7..bb714b20 100644
--- a/src/lib/libc/string/wcschr.3
+++ b/src/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/src/lib/libc/string/wcscmp.3 b/src/lib/libc/string/wcscmp.3
index b34e5c21..53cd15a1 100644
--- a/src/lib/libc/string/wcscmp.3
+++ b/src/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/src/lib/libc/string/wcscpy.3 b/src/lib/libc/string/wcscpy.3
index dcc375ac..c3661035 100644
--- a/src/lib/libc/string/wcscpy.3
+++ b/src/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/src/lib/libc/string/wcscspn.3 b/src/lib/libc/string/wcscspn.3
index c1799250..520a7392 100644
--- a/src/lib/libc/string/wcscspn.3
+++ b/src/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/src/lib/libc/string/wcslcpy.3 b/src/lib/libc/string/wcslcpy.3
index 98ecf0aa..4288b98e 100644
--- a/src/lib/libc/string/wcslcpy.3
+++ b/src/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/src/lib/libc/string/wcslen.3 b/src/lib/libc/string/wcslen.3
index 1b2eceab..12f81763 100644
--- a/src/lib/libc/string/wcslen.3
+++ b/src/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/src/lib/libc/string/wcspbrk.3 b/src/lib/libc/string/wcspbrk.3
index 6589e83c..602bfdc3 100644
--- a/src/lib/libc/string/wcspbrk.3
+++ b/src/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/src/lib/libc/string/wcsrchr.3 b/src/lib/libc/string/wcsrchr.3
index d65caa42..d4a2e7cf 100644
--- a/src/lib/libc/string/wcsrchr.3
+++ b/src/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/src/lib/libc/string/wcsspn.3 b/src/lib/libc/string/wcsspn.3
index 66505c59..3be82344 100644
--- a/src/lib/libc/string/wcsspn.3
+++ b/src/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/src/lib/libc/string/wcsstr.3 b/src/lib/libc/string/wcsstr.3
index 73f85c35..203a76de 100644
--- a/src/lib/libc/string/wcsstr.3
+++ b/src/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/src/lib/libc/string/wmemchr.3 b/src/lib/libc/string/wmemchr.3
index 21df1aaa..17fbc9db 100644
--- a/src/lib/libc/string/wmemchr.3
+++ b/src/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/src/lib/libc/string/wmemcmp.3 b/src/lib/libc/string/wmemcmp.3
index 6006b4e5..bd8ddfd1 100644
--- a/src/lib/libc/string/wmemcmp.3
+++ b/src/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/src/lib/libc/string/wmemcpy.3 b/src/lib/libc/string/wmemcpy.3
index 4bbab290..2a6d528a 100644
--- a/src/lib/libc/string/wmemcpy.3
+++ b/src/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/src/lib/libc/string/wmemmove.3 b/src/lib/libc/string/wmemmove.3
index 45daa854..46942e79 100644
--- a/src/lib/libc/string/wmemmove.3
+++ b/src/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/src/lib/libc/string/wmemset.3 b/src/lib/libc/string/wmemset.3
index 1b840762..2655d68b 100644
--- a/src/lib/libc/string/wmemset.3
+++ b/src/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