summaryrefslogtreecommitdiffstats
path: root/lib/libc
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libc')
-rw-r--r--lib/libc/compat-43/creat.22
-rw-r--r--lib/libc/compat-43/gethostid.32
-rw-r--r--lib/libc/compat-43/killpg.24
-rw-r--r--lib/libc/compat-43/setruid.32
-rw-r--r--lib/libc/compat-43/sigpause.22
-rw-r--r--lib/libc/compat-43/sigsetmask.22
-rw-r--r--lib/libc/compat-43/sigvec.22
-rw-r--r--lib/libc/db/man/btree.34
-rw-r--r--lib/libc/db/man/dbm.34
-rw-r--r--lib/libc/db/man/dbopen.36
-rw-r--r--lib/libc/db/man/hash.34
-rw-r--r--lib/libc/db/man/mpool.34
-rw-r--r--lib/libc/db/man/recno.34
-rw-r--r--lib/libc/gen/alarm.32
-rw-r--r--lib/libc/gen/arc4random.32
-rw-r--r--lib/libc/gen/basename.32
-rw-r--r--lib/libc/gen/clock.32
-rw-r--r--lib/libc/gen/confstr.32
-rw-r--r--lib/libc/gen/ctermid.32
-rw-r--r--lib/libc/gen/daemon.32
-rw-r--r--lib/libc/gen/devname.34
-rw-r--r--lib/libc/gen/directory.34
-rw-r--r--lib/libc/gen/dirname.32
-rw-r--r--lib/libc/gen/dladdr.32
-rw-r--r--lib/libc/gen/dllockinit.32
-rw-r--r--lib/libc/gen/dlopen.32
-rw-r--r--lib/libc/gen/err.34
-rw-r--r--lib/libc/gen/exec.32
-rw-r--r--lib/libc/gen/fmtcheck.32
-rw-r--r--lib/libc/gen/fnmatch.32
-rw-r--r--lib/libc/gen/frexp.32
-rw-r--r--lib/libc/gen/ftok.34
-rw-r--r--lib/libc/gen/getbootfile.32
-rw-r--r--lib/libc/gen/getbsize.32
-rw-r--r--lib/libc/gen/getcap.32
-rw-r--r--lib/libc/gen/getcwd.32
-rw-r--r--lib/libc/gen/getdiskbyname.32
-rw-r--r--lib/libc/gen/getdomainname.32
-rw-r--r--lib/libc/gen/getfsent.32
-rw-r--r--lib/libc/gen/getgrent.34
-rw-r--r--lib/libc/gen/getgrouplist.32
-rw-r--r--lib/libc/gen/gethostname.32
-rw-r--r--lib/libc/gen/getloadavg.32
-rw-r--r--lib/libc/gen/getmntinfo.36
-rw-r--r--lib/libc/gen/getnetgrent.32
-rw-r--r--lib/libc/gen/getobjformat.32
-rw-r--r--lib/libc/gen/getpagesize.32
-rw-r--r--lib/libc/gen/getpass.34
-rw-r--r--lib/libc/gen/getprogname.32
-rw-r--r--lib/libc/gen/getpwent.34
-rw-r--r--lib/libc/gen/getttyent.32
-rw-r--r--lib/libc/gen/getusershell.32
-rw-r--r--lib/libc/gen/getvfsbyname.34
-rw-r--r--lib/libc/gen/getvfsent.34
-rw-r--r--lib/libc/gen/glob.32
-rw-r--r--lib/libc/gen/initgroups.32
-rw-r--r--lib/libc/gen/ldexp.32
-rw-r--r--lib/libc/gen/lockf.32
-rw-r--r--lib/libc/gen/modf.32
-rw-r--r--lib/libc/gen/msgctl.36
-rw-r--r--lib/libc/gen/msgget.36
-rw-r--r--lib/libc/gen/msgrcv.36
-rw-r--r--lib/libc/gen/msgsnd.36
-rw-r--r--lib/libc/gen/nice.32
-rw-r--r--lib/libc/gen/nlist.32
-rw-r--r--lib/libc/gen/pause.32
-rw-r--r--lib/libc/gen/popen.32
-rw-r--r--lib/libc/gen/psignal.34
-rw-r--r--lib/libc/gen/pwcache.32
-rw-r--r--lib/libc/gen/raise.32
-rw-r--r--lib/libc/gen/rand48.32
-rw-r--r--lib/libc/gen/rfork_thread.32
-rw-r--r--lib/libc/gen/scandir.34
-rw-r--r--lib/libc/gen/sem_destroy.32
-rw-r--r--lib/libc/gen/sem_getvalue.32
-rw-r--r--lib/libc/gen/sem_init.32
-rw-r--r--lib/libc/gen/sem_open.32
-rw-r--r--lib/libc/gen/sem_post.32
-rw-r--r--lib/libc/gen/sem_wait.32
-rw-r--r--lib/libc/gen/setjmp.32
-rw-r--r--lib/libc/gen/setmode.32
-rw-r--r--lib/libc/gen/setproctitle.34
-rw-r--r--lib/libc/gen/shm_open.34
-rw-r--r--lib/libc/gen/siginterrupt.32
-rw-r--r--lib/libc/gen/signal.32
-rw-r--r--lib/libc/gen/sigsetops.32
-rw-r--r--lib/libc/gen/sleep.32
-rw-r--r--lib/libc/gen/stringlist.32
-rw-r--r--lib/libc/gen/strtofflags.32
-rw-r--r--lib/libc/gen/sysconf.32
-rw-r--r--lib/libc/gen/sysctl.34
-rw-r--r--lib/libc/gen/syslog.34
-rw-r--r--lib/libc/gen/tcgetpgrp.34
-rw-r--r--lib/libc/gen/tcsendbreak.32
-rw-r--r--lib/libc/gen/tcsetattr.32
-rw-r--r--lib/libc/gen/tcsetpgrp.34
-rw-r--r--lib/libc/gen/time.32
-rw-r--r--lib/libc/gen/times.32
-rw-r--r--lib/libc/gen/ttyname.32
-rw-r--r--lib/libc/gen/tzset.32
-rw-r--r--lib/libc/gen/ualarm.32
-rw-r--r--lib/libc/gen/uname.32
-rw-r--r--lib/libc/gen/unvis.32
-rw-r--r--lib/libc/gen/usleep.32
-rw-r--r--lib/libc/gen/utime.34
-rw-r--r--lib/libc/gen/valloc.32
-rw-r--r--lib/libc/gen/vis.32
-rw-r--r--lib/libc/gmon/moncontrol.32
-rw-r--r--lib/libc/i386/sys/i386_get_ioperm.22
-rw-r--r--lib/libc/i386/sys/i386_get_ldt.26
-rw-r--r--lib/libc/i386/sys/i386_set_watch.34
-rw-r--r--lib/libc/i386/sys/i386_vm86.26
-rw-r--r--lib/libc/locale/ctype.32
-rw-r--r--lib/libc/locale/isalnum.32
-rw-r--r--lib/libc/locale/isalpha.32
-rw-r--r--lib/libc/locale/isascii.32
-rw-r--r--lib/libc/locale/isblank.32
-rw-r--r--lib/libc/locale/iscntrl.32
-rw-r--r--lib/libc/locale/isdigit.32
-rw-r--r--lib/libc/locale/isgraph.32
-rw-r--r--lib/libc/locale/islower.32
-rw-r--r--lib/libc/locale/isprint.32
-rw-r--r--lib/libc/locale/ispunct.32
-rw-r--r--lib/libc/locale/isspace.32
-rw-r--r--lib/libc/locale/isupper.32
-rw-r--r--lib/libc/locale/isxdigit.32
-rw-r--r--lib/libc/locale/mbrune.32
-rw-r--r--lib/libc/locale/multibyte.32
-rw-r--r--lib/libc/locale/rune.36
-rw-r--r--lib/libc/locale/setlocale.32
-rw-r--r--lib/libc/locale/toascii.32
-rw-r--r--lib/libc/locale/tolower.32
-rw-r--r--lib/libc/locale/toupper.32
-rw-r--r--lib/libc/net/addr2ascii.36
-rw-r--r--lib/libc/net/byteorder.32
-rw-r--r--lib/libc/net/ethers.36
-rw-r--r--lib/libc/net/getaddrinfo.36
-rw-r--r--lib/libc/net/gethostbyname.32
-rw-r--r--lib/libc/net/getifaddrs.36
-rw-r--r--lib/libc/net/getipnodebyname.36
-rw-r--r--lib/libc/net/getnameinfo.36
-rw-r--r--lib/libc/net/getnetent.32
-rw-r--r--lib/libc/net/getprotoent.32
-rw-r--r--lib/libc/net/getservent.32
-rw-r--r--lib/libc/net/hesiod.32
-rw-r--r--lib/libc/net/if_indextoname.36
-rw-r--r--lib/libc/net/inet.38
-rw-r--r--lib/libc/net/inet6_option_space.34
-rw-r--r--lib/libc/net/inet6_rthdr_space.34
-rw-r--r--lib/libc/net/iso_addr.34
-rw-r--r--lib/libc/net/linkaddr.36
-rw-r--r--lib/libc/net/ns.34
-rw-r--r--lib/libc/net/nsdispatch.32
-rw-r--r--lib/libc/net/rcmd.32
-rw-r--r--lib/libc/net/resolver.38
-rw-r--r--lib/libc/nls/catclose.32
-rw-r--r--lib/libc/nls/catgets.32
-rw-r--r--lib/libc/nls/catopen.32
-rw-r--r--lib/libc/posix1e/acl.34
-rw-r--r--lib/libc/posix1e/acl_add_perm.34
-rw-r--r--lib/libc/posix1e/acl_calc_mask.34
-rw-r--r--lib/libc/posix1e/acl_clear_perms.34
-rw-r--r--lib/libc/posix1e/acl_copy_entry.34
-rw-r--r--lib/libc/posix1e/acl_create_entry.34
-rw-r--r--lib/libc/posix1e/acl_delete.34
-rw-r--r--lib/libc/posix1e/acl_delete_entry.34
-rw-r--r--lib/libc/posix1e/acl_delete_perm.34
-rw-r--r--lib/libc/posix1e/acl_dup.34
-rw-r--r--lib/libc/posix1e/acl_free.34
-rw-r--r--lib/libc/posix1e/acl_from_text.34
-rw-r--r--lib/libc/posix1e/acl_get.34
-rw-r--r--lib/libc/posix1e/acl_get_entry.34
-rw-r--r--lib/libc/posix1e/acl_get_perm_np.34
-rw-r--r--lib/libc/posix1e/acl_get_permset.34
-rw-r--r--lib/libc/posix1e/acl_get_qualifier.34
-rw-r--r--lib/libc/posix1e/acl_get_tag_type.34
-rw-r--r--lib/libc/posix1e/acl_init.34
-rw-r--r--lib/libc/posix1e/acl_set.34
-rw-r--r--lib/libc/posix1e/acl_set_permset.34
-rw-r--r--lib/libc/posix1e/acl_set_qualifier.34
-rw-r--r--lib/libc/posix1e/acl_set_tag_type.34
-rw-r--r--lib/libc/posix1e/acl_to_text.34
-rw-r--r--lib/libc/posix1e/acl_valid.34
-rw-r--r--lib/libc/posix1e/cap.34
-rw-r--r--lib/libc/posix1e/cap_clear.34
-rw-r--r--lib/libc/posix1e/cap_dup.34
-rw-r--r--lib/libc/posix1e/cap_free.34
-rw-r--r--lib/libc/posix1e/cap_from_text.34
-rw-r--r--lib/libc/posix1e/cap_get_flag.34
-rw-r--r--lib/libc/posix1e/cap_get_proc.34
-rw-r--r--lib/libc/posix1e/cap_init.34
-rw-r--r--lib/libc/posix1e/cap_set_flag.34
-rw-r--r--lib/libc/posix1e/cap_set_proc.34
-rw-r--r--lib/libc/posix1e/cap_to_text.34
-rw-r--r--lib/libc/posix1e/extattr.34
-rw-r--r--lib/libc/posix1e/posix1e.310
-rw-r--r--lib/libc/regex/regex.34
-rw-r--r--lib/libc/rpc/bindresvport.34
-rw-r--r--lib/libc/rpc/des_crypt.32
-rw-r--r--lib/libc/rpc/getnetconfig.32
-rw-r--r--lib/libc/rpc/getnetpath.32
-rw-r--r--lib/libc/rpc/getrpcent.32
-rw-r--r--lib/libc/rpc/publickey.34
-rw-r--r--lib/libc/rpc/rpc.34
-rw-r--r--lib/libc/rpc/rpc_clnt_auth.32
-rw-r--r--lib/libc/rpc/rpc_clnt_calls.32
-rw-r--r--lib/libc/rpc/rpc_clnt_create.32
-rw-r--r--lib/libc/rpc/rpc_secure.32
-rw-r--r--lib/libc/rpc/rpc_soc.32
-rw-r--r--lib/libc/rpc/rpc_svc_calls.32
-rw-r--r--lib/libc/rpc/rpc_svc_create.32
-rw-r--r--lib/libc/rpc/rpc_svc_err.32
-rw-r--r--lib/libc/rpc/rpc_svc_reg.32
-rw-r--r--lib/libc/rpc/rpc_xdr.32
-rw-r--r--lib/libc/rpc/rpcbind.32
-rw-r--r--lib/libc/rpc/rtime.36
-rw-r--r--lib/libc/stdio/fclose.32
-rw-r--r--lib/libc/stdio/ferror.32
-rw-r--r--lib/libc/stdio/fflush.32
-rw-r--r--lib/libc/stdio/fgetln.32
-rw-r--r--lib/libc/stdio/fgets.32
-rw-r--r--lib/libc/stdio/fopen.32
-rw-r--r--lib/libc/stdio/fputs.32
-rw-r--r--lib/libc/stdio/fread.32
-rw-r--r--lib/libc/stdio/fseek.34
-rw-r--r--lib/libc/stdio/funopen.32
-rw-r--r--lib/libc/stdio/getc.32
-rw-r--r--lib/libc/stdio/mktemp.32
-rw-r--r--lib/libc/stdio/printf.34
-rw-r--r--lib/libc/stdio/putc.32
-rw-r--r--lib/libc/stdio/remove.32
-rw-r--r--lib/libc/stdio/scanf.34
-rw-r--r--lib/libc/stdio/setbuf.32
-rw-r--r--lib/libc/stdio/stdio.32
-rw-r--r--lib/libc/stdio/tmpnam.32
-rw-r--r--lib/libc/stdio/ungetc.32
-rw-r--r--lib/libc/stdtime/ctime.32
-rw-r--r--lib/libc/stdtime/strftime.32
-rw-r--r--lib/libc/stdtime/strptime.32
-rw-r--r--lib/libc/stdtime/time2posix.32
-rw-r--r--lib/libc/string/bcmp.32
-rw-r--r--lib/libc/string/bcopy.32
-rw-r--r--lib/libc/string/bstring.32
-rw-r--r--lib/libc/string/bzero.32
-rw-r--r--lib/libc/string/ffs.32
-rw-r--r--lib/libc/string/index.32
-rw-r--r--lib/libc/string/memccpy.32
-rw-r--r--lib/libc/string/memchr.32
-rw-r--r--lib/libc/string/memcmp.32
-rw-r--r--lib/libc/string/memcpy.32
-rw-r--r--lib/libc/string/memmove.32
-rw-r--r--lib/libc/string/memset.32
-rw-r--r--lib/libc/string/rindex.32
-rw-r--r--lib/libc/string/strcasecmp.32
-rw-r--r--lib/libc/string/strcat.32
-rw-r--r--lib/libc/string/strchr.32
-rw-r--r--lib/libc/string/strcmp.32
-rw-r--r--lib/libc/string/strcoll.32
-rw-r--r--lib/libc/string/strcpy.32
-rw-r--r--lib/libc/string/strcspn.32
-rw-r--r--lib/libc/string/strdup.32
-rw-r--r--lib/libc/string/strerror.34
-rw-r--r--lib/libc/string/string.32
-rw-r--r--lib/libc/string/strlcpy.32
-rw-r--r--lib/libc/string/strlen.32
-rw-r--r--lib/libc/string/strmode.32
-rw-r--r--lib/libc/string/strpbrk.32
-rw-r--r--lib/libc/string/strrchr.32
-rw-r--r--lib/libc/string/strsep.32
-rw-r--r--lib/libc/string/strspn.32
-rw-r--r--lib/libc/string/strstr.32
-rw-r--r--lib/libc/string/strtok.32
-rw-r--r--lib/libc/string/strxfrm.32
-rw-r--r--lib/libc/string/swab.32
-rw-r--r--lib/libc/string/wmemchr.32
-rw-r--r--lib/libc/sys/_exit.22
-rw-r--r--lib/libc/sys/accept.24
-rw-r--r--lib/libc/sys/access.22
-rw-r--r--lib/libc/sys/acct.22
-rw-r--r--lib/libc/sys/adjtime.22
-rw-r--r--lib/libc/sys/aio_cancel.22
-rw-r--r--lib/libc/sys/aio_error.22
-rw-r--r--lib/libc/sys/aio_read.24
-rw-r--r--lib/libc/sys/aio_return.22
-rw-r--r--lib/libc/sys/aio_suspend.22
-rw-r--r--lib/libc/sys/aio_waitcomplete.22
-rw-r--r--lib/libc/sys/aio_write.22
-rw-r--r--lib/libc/sys/bind.24
-rw-r--r--lib/libc/sys/brk.22
-rw-r--r--lib/libc/sys/chdir.22
-rw-r--r--lib/libc/sys/chflags.24
-rw-r--r--lib/libc/sys/chmod.22
-rw-r--r--lib/libc/sys/chown.22
-rw-r--r--lib/libc/sys/chroot.22
-rw-r--r--lib/libc/sys/clock_gettime.22
-rw-r--r--lib/libc/sys/close.22
-rw-r--r--lib/libc/sys/connect.24
-rw-r--r--lib/libc/sys/dup.22
-rw-r--r--lib/libc/sys/execve.22
-rw-r--r--lib/libc/sys/extattr_get_file.24
-rw-r--r--lib/libc/sys/fcntl.22
-rw-r--r--lib/libc/sys/fhopen.26
-rw-r--r--lib/libc/sys/flock.22
-rw-r--r--lib/libc/sys/fork.24
-rw-r--r--lib/libc/sys/fsync.22
-rw-r--r--lib/libc/sys/getdirentries.24
-rw-r--r--lib/libc/sys/getdtablesize.22
-rw-r--r--lib/libc/sys/getfh.24
-rw-r--r--lib/libc/sys/getfsstat.26
-rw-r--r--lib/libc/sys/getgid.24
-rw-r--r--lib/libc/sys/getgroups.24
-rw-r--r--lib/libc/sys/getitimer.22
-rw-r--r--lib/libc/sys/getlogin.24
-rw-r--r--lib/libc/sys/getpeername.24
-rw-r--r--lib/libc/sys/getpgrp.22
-rw-r--r--lib/libc/sys/getpid.24
-rw-r--r--lib/libc/sys/getpriority.24
-rw-r--r--lib/libc/sys/getrlimit.26
-rw-r--r--lib/libc/sys/getrusage.26
-rw-r--r--lib/libc/sys/getsid.22
-rw-r--r--lib/libc/sys/getsockname.24
-rw-r--r--lib/libc/sys/getsockopt.24
-rw-r--r--lib/libc/sys/gettimeofday.22
-rw-r--r--lib/libc/sys/getuid.24
-rw-r--r--lib/libc/sys/intro.22
-rw-r--r--lib/libc/sys/ioctl.22
-rw-r--r--lib/libc/sys/issetugid.22
-rw-r--r--lib/libc/sys/jail.24
-rw-r--r--lib/libc/sys/kill.24
-rw-r--r--lib/libc/sys/kldfind.24
-rw-r--r--lib/libc/sys/kldfirstmod.24
-rw-r--r--lib/libc/sys/kldload.24
-rw-r--r--lib/libc/sys/kldnext.24
-rw-r--r--lib/libc/sys/kldstat.24
-rw-r--r--lib/libc/sys/kldunload.24
-rw-r--r--lib/libc/sys/kqueue.26
-rw-r--r--lib/libc/sys/ktrace.28
-rw-r--r--lib/libc/sys/link.22
-rw-r--r--lib/libc/sys/listen.24
-rw-r--r--lib/libc/sys/lseek.22
-rw-r--r--lib/libc/sys/madvise.24
-rw-r--r--lib/libc/sys/mincore.24
-rw-r--r--lib/libc/sys/minherit.24
-rw-r--r--lib/libc/sys/mkdir.24
-rw-r--r--lib/libc/sys/mkfifo.24
-rw-r--r--lib/libc/sys/mknod.22
-rw-r--r--lib/libc/sys/mlock.24
-rw-r--r--lib/libc/sys/mmap.24
-rw-r--r--lib/libc/sys/modfind.24
-rw-r--r--lib/libc/sys/modnext.24
-rw-r--r--lib/libc/sys/modstat.24
-rw-r--r--lib/libc/sys/mount.24
-rw-r--r--lib/libc/sys/mprotect.24
-rw-r--r--lib/libc/sys/msync.24
-rw-r--r--lib/libc/sys/munmap.24
-rw-r--r--lib/libc/sys/nanosleep.22
-rw-r--r--lib/libc/sys/nfssvc.212
-rw-r--r--lib/libc/sys/open.22
-rw-r--r--lib/libc/sys/pathconf.22
-rw-r--r--lib/libc/sys/pipe.22
-rw-r--r--lib/libc/sys/poll.24
-rw-r--r--lib/libc/sys/profil.22
-rw-r--r--lib/libc/sys/ptrace.24
-rw-r--r--lib/libc/sys/quotactl.24
-rw-r--r--lib/libc/sys/read.26
-rw-r--r--lib/libc/sys/readlink.22
-rw-r--r--lib/libc/sys/reboot.24
-rw-r--r--lib/libc/sys/recv.24
-rw-r--r--lib/libc/sys/rename.22
-rw-r--r--lib/libc/sys/revoke.22
-rw-r--r--lib/libc/sys/rfork.22
-rw-r--r--lib/libc/sys/rmdir.22
-rw-r--r--lib/libc/sys/rtprio.24
-rw-r--r--lib/libc/sys/sched_get_priority_max.22
-rw-r--r--lib/libc/sys/sched_setparam.22
-rw-r--r--lib/libc/sys/sched_setscheduler.22
-rw-r--r--lib/libc/sys/sched_yield.22
-rw-r--r--lib/libc/sys/select.26
-rw-r--r--lib/libc/sys/semctl.26
-rw-r--r--lib/libc/sys/semget.26
-rw-r--r--lib/libc/sys/semop.26
-rw-r--r--lib/libc/sys/send.24
-rw-r--r--lib/libc/sys/sendfile.26
-rw-r--r--lib/libc/sys/setgroups.24
-rw-r--r--lib/libc/sys/setpgid.22
-rw-r--r--lib/libc/sys/setregid.22
-rw-r--r--lib/libc/sys/setresuid.24
-rw-r--r--lib/libc/sys/setreuid.22
-rw-r--r--lib/libc/sys/setsid.22
-rw-r--r--lib/libc/sys/setuid.24
-rw-r--r--lib/libc/sys/shm_open.24
-rw-r--r--lib/libc/sys/shmat.28
-rw-r--r--lib/libc/sys/shmctl.28
-rw-r--r--lib/libc/sys/shmget.28
-rw-r--r--lib/libc/sys/shutdown.24
-rw-r--r--lib/libc/sys/sigaction.22
-rw-r--r--lib/libc/sys/sigaltstack.22
-rw-r--r--lib/libc/sys/sigpending.22
-rw-r--r--lib/libc/sys/sigprocmask.22
-rw-r--r--lib/libc/sys/sigreturn.22
-rw-r--r--lib/libc/sys/sigsuspend.22
-rw-r--r--lib/libc/sys/sigwait.22
-rw-r--r--lib/libc/sys/socket.24
-rw-r--r--lib/libc/sys/socketpair.24
-rw-r--r--lib/libc/sys/stat.24
-rw-r--r--lib/libc/sys/statfs.24
-rw-r--r--lib/libc/sys/swapon.22
-rw-r--r--lib/libc/sys/symlink.22
-rw-r--r--lib/libc/sys/sync.22
-rw-r--r--lib/libc/sys/sysarch.22
-rw-r--r--lib/libc/sys/syscall.24
-rw-r--r--lib/libc/sys/truncate.22
-rw-r--r--lib/libc/sys/umask.22
-rw-r--r--lib/libc/sys/undelete.22
-rw-r--r--lib/libc/sys/unlink.22
-rw-r--r--lib/libc/sys/utimes.22
-rw-r--r--lib/libc/sys/vfork.22
-rw-r--r--lib/libc/sys/wait.28
-rw-r--r--lib/libc/sys/write.26
-rw-r--r--lib/libc/xdr/xdr.34
420 files changed, 643 insertions, 643 deletions
diff --git a/lib/libc/compat-43/creat.2 b/lib/libc/compat-43/creat.2
index 334fc01..dcfa4c5 100644
--- a/lib/libc/compat-43/creat.2
+++ b/lib/libc/compat-43/creat.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <fcntl.h>
+.In fcntl.h
.Ft int
.Fn creat "const char *path" "mode_t mode"
.Sh DESCRIPTION
diff --git a/lib/libc/compat-43/gethostid.3 b/lib/libc/compat-43/gethostid.3
index dcf6250..27b6d66 100644
--- a/lib/libc/compat-43/gethostid.3
+++ b/lib/libc/compat-43/gethostid.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft long
.Fn gethostid void
.Ft void
diff --git a/lib/libc/compat-43/killpg.2 b/lib/libc/compat-43/killpg.2
index 13b8f06..5f42008 100644
--- a/lib/libc/compat-43/killpg.2
+++ b/lib/libc/compat-43/killpg.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <signal.h>
+.In sys/types.h
+.In signal.h
.Ft int
.Fn killpg "pid_t pgrp" "int sig"
.Sh DESCRIPTION
diff --git a/lib/libc/compat-43/setruid.3 b/lib/libc/compat-43/setruid.3
index 465d81e..472e7fb 100644
--- a/lib/libc/compat-43/setruid.3
+++ b/lib/libc/compat-43/setruid.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn setruid "uid_t ruid"
.Ft int
diff --git a/lib/libc/compat-43/sigpause.2 b/lib/libc/compat-43/sigpause.2
index 5333315..1af1064 100644
--- a/lib/libc/compat-43/sigpause.2
+++ b/lib/libc/compat-43/sigpause.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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.2 b/lib/libc/compat-43/sigsetmask.2
index 305f9d2..f30bcd1 100644
--- a/lib/libc/compat-43/sigsetmask.2
+++ b/lib/libc/compat-43/sigsetmask.2
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
.Ft int
.Fn sigsetmask "int mask"
.Ft int
diff --git a/lib/libc/compat-43/sigvec.2 b/lib/libc/compat-43/sigvec.2
index 77dfb67..25f1b14 100644
--- a/lib/libc/compat-43/sigvec.2
+++ b/lib/libc/compat-43/sigvec.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
.Bd -literal
struct sigvec {
void (*sv_handler)();
diff --git a/lib/libc/db/man/btree.3 b/lib/libc/db/man/btree.3
index 9fabb3a..99b2b15 100644
--- a/lib/libc/db/man/btree.3
+++ b/lib/libc/db/man/btree.3
@@ -39,8 +39,8 @@
.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 routine
.Fn dbopen
diff --git a/lib/libc/db/man/dbm.3 b/lib/libc/db/man/dbm.3
index e8a21bb..961ea85 100644
--- a/lib/libc/db/man/dbm.3
+++ b/lib/libc/db/man/dbm.3
@@ -33,8 +33,8 @@
.Nm dbm_store
.Nd database access functions
.Sh SYNOPSIS
-.Fd #include <fcntl.h>
-.Fd #include <ndbm.h>
+.In fcntl.h
+.In ndbm.h
.Ft DBM *
.Fn dbm_open "const char *base" "int flags" "int mode"
.Ft void
diff --git a/lib/libc/db/man/dbopen.3 b/lib/libc/db/man/dbopen.3
index 5d38d57..e25e575 100644
--- a/lib/libc/db/man/dbopen.3
+++ b/lib/libc/db/man/dbopen.3
@@ -39,9 +39,9 @@
.Nm dbopen
.Nd "database access methods"
.Sh SYNOPSIS
-.Fd "#include <sys/types.h>"
-.Fd "#include <limits.h>"
-.Fd "#include <db.h>"
+.In sys/types.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 f75b8e7..4ed6df9 100644
--- a/lib/libc/db/man/hash.3
+++ b/lib/libc/db/man/hash.3
@@ -39,8 +39,8 @@
.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 d3d401d..38787167 100644
--- a/lib/libc/db/man/mpool.3
+++ b/lib/libc/db/man/mpool.3
@@ -39,8 +39,8 @@
.Nm mpool
.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/recno.3 b/lib/libc/db/man/recno.3
index 334e094..0780356 100644
--- a/lib/libc/db/man/recno.3
+++ b/lib/libc/db/man/recno.3
@@ -39,8 +39,8 @@
.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 routine
.Fn dbopen
diff --git a/lib/libc/gen/alarm.3 b/lib/libc/gen/alarm.3
index 94f0590..2aac738 100644
--- a/lib/libc/gen/alarm.3
+++ b/lib/libc/gen/alarm.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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/arc4random.3 b/lib/libc/gen/arc4random.3
index 7e97d09..dba6921 100644
--- a/lib/libc/gen/arc4random.3
+++ b/lib/libc/gen/arc4random.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
.Ft u_int32_t
.Fn arc4random "void"
.Ft void
diff --git a/lib/libc/gen/basename.3 b/lib/libc/gen/basename.3
index 0c76a0c..a6cd7b5 100644
--- a/lib/libc/gen/basename.3
+++ b/lib/libc/gen/basename.3
@@ -34,7 +34,7 @@
.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 a3b6c92..9a17a04 100644
--- a/lib/libc/gen/clock.3
+++ b/lib/libc/gen/clock.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 1c6d251..9106813 100644
--- a/lib/libc/gen/confstr.3
+++ b/lib/libc/gen/confstr.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 84c69c0..1ed1062 100644
--- a/lib/libc/gen/ctermid.3
+++ b/lib/libc/gen/ctermid.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
.Ft char *
.Fn ctermid "char *buf"
.Ft char *
diff --git a/lib/libc/gen/daemon.3 b/lib/libc/gen/daemon.3
index 153114d..c9ce0f4 100644
--- a/lib/libc/gen/daemon.3
+++ b/lib/libc/gen/daemon.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 d7cc940..ccc60c5 100644
--- a/lib/libc/gen/devname.3
+++ b/lib/libc/gen/devname.3
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.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 e9f3a90..cfe1439 100644
--- a/lib/libc/gen/directory.3
+++ b/lib/libc/gen/directory.3
@@ -48,8 +48,8 @@
.Sh LIBRARY
.Lb libc
.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 struct dirent *
diff --git a/lib/libc/gen/dirname.3 b/lib/libc/gen/dirname.3
index d94ca4f..624cf72 100644
--- a/lib/libc/gen/dirname.3
+++ b/lib/libc/gen/dirname.3
@@ -34,7 +34,7 @@
.Nm dirname
.Nd extract the directory portition 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/dladdr.3 b/lib/libc/gen/dladdr.3
index 596fc7a..0e1ca5c 100644
--- a/lib/libc/gen/dladdr.3
+++ b/lib/libc/gen/dladdr.3
@@ -34,7 +34,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <dlfcn.h>
+.In dlfcn.h
.Ft int
.Fn dladdr "const void *addr" "Dl_info *info"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/dllockinit.3 b/lib/libc/gen/dllockinit.3
index 9301809..73cd38c 100644
--- a/lib/libc/gen/dllockinit.3
+++ b/lib/libc/gen/dllockinit.3
@@ -34,7 +34,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <dlfcn.h>
+.In dlfcn.h
.Ft void
.Fn dllockinit "void *context" "void *(*lock_create)(void *context)" "void (*rlock_acquire)(void *lock)" "void (*wlock_acquire)(void *lock)" "void (*lock_release)(void *lock)" "void (*lock_destroy)(void *lock)" "void (*context_destroy)(void *context)"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/dlopen.3 b/lib/libc/gen/dlopen.3
index 480d7c3..45f1d96 100644
--- a/lib/libc/gen/dlopen.3
+++ b/lib/libc/gen/dlopen.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <dlfcn.h>
+.In dlfcn.h
.Ft void *
.Fn dlopen "const char *path" "int mode"
.Ft void *
diff --git a/lib/libc/gen/err.3 b/lib/libc/gen/err.3
index 792b5e6..b2754f5 100644
--- a/lib/libc/gen/err.3
+++ b/lib/libc/gen/err.3
@@ -54,7 +54,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <err.h>
+.In err.h
.Ft void
.Fn err "int eval" "const char *fmt" "..."
.Ft void
@@ -71,7 +71,7 @@
.Fn warnc "int code" "const char *fmt" "..."
.Ft void
.Fn warnx "const char *fmt" "..."
-.Fd #include <stdarg.h>
+.In stdarg.h
.Ft void
.Fn verr "int eval" "const char *fmt" "va_list args"
.Ft void
diff --git a/lib/libc/gen/exec.3 b/lib/libc/gen/exec.3
index 841339b..a3ef143 100644
--- a/lib/libc/gen/exec.3
+++ b/lib/libc/gen/exec.3
@@ -46,7 +46,7 @@
.Sh LIBRARY
.Lb libc
.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/fmtcheck.3 b/lib/libc/gen/fmtcheck.3
index 972f0a8..e11687d 100644
--- a/lib/libc/gen/fmtcheck.3
+++ b/lib/libc/gen/fmtcheck.3
@@ -43,7 +43,7 @@ format string
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
.Ft const char *
.Fn fmtcheck "const char *fmt_suspect" "const char *fmt_default"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/fnmatch.3 b/lib/libc/gen/fnmatch.3
index f55e477..a6a8b02 100644
--- a/lib/libc/gen/fnmatch.3
+++ b/lib/libc/gen/fnmatch.3
@@ -43,7 +43,7 @@
.Sh LIBRARY
.Lb libc
.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/frexp.3 b/lib/libc/gen/frexp.3
index de1587e..8236810 100644
--- a/lib/libc/gen/frexp.3
+++ b/lib/libc/gen/frexp.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn frexp "double value" "int *exp"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/ftok.3 b/lib/libc/gen/ftok.3
index cd7da7a..41a50ed 100644
--- a/lib/libc/gen/ftok.3
+++ b/lib/libc/gen/ftok.3
@@ -33,8 +33,8 @@
.Sh LIBRARY
.Lb libc
.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/getbootfile.3 b/lib/libc/gen/getbootfile.3
index a2b0244..0365598 100644
--- a/lib/libc/gen/getbootfile.3
+++ b/lib/libc/gen/getbootfile.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <paths.h>
+.In paths.h
.Ft const char *
.Fn getbootfile void
.Sh DESCRIPTION
diff --git a/lib/libc/gen/getbsize.3 b/lib/libc/gen/getbsize.3
index 828ab2c..cbf4863 100644
--- a/lib/libc/gen/getbsize.3
+++ b/lib/libc/gen/getbsize.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 eebdabf..d35729e 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -53,7 +53,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
.Ft int
.Fn cgetent "char **buf" "char **db_array" "char *name"
.Ft int
diff --git a/lib/libc/gen/getcwd.3 b/lib/libc/gen/getcwd.3
index f7c851d..0dadd05 100644
--- a/lib/libc/gen/getcwd.3
+++ b/lib/libc/gen/getcwd.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.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 9acceaf..068bb87 100644
--- a/lib/libc/gen/getdiskbyname.3
+++ b/lib/libc/gen/getdiskbyname.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/disklabel.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 69d1b673..0c3bee4 100644
--- a/lib/libc/gen/getdomainname.3
+++ b/lib/libc/gen/getdomainname.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn getdomainname "char *name" "int namelen"
.Ft int
diff --git a/lib/libc/gen/getfsent.3 b/lib/libc/gen/getfsent.3
index 2998246..06def9d 100644
--- a/lib/libc/gen/getfsent.3
+++ b/lib/libc/gen/getfsent.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 5c12b60..a316bbc 100644
--- a/lib/libc/gen/getgrent.3
+++ b/lib/libc/gen/getgrent.3
@@ -47,8 +47,8 @@
.Sh LIBRARY
.Lb libc
.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 e9eadde..ecf53f2 100644
--- a/lib/libc/gen/getgrouplist.3
+++ b/lib/libc/gen/getgrouplist.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn getgrouplist "const char *name" "int basegid" "int *groups" "int *ngroups"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/gethostname.3 b/lib/libc/gen/gethostname.3
index 76819b1..7c0275d 100644
--- a/lib/libc/gen/gethostname.3
+++ b/lib/libc/gen/gethostname.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn gethostname "char *name" "int namelen"
.Ft int
diff --git a/lib/libc/gen/getloadavg.3 b/lib/libc/gen/getloadavg.3
index 14479f4..37a8d67 100644
--- a/lib/libc/gen/getloadavg.3
+++ b/lib/libc/gen/getloadavg.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 01cd55d..16f6fcc 100644
--- a/lib/libc/gen/getmntinfo.3
+++ b/lib/libc/gen/getmntinfo.3
@@ -41,9 +41,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/ucred.h>
-.Fd #include <sys/mount.h>
+.In sys/param.h
+.In sys/ucred.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 d17ffd2..689aeb7 100644
--- a/lib/libc/gen/getnetgrent.3
+++ b/lib/libc/gen/getnetgrent.3
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <netdb.h>
+.In netdb.h
.Ft int
.Fn getnetgrent "char **host" "char **user" "char **domain"
.Ft int
diff --git a/lib/libc/gen/getobjformat.3 b/lib/libc/gen/getobjformat.3
index 8e282c5..c9fd9b0 100644
--- a/lib/libc/gen/getobjformat.3
+++ b/lib/libc/gen/getobjformat.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <objformat.h>
+.In objformat.h
.Ft int
.Fn getobjformat "char *buf" "size_t bufsize" "int *argcp" "char **argv"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/getpagesize.3 b/lib/libc/gen/getpagesize.3
index 8b5e2f7..cc2fbf0 100644
--- a/lib/libc/gen/getpagesize.3
+++ b/lib/libc/gen/getpagesize.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 0daeaaf..aa921d7 100644
--- a/lib/libc/gen/getpass.3
+++ b/lib/libc/gen/getpass.3
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.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/getprogname.3 b/lib/libc/gen/getprogname.3
index 7f0222d..53d39a6 100644
--- a/lib/libc/gen/getprogname.3
+++ b/lib/libc/gen/getprogname.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
.Ft const char *
.Fn getprogname "void"
.Ft void
diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3
index 1ad7a15..6347118 100644
--- a/lib/libc/gen/getpwent.3
+++ b/lib/libc/gen/getpwent.3
@@ -46,8 +46,8 @@
.Sh LIBRARY
.Lb libc
.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 struct passwd *
diff --git a/lib/libc/gen/getttyent.3 b/lib/libc/gen/getttyent.3
index 88762e1..593bef1 100644
--- a/lib/libc/gen/getttyent.3
+++ b/lib/libc/gen/getttyent.3
@@ -47,7 +47,7 @@
.Sh LIBRARY
.Lb libc
.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 6f84cb0..e9eca6f 100644
--- a/lib/libc/gen/getusershell.3
+++ b/lib/libc/gen/getusershell.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft char *
.Fn getusershell void
.Ft void
diff --git a/lib/libc/gen/getvfsbyname.3 b/lib/libc/gen/getvfsbyname.3
index ebaf787..da115ec 100644
--- a/lib/libc/gen/getvfsbyname.3
+++ b/lib/libc/gen/getvfsbyname.3
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/mount.h>
+.In sys/param.h
+.In sys/mount.h
.Ft int
.Fn getvfsbyname "const char *name" "struct vfsconf *vfc"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/getvfsent.3 b/lib/libc/gen/getvfsent.3
index bdf2cbb..5d46c31 100644
--- a/lib/libc/gen/getvfsent.3
+++ b/lib/libc/gen/getvfsent.3
@@ -15,8 +15,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/mount.h>
+.In sys/param.h
+.In sys/mount.h
.Ft struct ovfsconf *
.Fn getvfsent "void"
.Ft void
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index f58e372..daca64e 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <glob.h>
+.In glob.h
.Ft int
.Fn glob "const char *pattern" "int flags" "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 23756b2..eb11151 100644
--- a/lib/libc/gen/initgroups.3
+++ b/lib/libc/gen/initgroups.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn initgroups "const char *name" "int basegid"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/ldexp.3 b/lib/libc/gen/ldexp.3
index e8fe770..6ebe68d 100644
--- a/lib/libc/gen/ldexp.3
+++ b/lib/libc/gen/ldexp.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn ldexp "double x" "int exp"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/lockf.3 b/lib/libc/gen/lockf.3
index 236c49a..c728320 100644
--- a/lib/libc/gen/lockf.3
+++ b/lib/libc/gen/lockf.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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/modf.3 b/lib/libc/gen/modf.3
index b60d060..9089b00 100644
--- a/lib/libc/gen/modf.3
+++ b/lib/libc/gen/modf.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn modf "double value" "double *iptr"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/msgctl.3 b/lib/libc/gen/msgctl.3
index 3d1d55a..cde3234 100644
--- a/lib/libc/gen/msgctl.3
+++ b/lib/libc/gen/msgctl.3
@@ -40,9 +40,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/ipc.h>
-.Fd #include <sys/msg.h>
+.In sys/types.h
+.In sys/ipc.h
+.In sys/msg.h
.Ft int
.Fn msgctl "int msqid" "int cmd" "struct msqid_ds *buf"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/msgget.3 b/lib/libc/gen/msgget.3
index 838e13a..80f8da6 100644
--- a/lib/libc/gen/msgget.3
+++ b/lib/libc/gen/msgget.3
@@ -40,9 +40,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/ipc.h>
-.Fd #include <sys/msg.h>
+.In sys/types.h
+.In sys/ipc.h
+.In sys/msg.h
.Ft int
.Fn msgget "key_t key" "int msgflg"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/msgrcv.3 b/lib/libc/gen/msgrcv.3
index aa41662..76feaf0 100644
--- a/lib/libc/gen/msgrcv.3
+++ b/lib/libc/gen/msgrcv.3
@@ -40,9 +40,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/ipc.h>
-.Fd #include <sys/msg.h>
+.In sys/types.h
+.In sys/ipc.h
+.In sys/msg.h
.Ft int
.Fn msgrcv "int msqid" "void *msgp" "size_t msgsz" "long msgtyp" "int msgflg"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/msgsnd.3 b/lib/libc/gen/msgsnd.3
index 3ee09c0..aa25319 100644
--- a/lib/libc/gen/msgsnd.3
+++ b/lib/libc/gen/msgsnd.3
@@ -40,9 +40,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/ipc.h>
-.Fd #include <sys/msg.h>
+.In sys/types.h
+.In sys/ipc.h
+.In sys/msg.h
.Ft int
.Fn msgsnd "int msqid" "void *msgp" "size_t msgsz" "int msgflg"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/nice.3 b/lib/libc/gen/nice.3
index 38bd053..bfb01ae 100644
--- a/lib/libc/gen/nice.3
+++ b/lib/libc/gen/nice.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 9597b37..d72dad6 100644
--- a/lib/libc/gen/nlist.3
+++ b/lib/libc/gen/nlist.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 8ffd75c..1822283 100644
--- a/lib/libc/gen/pause.3
+++ b/lib/libc/gen/pause.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 c05978e..b4371a2 100644
--- a/lib/libc/gen/popen.3
+++ b/lib/libc/gen/popen.3
@@ -43,7 +43,7 @@
.Sh LIBRARY
.Lb libc
.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 fd80528..3c291a9 100644
--- a/lib/libc/gen/psignal.3
+++ b/lib/libc/gen/psignal.3
@@ -44,12 +44,12 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
.Ft void
.Fn psignal "unsigned sig" "const char *s"
.Vt extern const char * const sys_siglist[] ;
.Vt extern const char * const sys_signame[] ;
-.Fd #include <string.h>
+.In string.h
.Ft "char *"
.Fn strsignal "int sig"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/pwcache.3 b/lib/libc/gen/pwcache.3
index 47df68c..0a8c2b0 100644
--- a/lib/libc/gen/pwcache.3
+++ b/lib/libc/gen/pwcache.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
.Ft char *
.Fn user_from_uid "unsigned long uid" "int nouser"
.Ft char *
diff --git a/lib/libc/gen/raise.3 b/lib/libc/gen/raise.3
index e2d82ef..8dac8f5 100644
--- a/lib/libc/gen/raise.3
+++ b/lib/libc/gen/raise.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
.Ft int
.Fn raise "int sig"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/rand48.3 b/lib/libc/gen/rand48.3
index 5386bce..1e16cbc 100644
--- a/lib/libc/gen/rand48.3
+++ b/lib/libc/gen/rand48.3
@@ -29,7 +29,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
.Ft double
.Fn drand48 void
.Ft double
diff --git a/lib/libc/gen/rfork_thread.3 b/lib/libc/gen/rfork_thread.3
index ef8389f..73a35c2 100644
--- a/lib/libc/gen/rfork_thread.3
+++ b/lib/libc/gen/rfork_thread.3
@@ -34,7 +34,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn rfork_thread "int flags" "void *stack" "int (*func)(void *arg)" "void *arg"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3
index 0502bd2..fd090cc 100644
--- a/lib/libc/gen/scandir.3
+++ b/lib/libc/gen/scandir.3
@@ -42,8 +42,8 @@
.Sh LIBRARY
.Lb libc
.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\\*(lpstruct dirent *\\*(rp" "int \\*(lp*compar\\*(rp\\*(lpconst void *, const void *\\*(rp"
.Ft int
diff --git a/lib/libc/gen/sem_destroy.3 b/lib/libc/gen/sem_destroy.3
index 82f0946..8094a53 100644
--- a/lib/libc/gen/sem_destroy.3
+++ b/lib/libc/gen/sem_destroy.3
@@ -35,7 +35,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <semaphore.h>
+.In semaphore.h
.Ft int
.Fn sem_destroy "sem_t *sem"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/sem_getvalue.3 b/lib/libc/gen/sem_getvalue.3
index 2ad5646..d1cc3a4 100644
--- a/lib/libc/gen/sem_getvalue.3
+++ b/lib/libc/gen/sem_getvalue.3
@@ -35,7 +35,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <semaphore.h>
+.In semaphore.h
.Ft int
.Fn sem_getvalue "sem_t *sem" "int *sval"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/sem_init.3 b/lib/libc/gen/sem_init.3
index 6226edc..fd517c2 100644
--- a/lib/libc/gen/sem_init.3
+++ b/lib/libc/gen/sem_init.3
@@ -35,7 +35,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <semaphore.h>
+.In semaphore.h
.Ft int
.Fn sem_init "sem_t *sem" "int pshared" "unsigned int value"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/sem_open.3 b/lib/libc/gen/sem_open.3
index b735a56..07c9543 100644
--- a/lib/libc/gen/sem_open.3
+++ b/lib/libc/gen/sem_open.3
@@ -37,7 +37,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <semaphore.h>
+.In semaphore.h
.Ft sem_t *
.Fn sem_open "const char *name" "int oflag" "..."
.Ft int
diff --git a/lib/libc/gen/sem_post.3 b/lib/libc/gen/sem_post.3
index ca6bf6d..71b9f43 100644
--- a/lib/libc/gen/sem_post.3
+++ b/lib/libc/gen/sem_post.3
@@ -35,7 +35,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <semaphore.h>
+.In semaphore.h
.Ft int
.Fn sem_post "sem_t *sem"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/sem_wait.3 b/lib/libc/gen/sem_wait.3
index d015b90..c89ea04 100644
--- a/lib/libc/gen/sem_wait.3
+++ b/lib/libc/gen/sem_wait.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <semaphore.h>
+.In semaphore.h
.Ft int
.Fn sem_wait "sem_t *sem"
.Ft int
diff --git a/lib/libc/gen/setjmp.3 b/lib/libc/gen/setjmp.3
index 29c2a9b..dd63909 100644
--- a/lib/libc/gen/setjmp.3
+++ b/lib/libc/gen/setjmp.3
@@ -51,7 +51,7 @@
.Sh LIBRARY
.Lb libc
.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 548f02e..bca8e68 100644
--- a/lib/libc/gen/setmode.3
+++ b/lib/libc/gen/setmode.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.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 07ac4da..6789a26 100644
--- a/lib/libc/gen/setproctitle.3
+++ b/lib/libc/gen/setproctitle.3
@@ -27,8 +27,8 @@
.Nm setproctitle
.Nd set process title
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <unistd.h>
+.In sys/types.h
+.In unistd.h
.Ft void
.Fn setproctitle "const char *fmt" "..."
.Sh DESCRIPTION
diff --git a/lib/libc/gen/shm_open.3 b/lib/libc/gen/shm_open.3
index 35ac103..0619133 100644
--- a/lib/libc/gen/shm_open.3
+++ b/lib/libc/gen/shm_open.3
@@ -39,8 +39,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/mman.h>
+.In sys/types.h
+.In sys/mman.h
.Ft int
.Fn shm_open "const char *path" "int flags" "mode_t mode"
.Ft int
diff --git a/lib/libc/gen/siginterrupt.3 b/lib/libc/gen/siginterrupt.3
index 4a3b4a4..79aed04 100644
--- a/lib/libc/gen/siginterrupt.3
+++ b/lib/libc/gen/siginterrupt.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 5a43ffa..20a5ef0 100644
--- a/lib/libc/gen/signal.3
+++ b/lib/libc/gen/signal.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 \*(lp*
diff --git a/lib/libc/gen/sigsetops.3 b/lib/libc/gen/sigsetops.3
index d50da00..b0296c7 100644
--- a/lib/libc/gen/sigsetops.3
+++ b/lib/libc/gen/sigsetops.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 dbae4d3..dd0a322 100644
--- a/lib/libc/gen/sleep.3
+++ b/lib/libc/gen/sleep.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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/stringlist.3 b/lib/libc/gen/stringlist.3
index 6708055..d3806f5 100644
--- a/lib/libc/gen/stringlist.3
+++ b/lib/libc/gen/stringlist.3
@@ -48,7 +48,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stringlist.h>
+.In stringlist.h
.Ft StringList *
.Fn sl_init
.Ft void
diff --git a/lib/libc/gen/strtofflags.3 b/lib/libc/gen/strtofflags.3
index 529bd80..4b2d5c5 100644
--- a/lib/libc/gen/strtofflags.3
+++ b/lib/libc/gen/strtofflags.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft char *
.Fn fflagstostr "u_long flags"
.Ft int
diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3
index 65bd826..abbe341 100644
--- a/lib/libc/gen/sysconf.3
+++ b/lib/libc/gen/sysconf.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 9551466..8e0373b 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -43,8 +43,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/sysctl.h>
+.In sys/types.h
+.In sys/sysctl.h
.Ft int
.Fn sysctl "int *name" "u_int namelen" "void *oldp" "size_t *oldlenp" "void *newp" "size_t newlen"
.Ft int
diff --git a/lib/libc/gen/syslog.3 b/lib/libc/gen/syslog.3
index eafb63a..96c0cfa 100644
--- a/lib/libc/gen/syslog.3
+++ b/lib/libc/gen/syslog.3
@@ -45,8 +45,8 @@
.Sh LIBRARY
.Lb libc
.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/tcgetpgrp.3 b/lib/libc/gen/tcgetpgrp.3
index d04f0845..d6aaa76 100644
--- a/lib/libc/gen/tcgetpgrp.3
+++ b/lib/libc/gen/tcgetpgrp.3
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.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/gen/tcsendbreak.3 b/lib/libc/gen/tcsendbreak.3
index 9dfcca3..5c9c362 100644
--- a/lib/libc/gen/tcsendbreak.3
+++ b/lib/libc/gen/tcsendbreak.3
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <termios.h>
+.In termios.h
.Ft int
.Fn tcdrain "int fd"
.Ft int
diff --git a/lib/libc/gen/tcsetattr.3 b/lib/libc/gen/tcsetattr.3
index 58de728..b83ccba 100644
--- a/lib/libc/gen/tcsetattr.3
+++ b/lib/libc/gen/tcsetattr.3
@@ -48,7 +48,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <termios.h>
+.In termios.h
.Ft speed_t
.Fn cfgetispeed "const struct termios *t"
.Ft int
diff --git a/lib/libc/gen/tcsetpgrp.3 b/lib/libc/gen/tcsetpgrp.3
index a7d3409..8ddb469 100644
--- a/lib/libc/gen/tcsetpgrp.3
+++ b/lib/libc/gen/tcsetpgrp.3
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.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/gen/time.3 b/lib/libc/gen/time.3
index 570a88d..cb43bce 100644
--- a/lib/libc/gen/time.3
+++ b/lib/libc/gen/time.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 45429d0..4ef554c 100644
--- a/lib/libc/gen/times.3
+++ b/lib/libc/gen/times.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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/ttyname.3 b/lib/libc/gen/ttyname.3
index 9141dfc..ce14a0d 100644
--- a/lib/libc/gen/ttyname.3
+++ b/lib/libc/gen/ttyname.3
@@ -43,7 +43,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft char *
.Fn ttyname "int fd"
.Ft int
diff --git a/lib/libc/gen/tzset.3 b/lib/libc/gen/tzset.3
index 1c7622c..fd1af45 100644
--- a/lib/libc/gen/tzset.3
+++ b/lib/libc/gen/tzset.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <time.h>
+.In time.h
.Ft void
.Fn tzset void
.Ft void
diff --git a/lib/libc/gen/ualarm.3 b/lib/libc/gen/ualarm.3
index f2b269c..78bdfd4 100644
--- a/lib/libc/gen/ualarm.3
+++ b/lib/libc/gen/ualarm.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft u_int
.Fn ualarm "u_int microseconds" "u_int interval"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3
index 9a9d5fe..946f1e0 100644
--- a/lib/libc/gen/uname.3
+++ b/lib/libc/gen/uname.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 1930209..9f044b9 100644
--- a/lib/libc/gen/unvis.3
+++ b/lib/libc/gen/unvis.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <vis.h>
+.In vis.h
.Ft int
.Fn unvis "char *cp" "int c" "int *astate" "int flag"
.Ft int
diff --git a/lib/libc/gen/usleep.3 b/lib/libc/gen/usleep.3
index ae89133..807e7c5 100644
--- a/lib/libc/gen/usleep.3
+++ b/lib/libc/gen/usleep.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn usleep "unsigned int microseconds"
.Sh DESCRIPTION
diff --git a/lib/libc/gen/utime.3 b/lib/libc/gen/utime.3
index a14eea3..44c4812 100644
--- a/lib/libc/gen/utime.3
+++ b/lib/libc/gen/utime.3
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.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 b15847f..06d2907 100644
--- a/lib/libc/gen/valloc.3
+++ b/lib/libc/gen/valloc.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 f49290a..dcb239a 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <vis.h>
+.In vis.h
.Ft char *
.Fn vis "char *dst" "int c" "int flag" "int nextc"
.Ft int
diff --git a/lib/libc/gmon/moncontrol.3 b/lib/libc/gmon/moncontrol.3
index 1966d72..1162178 100644
--- a/lib/libc/gmon/moncontrol.3
+++ b/lib/libc/gmon/moncontrol.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
+.In sys/types.h
.Ft int
.Fn moncontrol "int mode"
.Ft int
diff --git a/lib/libc/i386/sys/i386_get_ioperm.2 b/lib/libc/i386/sys/i386_get_ioperm.2
index fcd1353..76b9cd0 100644
--- a/lib/libc/i386/sys/i386_get_ioperm.2
+++ b/lib/libc/i386/sys/i386_get_ioperm.2
@@ -34,7 +34,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <machine/sysarch.h>
+.In machine/sysarch.h
.Ft int
.Fn i386_get_ioperm "unsigned int start" "unsigned int *length" "int *enable"
.Ft int
diff --git a/lib/libc/i386/sys/i386_get_ldt.2 b/lib/libc/i386/sys/i386_get_ldt.2
index 5b74325..340c4f2 100644
--- a/lib/libc/i386/sys/i386_get_ldt.2
+++ b/lib/libc/i386/sys/i386_get_ldt.2
@@ -42,8 +42,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <machine/segments.h>
-.Fd #include <machine/sysarch.h>
+.In machine/segments.h
+.In machine/sysarch.h
.Ft int
.Fn i386_get_ldt "int start_sel" "union descriptor *descs" "int num_sels"
.Ft int
@@ -66,7 +66,7 @@ and the number of entries to set or return
The argument
.Fa descs
can be either segment_descriptor or gate_descriptor and are defined in
-.Fd <i386/segments.h> .
+.Aq Pa i386/segments.h .
These structures are defined by the architecture
as disjoint bit-fields, so care must be taken in constructing them.
.Pp
diff --git a/lib/libc/i386/sys/i386_set_watch.3 b/lib/libc/i386/sys/i386_set_watch.3
index 6c49cbe..28f2261 100644
--- a/lib/libc/i386/sys/i386_set_watch.3
+++ b/lib/libc/i386/sys/i386_set_watch.3
@@ -37,8 +37,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <machine/reg.h>
-.Fd #include <machine/sysarch.h>
+.In machine/reg.h
+.In machine/sysarch.h
.Ft int
.Fn i386_clr_watch "int watchnum" "struct dbreg *d"
.Ft int
diff --git a/lib/libc/i386/sys/i386_vm86.2 b/lib/libc/i386/sys/i386_vm86.2
index 185b537..9a5eabe 100644
--- a/lib/libc/i386/sys/i386_vm86.2
+++ b/lib/libc/i386/sys/i386_vm86.2
@@ -33,9 +33,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <machine/sysarch.h>
-.Fd #include <machine/vm86.h>
+.In sys/types.h
+.In machine/sysarch.h
+.In machine/vm86.h
.Ft int
.Fn i386_vm86 "int function" "void *data"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/ctype.3 b/lib/libc/locale/ctype.3
index 5c05468..d1ab228 100644
--- a/lib/libc/locale/ctype.3
+++ b/lib/libc/locale/ctype.3
@@ -62,7 +62,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn isalnum "int c"
.Ft int
diff --git a/lib/libc/locale/isalnum.3 b/lib/libc/locale/isalnum.3
index 6b239aa..7e460d4 100644
--- a/lib/libc/locale/isalnum.3
+++ b/lib/libc/locale/isalnum.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn isalnum "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/isalpha.3 b/lib/libc/locale/isalpha.3
index 54d7e206..27405d0 100644
--- a/lib/libc/locale/isalpha.3
+++ b/lib/libc/locale/isalpha.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn isalpha "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/isascii.3 b/lib/libc/locale/isascii.3
index 0a67f79..f30e0a8 100644
--- a/lib/libc/locale/isascii.3
+++ b/lib/libc/locale/isascii.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn isascii "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/isblank.3 b/lib/libc/locale/isblank.3
index e40a48d..5c1650d 100644
--- a/lib/libc/locale/isblank.3
+++ b/lib/libc/locale/isblank.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn isblank "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/iscntrl.3 b/lib/libc/locale/iscntrl.3
index cefacad..070fb9e 100644
--- a/lib/libc/locale/iscntrl.3
+++ b/lib/libc/locale/iscntrl.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn iscntrl "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/isdigit.3 b/lib/libc/locale/isdigit.3
index 1a52fa3..2cabd4d 100644
--- a/lib/libc/locale/isdigit.3
+++ b/lib/libc/locale/isdigit.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn isdigit "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/isgraph.3 b/lib/libc/locale/isgraph.3
index e835bfd..ccf5fc7 100644
--- a/lib/libc/locale/isgraph.3
+++ b/lib/libc/locale/isgraph.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn isgraph "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/islower.3 b/lib/libc/locale/islower.3
index fc4720d..9cf8757 100644
--- a/lib/libc/locale/islower.3
+++ b/lib/libc/locale/islower.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn islower "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/isprint.3 b/lib/libc/locale/isprint.3
index 877f21f..12c7459 100644
--- a/lib/libc/locale/isprint.3
+++ b/lib/libc/locale/isprint.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn isprint "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/ispunct.3 b/lib/libc/locale/ispunct.3
index 87622b7..6b9c943 100644
--- a/lib/libc/locale/ispunct.3
+++ b/lib/libc/locale/ispunct.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn ispunct "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/isspace.3 b/lib/libc/locale/isspace.3
index de962f3..538cf3c 100644
--- a/lib/libc/locale/isspace.3
+++ b/lib/libc/locale/isspace.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn isspace "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/isupper.3 b/lib/libc/locale/isupper.3
index 95b2427..ec43a7a 100644
--- a/lib/libc/locale/isupper.3
+++ b/lib/libc/locale/isupper.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn isupper "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/isxdigit.3 b/lib/libc/locale/isxdigit.3
index 0d79a37..bf88255 100644
--- a/lib/libc/locale/isxdigit.3
+++ b/lib/libc/locale/isxdigit.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn isxdigit "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/mbrune.3 b/lib/libc/locale/mbrune.3
index 959f839..7228f7a 100644
--- a/lib/libc/locale/mbrune.3
+++ b/lib/libc/locale/mbrune.3
@@ -46,7 +46,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <rune.h>
+.In rune.h
.Ft char *
.Fn mbrune "const char *string" "rune_t rune"
.Ft char *
diff --git a/lib/libc/locale/multibyte.3 b/lib/libc/locale/multibyte.3
index e909dce..34ac9ce 100644
--- a/lib/libc/locale/multibyte.3
+++ b/lib/libc/locale/multibyte.3
@@ -48,7 +48,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdlib.h>
+.In stdlib.h
.Ft int
.Fn mblen "const char *mbchar" "size_t nbytes"
.Ft size_t
diff --git a/lib/libc/locale/rune.3 b/lib/libc/locale/rune.3
index 04bbdc7..7c83ebc 100644
--- a/lib/libc/locale/rune.3
+++ b/lib/libc/locale/rune.3
@@ -50,8 +50,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <rune.h>
-.Fd #include <errno.h>
+.In rune.h
+.In errno.h
.Ft int
.Fn setrunelocale "char *locale"
.Ft void
@@ -61,7 +61,7 @@
.Ft int
.Fn sputrune "rune_t rune" "char *string" "size_t n" "char **result"
.Pp
-.Fd #include <stdio.h>
+.In stdio.h
.Ft long
.Fn fgetrune "FILE *stream"
.Ft int
diff --git a/lib/libc/locale/setlocale.3 b/lib/libc/locale/setlocale.3
index 8f987e6..77628b8 100644
--- a/lib/libc/locale/setlocale.3
+++ b/lib/libc/locale/setlocale.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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/toascii.3 b/lib/libc/locale/toascii.3
index 168da1e..e9a936c 100644
--- a/lib/libc/locale/toascii.3
+++ b/lib/libc/locale/toascii.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn toascii "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/tolower.3 b/lib/libc/locale/tolower.3
index e879973..2c49cec 100644
--- a/lib/libc/locale/tolower.3
+++ b/lib/libc/locale/tolower.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn tolower "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/locale/toupper.3 b/lib/libc/locale/toupper.3
index f9734e2..664856c 100644
--- a/lib/libc/locale/toupper.3
+++ b/lib/libc/locale/toupper.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <ctype.h>
+.In ctype.h
.Ft int
.Fn toupper "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/net/addr2ascii.3 b/lib/libc/net/addr2ascii.3
index 4003a83..ce5d720 100644
--- a/lib/libc/net/addr2ascii.3
+++ b/lib/libc/net/addr2ascii.3
@@ -39,9 +39,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netinet/in.h>
-.Fd #include <arpa/inet.h>
+.In sys/types.h
+.In netinet/in.h
+.In arpa/inet.h
.Ft "char *"
.Fn addr2ascii "int af" "const void *addrp" "int len" "char *buf"
.Ft int
diff --git a/lib/libc/net/byteorder.3 b/lib/libc/net/byteorder.3
index 03c176b..475ace8 100644
--- a/lib/libc/net/byteorder.3
+++ b/lib/libc/net/byteorder.3
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <arpa/inet.h>
+.In arpa/inet.h
.Ft uint32_t
.Fn htonl "uint32_t hostlong"
.Ft uint16_t
diff --git a/lib/libc/net/ethers.3 b/lib/libc/net/ethers.3
index 6a9ea552..650bda8 100644
--- a/lib/libc/net/ethers.3
+++ b/lib/libc/net/ethers.3
@@ -44,9 +44,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <net/ethernet.h>
+.In sys/types.h
+.In sys/socket.h
+.In net/ethernet.h
.Ft int
.Fn ether_line "const char *l" "struct ether_addr *e" "char *hostname"
.Ft struct ether_addr *
diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index cd73f28..9c56af4 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -47,9 +47,9 @@
.Sh LIBRARY
.Lb libc
.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 *nodename" "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 b845c28..82a849c 100644
--- a/lib/libc/net/gethostbyname.3
+++ b/lib/libc/net/gethostbyname.3
@@ -48,7 +48,7 @@
.Sh LIBRARY
.Lb libc
.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 5572cea..92d3547 100644
--- a/lib/libc/net/getifaddrs.3
+++ b/lib/libc/net/getifaddrs.3
@@ -29,9 +29,9 @@
.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/getipnodebyname.3 b/lib/libc/net/getipnodebyname.3
index f960957..5860fb8 100644
--- a/lib/libc/net/getipnodebyname.3
+++ b/lib/libc/net/getipnodebyname.3
@@ -47,9 +47,9 @@
.Sh LIBRARY
.Lb libc
.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 "struct hostent *"
.Fn getipnodebyname "const char *name" "int af" "int flags" "int *error_num"
.Ft "struct hostent *"
diff --git a/lib/libc/net/getnameinfo.3 b/lib/libc/net/getnameinfo.3
index 8dc026c..b34fa11 100644
--- a/lib/libc/net/getnameinfo.3
+++ b/lib/libc/net/getnameinfo.3
@@ -45,9 +45,9 @@
.Sh LIBRARY
.Lb libc
.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 23e90ae..746867e 100644
--- a/lib/libc/net/getnetent.3
+++ b/lib/libc/net/getnetent.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <netdb.h>
+.In netdb.h
.Ft struct netent *
.Fn getnetent void
.Ft struct netent *
diff --git a/lib/libc/net/getprotoent.3 b/lib/libc/net/getprotoent.3
index d073ac0..8f48481 100644
--- a/lib/libc/net/getprotoent.3
+++ b/lib/libc/net/getprotoent.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <netdb.h>
+.In netdb.h
.Ft struct protoent *
.Fn getprotoent void
.Ft struct protoent *
diff --git a/lib/libc/net/getservent.3 b/lib/libc/net/getservent.3
index 5a0258e..19cdfdf 100644
--- a/lib/libc/net/getservent.3
+++ b/lib/libc/net/getservent.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <netdb.h>
+.In netdb.h
.Ft struct servent *
.Fn getservent
.Ft struct servent *
diff --git a/lib/libc/net/hesiod.3 b/lib/libc/net/hesiod.3
index 4c8ffd6..9b9ad1c 100644
--- a/lib/libc/net/hesiod.3
+++ b/lib/libc/net/hesiod.3
@@ -31,7 +31,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd "#include <hesiod.h>"
+.In hesiod.h
.Ft int
.Fn hesiod_init "void **context"
.Ft char **
diff --git a/lib/libc/net/if_indextoname.3 b/lib/libc/net/if_indextoname.3
index 29ae464..0cc039c 100644
--- a/lib/libc/net/if_indextoname.3
+++ b/lib/libc/net/if_indextoname.3
@@ -44,9 +44,9 @@
.Sh LIBRARY
.Lb libc
.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 76a76b8..2461694 100644
--- a/lib/libc/net/inet.3
+++ b/lib/libc/net/inet.3
@@ -49,10 +49,10 @@
.Sh LIBRARY
.Lb libc
.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 *pin"
.Ft in_addr_t
diff --git a/lib/libc/net/inet6_option_space.3 b/lib/libc/net/inet6_option_space.3
index 726a41c..3e1649a 100644
--- a/lib/libc/net/inet6_option_space.3
+++ b/lib/libc/net/inet6_option_space.3
@@ -48,8 +48,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netinet/in.h>
+.In sys/types.h
+.In netinet/in.h
.Ft "int"
.Fn inet6_option_space "int nbytes"
.Ft "int"
diff --git a/lib/libc/net/inet6_rthdr_space.3 b/lib/libc/net/inet6_rthdr_space.3
index d09bba6..154f514 100644
--- a/lib/libc/net/inet6_rthdr_space.3
+++ b/lib/libc/net/inet6_rthdr_space.3
@@ -50,8 +50,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netinet/in.h>
+.In sys/types.h
+.In netinet/in.h
.Ft size_t
.Fn inet6_rthdr_space "int type" "int segments"
.Ft "struct cmsghdr *"
diff --git a/lib/libc/net/iso_addr.3 b/lib/libc/net/iso_addr.3
index 4bc3ed1..4407dca 100644
--- a/lib/libc/net/iso_addr.3
+++ b/lib/libc/net/iso_addr.3
@@ -42,8 +42,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netiso/iso.h>
+.In sys/types.h
+.In netiso/iso.h
.Ft struct iso_addr *
.Fn iso_addr "char *cp"
.Ft char *
diff --git a/lib/libc/net/linkaddr.3 b/lib/libc/net/linkaddr.3
index 7631c4a..4b1c6e9 100644
--- a/lib/libc/net/linkaddr.3
+++ b/lib/libc/net/linkaddr.3
@@ -45,9 +45,9 @@
.Sh LIBRARY
.Lb libc
.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/ns.3 b/lib/libc/net/ns.3
index e8cc2ec..f750bdd 100644
--- a/lib/libc/net/ns.3
+++ b/lib/libc/net/ns.3
@@ -44,8 +44,8 @@ address conversion routines
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netns/ns.h>
+.In sys/types.h
+.In netns/ns.h
.Ft struct ns_addr
.Fn ns_addr "char *cp"
.Ft char *
diff --git a/lib/libc/net/nsdispatch.3 b/lib/libc/net/nsdispatch.3
index 8d7a686..0337100 100644
--- a/lib/libc/net/nsdispatch.3
+++ b/lib/libc/net/nsdispatch.3
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <nsswitch.h>
+.In nsswitch.h
.Ft int
.Fo nsdispatch
.Fa "void *retval"
diff --git a/lib/libc/net/rcmd.3 b/lib/libc/net/rcmd.3
index 08b6e72..1193065 100644
--- a/lib/libc/net/rcmd.3
+++ b/lib/libc/net/rcmd.3
@@ -47,7 +47,7 @@
.Sh LIBRARY
.Lb libc
.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/resolver.3 b/lib/libc/net/resolver.3
index 8f13af7..7910d76 100644
--- a/lib/libc/net/resolver.3
+++ b/lib/libc/net/resolver.3
@@ -52,10 +52,10 @@
.Sh LIBRARY
.Lb libc
.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 c29b45d..733face 100644
--- a/lib/libc/nls/catclose.3
+++ b/lib/libc/nls/catclose.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc
.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 f566abb..592f57c 100644
--- a/lib/libc/nls/catgets.3
+++ b/lib/libc/nls/catgets.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc
.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 4c0dccc..9fd8b82 100644
--- a/lib/libc/nls/catopen.3
+++ b/lib/libc/nls/catopen.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc
.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/posix1e/acl.3 b/lib/libc/posix1e/acl.3
index 6f74b8b..6ce6431 100644
--- a/lib/libc/posix1e/acl.3
+++ b/lib/libc/posix1e/acl.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Sh DESCRIPTION
.Fx
permits file systems to export Access Control Lists via the VFS, and
diff --git a/lib/libc/posix1e/acl_add_perm.3 b/lib/libc/posix1e/acl_add_perm.3
index 9be4f69..5649d12 100644
--- a/lib/libc/posix1e/acl_add_perm.3
+++ b/lib/libc/posix1e/acl_add_perm.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_add_perm "acl_permset_t permset_d" "acl_perm_t perm"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_calc_mask.3 b/lib/libc/posix1e/acl_calc_mask.3
index 719f7b7..db3ecfb 100644
--- a/lib/libc/posix1e/acl_calc_mask.3
+++ b/lib/libc/posix1e/acl_calc_mask.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_calc_mask "acl_t *acl_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_clear_perms.3 b/lib/libc/posix1e/acl_clear_perms.3
index 7768a41..fb5976f 100644
--- a/lib/libc/posix1e/acl_clear_perms.3
+++ b/lib/libc/posix1e/acl_clear_perms.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_clear_perms "acl_permset_t permset_d"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_copy_entry.3 b/lib/libc/posix1e/acl_copy_entry.3
index 1c13bc2..c6cdf8d 100644
--- a/lib/libc/posix1e/acl_copy_entry.3
+++ b/lib/libc/posix1e/acl_copy_entry.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_copy_entry "acl_entry_t dest_d" "acl_entry_t src_d"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_create_entry.3 b/lib/libc/posix1e/acl_create_entry.3
index c5820bd..47db02f 100644
--- a/lib/libc/posix1e/acl_create_entry.3
+++ b/lib/libc/posix1e/acl_create_entry.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_create_entry "acl_t *acl_p" "acl_entry_t *entry_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_delete.3 b/lib/libc/posix1e/acl_delete.3
index 8e9cea5..220638c 100644
--- a/lib/libc/posix1e/acl_delete.3
+++ b/lib/libc/posix1e/acl_delete.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_delete_def_file "const char *path_p"
.Ft int
diff --git a/lib/libc/posix1e/acl_delete_entry.3 b/lib/libc/posix1e/acl_delete_entry.3
index 05c6e1f..45cddb0 100644
--- a/lib/libc/posix1e/acl_delete_entry.3
+++ b/lib/libc/posix1e/acl_delete_entry.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_delete_entry "acl_t acl" "acl_entry_t entry_d"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_delete_perm.3 b/lib/libc/posix1e/acl_delete_perm.3
index fbc9551..3f8d27b 100644
--- a/lib/libc/posix1e/acl_delete_perm.3
+++ b/lib/libc/posix1e/acl_delete_perm.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_delete_perm "acl_permset_t permset_d" "acl_perm_t perm"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_dup.3 b/lib/libc/posix1e/acl_dup.3
index b08b2ba..e43ca2b 100644
--- a/lib/libc/posix1e/acl_dup.3
+++ b/lib/libc/posix1e/acl_dup.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft acl_t
.Fn acl_dup "acl_t acl"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_free.3 b/lib/libc/posix1e/acl_free.3
index db185af..cd457c4 100644
--- a/lib/libc/posix1e/acl_free.3
+++ b/lib/libc/posix1e/acl_free.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_free "void *obj_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_from_text.3 b/lib/libc/posix1e/acl_from_text.3
index 13a1f42..25e8597 100644
--- a/lib/libc/posix1e/acl_from_text.3
+++ b/lib/libc/posix1e/acl_from_text.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft acl_t
.Fn acl_from_text "const char *buf_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_get.3 b/lib/libc/posix1e/acl_get.3
index 5121d1a..c1dd5b5 100644
--- a/lib/libc/posix1e/acl_get.3
+++ b/lib/libc/posix1e/acl_get.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft acl_t
.Fn acl_get_file "const char *path_p" "acl_type_t type"
.Ft acl_t
diff --git a/lib/libc/posix1e/acl_get_entry.3 b/lib/libc/posix1e/acl_get_entry.3
index 1798497..96cd55a 100644
--- a/lib/libc/posix1e/acl_get_entry.3
+++ b/lib/libc/posix1e/acl_get_entry.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft void *
.Fn acl_get_entry "acl_t acl" "int entry_id" "acl_entry_t *entry_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_get_perm_np.3 b/lib/libc/posix1e/acl_get_perm_np.3
index 9145c32..44477f2 100644
--- a/lib/libc/posix1e/acl_get_perm_np.3
+++ b/lib/libc/posix1e/acl_get_perm_np.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_get_perm_np "acl_permset_t permset_d" "acl_perm_t perm"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_get_permset.3 b/lib/libc/posix1e/acl_get_permset.3
index b524588..293b600 100644
--- a/lib/libc/posix1e/acl_get_permset.3
+++ b/lib/libc/posix1e/acl_get_permset.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_get_permset "acl_entry_t entry_d" "acl_permset_t *permset_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_get_qualifier.3 b/lib/libc/posix1e/acl_get_qualifier.3
index 591ce7f..be5df9b 100644
--- a/lib/libc/posix1e/acl_get_qualifier.3
+++ b/lib/libc/posix1e/acl_get_qualifier.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft void *
.Fn acl_get_qualifier "acl_entry_t entry_d"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_get_tag_type.3 b/lib/libc/posix1e/acl_get_tag_type.3
index cfb526f..c14d47c 100644
--- a/lib/libc/posix1e/acl_get_tag_type.3
+++ b/lib/libc/posix1e/acl_get_tag_type.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_get_tag_type "acl_entry_t entry_d" "acl_tag_t *tag_type_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_init.3 b/lib/libc/posix1e/acl_init.3
index cebf006..384d527 100644
--- a/lib/libc/posix1e/acl_init.3
+++ b/lib/libc/posix1e/acl_init.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft acl_t
.Fn acl_init "int count"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_set.3 b/lib/libc/posix1e/acl_set.3
index 08f2dbd..1a3fa507 100644
--- a/lib/libc/posix1e/acl_set.3
+++ b/lib/libc/posix1e/acl_set.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_set_file "const char *path_p" "acl_type_t type" "acl_t acl"
.Ft int
diff --git a/lib/libc/posix1e/acl_set_permset.3 b/lib/libc/posix1e/acl_set_permset.3
index ce3bd91..a4d8bfe 100644
--- a/lib/libc/posix1e/acl_set_permset.3
+++ b/lib/libc/posix1e/acl_set_permset.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_set_permset "acl_entry_t entry_d" "acl_permset_t permset_d"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_set_qualifier.3 b/lib/libc/posix1e/acl_set_qualifier.3
index 1495990..abc77d9 100644
--- a/lib/libc/posix1e/acl_set_qualifier.3
+++ b/lib/libc/posix1e/acl_set_qualifier.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_set_qualifier "acl_entry_t entry_d" "const void *tag_qualifier_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_set_tag_type.3 b/lib/libc/posix1e/acl_set_tag_type.3
index 05e626e..57ce397 100644
--- a/lib/libc/posix1e/acl_set_tag_type.3
+++ b/lib/libc/posix1e/acl_set_tag_type.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_set_tag_type "acl_entry_t entry_d" "acl_tag_t tag_type"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_to_text.3 b/lib/libc/posix1e/acl_to_text.3
index eb990a2..93a05ee 100644
--- a/lib/libc/posix1e/acl_to_text.3
+++ b/lib/libc/posix1e/acl_to_text.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft char *
.Fn acl_to_text "acl_t acl" "ssize_t *len_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/acl_valid.3 b/lib/libc/posix1e/acl_valid.3
index 9dbdcac..6e1b3d9 100644
--- a/lib/libc/posix1e/acl_valid.3
+++ b/lib/libc/posix1e/acl_valid.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
+.In sys/types.h
+.In sys/acl.h
.Ft int
.Fn acl_valid "acl_t acl"
.Ft int
diff --git a/lib/libc/posix1e/cap.3 b/lib/libc/posix1e/cap.3
index 01ee569..088d3f7 100644
--- a/lib/libc/posix1e/cap.3
+++ b/lib/libc/posix1e/cap.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/capability.h>
+.In sys/types.h
+.In sys/capability.h
.Sh DESCRIPTION
The POSIX.1e Capability interface allows processes to manipulate their
capability set, subject to capability manipulation restrictions imposed
diff --git a/lib/libc/posix1e/cap_clear.3 b/lib/libc/posix1e/cap_clear.3
index fbe8952..37ab7b5 100644
--- a/lib/libc/posix1e/cap_clear.3
+++ b/lib/libc/posix1e/cap_clear.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/capability.h>
+.In sys/types.h
+.In sys/capability.h
.Ft int
.Fn cap_clear "cap_t cap_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/cap_dup.3 b/lib/libc/posix1e/cap_dup.3
index 9ea0396..857165f 100644
--- a/lib/libc/posix1e/cap_dup.3
+++ b/lib/libc/posix1e/cap_dup.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/capability.h>
+.In sys/types.h
+.In sys/capability.h
.Ft cap_t
.Fn cap_dup "cap_t cap_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/cap_free.3 b/lib/libc/posix1e/cap_free.3
index aed8587..e121ce9 100644
--- a/lib/libc/posix1e/cap_free.3
+++ b/lib/libc/posix1e/cap_free.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/capability.h>
+.In sys/types.h
+.In sys/capability.h
.Ft int
.Fn cap_free "void *obj_d"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/cap_from_text.3 b/lib/libc/posix1e/cap_from_text.3
index 1af9292..caa14bc 100644
--- a/lib/libc/posix1e/cap_from_text.3
+++ b/lib/libc/posix1e/cap_from_text.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/capability.h>
+.In sys/types.h
+.In sys/capability.h
.Ft cap_t
.Fn cap_from_text "const char *buf_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/cap_get_flag.3 b/lib/libc/posix1e/cap_get_flag.3
index 2493fda..59a5fc1 100644
--- a/lib/libc/posix1e/cap_get_flag.3
+++ b/lib/libc/posix1e/cap_get_flag.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/capability.h>
+.In sys/types.h
+.In sys/capability.h
.Ft int
.Fn cap_get_flag "cap_t cap_p" "cap_value_t cap" "cap_flag_t flag" "cap_flag_value_t *value_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/cap_get_proc.3 b/lib/libc/posix1e/cap_get_proc.3
index 2ebf5c8..400650c 100644
--- a/lib/libc/posix1e/cap_get_proc.3
+++ b/lib/libc/posix1e/cap_get_proc.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/capability.h>
+.In sys/types.h
+.In sys/capability.h
.Ft cap_t
.Fn cap_get_proc "void"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/cap_init.3 b/lib/libc/posix1e/cap_init.3
index 753ced9..1bf442f 100644
--- a/lib/libc/posix1e/cap_init.3
+++ b/lib/libc/posix1e/cap_init.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/capability.h>
+.In sys/types.h
+.In sys/capability.h
.Ft cap_t
.Fn cap_init "void"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/cap_set_flag.3 b/lib/libc/posix1e/cap_set_flag.3
index 4f246d5..073353d 100644
--- a/lib/libc/posix1e/cap_set_flag.3
+++ b/lib/libc/posix1e/cap_set_flag.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/capability.h>
+.In sys/types.h
+.In sys/capability.h
.Ft int
.Fn cap_set_flag "cap_t cap_p" "cap_flag_t flag" "int ncap" "cap_value_t caps[]" "cap_flag_value_t value"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/cap_set_proc.3 b/lib/libc/posix1e/cap_set_proc.3
index 542340f..128bec6 100644
--- a/lib/libc/posix1e/cap_set_proc.3
+++ b/lib/libc/posix1e/cap_set_proc.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/capability.h>
+.In sys/types.h
+.In sys/capability.h
.Ft int
.Fn cap_set_proc "cap_t cap_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/cap_to_text.3 b/lib/libc/posix1e/cap_to_text.3
index ea6b522..e45cdae 100644
--- a/lib/libc/posix1e/cap_to_text.3
+++ b/lib/libc/posix1e/cap_to_text.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/capability.h>
+.In sys/types.h
+.In sys/capability.h
.Ft char *
.Fn cap_to_text "cap_t cap_p" "ssize_t *len_p"
.Sh DESCRIPTION
diff --git a/lib/libc/posix1e/extattr.3 b/lib/libc/posix1e/extattr.3
index fd9e18f..998ddaa 100644
--- a/lib/libc/posix1e/extattr.3
+++ b/lib/libc/posix1e/extattr.3
@@ -36,8 +36,8 @@ vice versa
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/extattr.h>
-.Fd #include <libutil.h>
+.In sys/extattr.h
+.In libutil.h
.Ft int
.Fn extattr_namespace_to_string "int attrnamespace" "char **string"
.Ft int
diff --git a/lib/libc/posix1e/posix1e.3 b/lib/libc/posix1e/posix1e.3
index cdfa9a0..77e8b7f 100644
--- a/lib/libc/posix1e/posix1e.3
+++ b/lib/libc/posix1e/posix1e.3
@@ -34,11 +34,11 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/acl.h>
-.\" .Fd #include <sys/audit.h>
-.Fd #include <sys/capability.h>
-.\" .Fd #include <sys/mac.h>
+.In sys/types.h
+.In sys/acl.h
+.\" .In sys/audit.h
+.In sys/capability.h
+.\" .In sys/mac.h
.Sh DESCRIPTION
The IEEE POSIX.1e specification never left draft form, but the interfaces
it describes are now widely used despite inherent limitations. Currently,
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index c7681c7..857f552 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -48,8 +48,8 @@
.Sh LIBRARY
.Lb libc
.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"
.Ft int
diff --git a/lib/libc/rpc/bindresvport.3 b/lib/libc/rpc/bindresvport.3
index e3996ea..740dd15 100644
--- a/lib/libc/rpc/bindresvport.3
+++ b/lib/libc/rpc/bindresvport.3
@@ -12,8 +12,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <rpc/rpc.h>
+.In sys/types.h
+.In rpc/rpc.h
.Ft int
.Fn bindresvport "int sd" "struct sockaddr_in *sin"
.Ft int
diff --git a/lib/libc/rpc/des_crypt.3 b/lib/libc/rpc/des_crypt.3
index f16e452..0655d56 100644
--- a/lib/libc/rpc/des_crypt.3
+++ b/lib/libc/rpc/des_crypt.3
@@ -10,7 +10,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd "#include <rpc/des_crypt.h>"
+.In rpc/des_crypt.h
.Ft int
.Fn ecb_crypt "char *key" "char *data" "unsigned datalen" "unsigned mode"
.Ft int
diff --git a/lib/libc/rpc/getnetconfig.3 b/lib/libc/rpc/getnetconfig.3
index fb1151e..74a4a21 100644
--- a/lib/libc/rpc/getnetconfig.3
+++ b/lib/libc/rpc/getnetconfig.3
@@ -17,7 +17,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <netconfig.h>
+.In netconfig.h
.Ft "struct netconfig *"
.Fn getnetconfig "void *handlep"
.Ft "void *"
diff --git a/lib/libc/rpc/getnetpath.3 b/lib/libc/rpc/getnetpath.3
index c4d6f008..f2d7358 100644
--- a/lib/libc/rpc/getnetpath.3
+++ b/lib/libc/rpc/getnetpath.3
@@ -17,7 +17,7 @@ component
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <netconfig.h>
+.In netconfig.h
.Ft "struct netconfig *"
.Fn getnetpath "void *handlep"
.Ft "void *"
diff --git a/lib/libc/rpc/getrpcent.3 b/lib/libc/rpc/getrpcent.3
index 3f03c18..190bf8a 100644
--- a/lib/libc/rpc/getrpcent.3
+++ b/lib/libc/rpc/getrpcent.3
@@ -15,7 +15,7 @@
.Sh LIBRARY
.Lb libc
.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/publickey.3 b/lib/libc/rpc/publickey.3
index 5f9489b..6a46c9a 100644
--- a/lib/libc/rpc/publickey.3
+++ b/lib/libc/rpc/publickey.3
@@ -10,8 +10,8 @@
.Sh LIBRARY
.Lb librpcsvc
.Sh SYNOPSIS
-.Fd "#include <rpc/rpc.h>"
-.Fd "#include <rpc/key_prot.h>"
+.In rpc/rpc.h
+.In rpc/key_prot.h
.Ft int
.Fo getpublickey
.Fa "char netname[MAXNETNAMELEN+1]"
diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
index a52b24f..8c154b9 100644
--- a/lib/libc/rpc/rpc.3
+++ b/lib/libc/rpc/rpc.3
@@ -11,8 +11,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <rpc/rpc.h>
-.Fd #include <netconfig.h>
+.In rpc/rpc.h
+.In netconfig.h
.Sh DESCRIPTION
These
routines allow C language programs to make procedure
diff --git a/lib/libc/rpc/rpc_clnt_auth.3 b/lib/libc/rpc/rpc_clnt_auth.3
index 43af256..3a5b5b3 100644
--- a/lib/libc/rpc/rpc_clnt_auth.3
+++ b/lib/libc/rpc/rpc_clnt_auth.3
@@ -16,7 +16,7 @@
.Sh LIBRARY
.Lb libc
.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/rpc_clnt_calls.3 b/lib/libc/rpc/rpc_clnt_calls.3
index 134e083..34d7698 100644
--- a/lib/libc/rpc/rpc_clnt_calls.3
+++ b/lib/libc/rpc/rpc_clnt_calls.3
@@ -22,7 +22,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <rpc/rpc.h>
+.In rpc/rpc.h
.Ft "enum clnt_stat"
.Fn clnt_call "CLIENT *clnt" "const rpcproc_t procnum" "const xdrproc_t inproc" "const caddr_t in" "const xdrproc_t outproc" "caddr_t out" "const struct timeval tout"
.Ft bool_t
diff --git a/lib/libc/rpc/rpc_clnt_create.3 b/lib/libc/rpc/rpc_clnt_create.3
index b0f5ef0..7266c02 100644
--- a/lib/libc/rpc/rpc_clnt_create.3
+++ b/lib/libc/rpc/rpc_clnt_create.3
@@ -27,7 +27,7 @@ handles
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <rpc/rpc.h>
+.In rpc/rpc.h
.Ft bool_t
.Fn clnt_control "CLIENT *clnt" "const u_int req" "char *info"
.Ft "CLIENT *"
diff --git a/lib/libc/rpc/rpc_secure.3 b/lib/libc/rpc/rpc_secure.3
index 65ad98f..03d5e4a 100644
--- a/lib/libc/rpc/rpc_secure.3
+++ b/lib/libc/rpc/rpc_secure.3
@@ -8,7 +8,7 @@
.Nm rpc_secure
.Nd library routines for secure remote procedure calls
.Sh SYNOPSIS
-.Fd #include <rpc/rpc.h>
+.In rpc/rpc.h
.Ft AUTH *
.Fo authdes_create
.Fa "char *name"
diff --git a/lib/libc/rpc/rpc_soc.3 b/lib/libc/rpc/rpc_soc.3
index 1065a48..ba531ce 100644
--- a/lib/libc/rpc/rpc_soc.3
+++ b/lib/libc/rpc/rpc_soc.3
@@ -72,7 +72,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd "#include <rpc/rpc.h>"
+.In rpc/rpc.h
.Pp
See
.Sx DESCRIPTION
diff --git a/lib/libc/rpc/rpc_svc_calls.3 b/lib/libc/rpc/rpc_svc_calls.3
index af39536..8ee7225 100644
--- a/lib/libc/rpc/rpc_svc_calls.3
+++ b/lib/libc/rpc/rpc_svc_calls.3
@@ -24,7 +24,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <rpc/rpc.h>
+.In rpc/rpc.h
.Ft int
.Fn svc_dg_enablecache "SVCXPRT *xprt" "const unsigned cache_size"
.Ft void
diff --git a/lib/libc/rpc/rpc_svc_create.3 b/lib/libc/rpc/rpc_svc_create.3
index f2d7b2d..f557f7a 100644
--- a/lib/libc/rpc/rpc_svc_create.3
+++ b/lib/libc/rpc/rpc_svc_create.3
@@ -21,7 +21,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <rpc/rpc.h>
+.In rpc/rpc.h
.Ft bool_t
.Fn svc_control "SVCXPRT *svc" "const u_int req" "void *info"
.Ft int
diff --git a/lib/libc/rpc/rpc_svc_err.3 b/lib/libc/rpc/rpc_svc_err.3
index 3a6e0c9..fd86218 100644
--- a/lib/libc/rpc/rpc_svc_err.3
+++ b/lib/libc/rpc/rpc_svc_err.3
@@ -20,7 +20,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <rpc/rpc.h>
+.In rpc/rpc.h
.Ft void
.Fn svcerr_auth "const SVCXPRT1 *xprt" "const enum auth_stat why"
.Ft void
diff --git a/lib/libc/rpc/rpc_svc_reg.3 b/lib/libc/rpc/rpc_svc_reg.3
index c6ff3b8..a65d3ad 100644
--- a/lib/libc/rpc/rpc_svc_reg.3
+++ b/lib/libc/rpc/rpc_svc_reg.3
@@ -19,7 +19,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <rpc/rpc.h>
+.In rpc/rpc.h
.Ft bool_t
.Fn rpc_reg "const rpcprog_t prognum" "const rpcvers_t versnum" "const rpcproc_t procnum" "const char *(*procname)()" "const xdrproc_t inproc" "const xdrproc_t outproc" "const char *nettype"
.Ft int
diff --git a/lib/libc/rpc/rpc_xdr.3 b/lib/libc/rpc/rpc_xdr.3
index e021a33..6eb7c72 100644
--- a/lib/libc/rpc/rpc_xdr.3
+++ b/lib/libc/rpc/rpc_xdr.3
@@ -18,7 +18,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <rpc/rpc.h>
+.In rpc/rpc.h
.Ft bool_t
.Fn xdr_accepted_reply "XDR *xdrs" "const struct accepted_reply *ar"
.Ft bool_t
diff --git a/lib/libc/rpc/rpcbind.3 b/lib/libc/rpc/rpcbind.3
index 3092696..df68901 100644
--- a/lib/libc/rpc/rpcbind.3
+++ b/lib/libc/rpc/rpcbind.3
@@ -17,7 +17,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <rpc/rpc.h>
+.In rpc/rpc.h
.Ft "struct rpcblist *"
.Fn rpcb_getmaps "const struct netconfig *netconf" "const char *host"
.Ft bool_t
diff --git a/lib/libc/rpc/rtime.3 b/lib/libc/rpc/rtime.3
index 3897fc8..d402c26 100644
--- a/lib/libc/rpc/rtime.3
+++ b/lib/libc/rpc/rtime.3
@@ -10,9 +10,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd "#include <sys/types.h>"
-.Fd "#include <sys/time.h>"
-.Fd "#include <netinet/in.h>"
+.In sys/types.h
+.In sys/time.h
+.In netinet/in.h
.Ft int
.Fo rtime
.Fa "struct sockaddr_in *addrp"
diff --git a/lib/libc/stdio/fclose.3 b/lib/libc/stdio/fclose.3
index 04cae30..6d71811 100644
--- a/lib/libc/stdio/fclose.3
+++ b/lib/libc/stdio/fclose.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 9ccad39..e11ec7c 100644
--- a/lib/libc/stdio/ferror.3
+++ b/lib/libc/stdio/ferror.3
@@ -48,7 +48,7 @@
.Sh LIBRARY
.Lb libc
.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 73678a8..35ccd45 100644
--- a/lib/libc/stdio/fflush.3
+++ b/lib/libc/stdio/fflush.3
@@ -46,7 +46,7 @@
.Sh LIBRARY
.Lb libc
.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 6cb42f1..61b5cf2 100644
--- a/lib/libc/stdio/fgetln.3
+++ b/lib/libc/stdio/fgetln.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 427b88e..c54865d 100644
--- a/lib/libc/stdio/fgets.3
+++ b/lib/libc/stdio/fgets.3
@@ -46,7 +46,7 @@
.Sh LIBRARY
.Lb libc
.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/fopen.3 b/lib/libc/stdio/fopen.3
index ffa699d..26369d6 100644
--- a/lib/libc/stdio/fopen.3
+++ b/lib/libc/stdio/fopen.3
@@ -47,7 +47,7 @@
.Sh LIBRARY
.Lb libc
.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 6d2b1f9..ce44543 100644
--- a/lib/libc/stdio/fputs.3
+++ b/lib/libc/stdio/fputs.3
@@ -46,7 +46,7 @@
.Sh LIBRARY
.Lb libc
.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 2a2d10b..6d4a79c 100644
--- a/lib/libc/stdio/fread.3
+++ b/lib/libc/stdio/fread.3
@@ -46,7 +46,7 @@
.Sh LIBRARY
.Lb libc
.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 fe7f313..29b66b3 100644
--- a/lib/libc/stdio/fseek.3
+++ b/lib/libc/stdio/fseek.3
@@ -51,7 +51,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
.Ft int
.Fn fseek "FILE *stream" "long offset" "int whence"
.Ft long
@@ -62,7 +62,7 @@
.Fn fgetpos "FILE *stream" "fpos_t *pos"
.Ft int
.Fn fsetpos "FILE *stream" "const fpos_t *pos"
-.Fd #include <sys/types.h>
+.In sys/types.h
.Ft int
.Fn fseeko "FILE *stream" "off_t offset" "int whence"
.Ft off_t
diff --git a/lib/libc/stdio/funopen.3 b/lib/libc/stdio/funopen.3
index 95ae423..bf2c15f 100644
--- a/lib/libc/stdio/funopen.3
+++ b/lib/libc/stdio/funopen.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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)" "fpos_t (*seekfn)(void *, fpos_t, int)" "int (*closefn)(void *)"
.Ft FILE *
diff --git a/lib/libc/stdio/getc.3 b/lib/libc/stdio/getc.3
index 0a6a649..7b81b6b 100644
--- a/lib/libc/stdio/getc.3
+++ b/lib/libc/stdio/getc.3
@@ -48,7 +48,7 @@
.Sh LIBRARY
.Lb libc
.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 27fc969..06fe894 100644
--- a/lib/libc/stdio/mktemp.3
+++ b/lib/libc/stdio/mktemp.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft char *
.Fn mktemp "char *template"
.Ft int
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 220e3e6..784bb77 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -46,7 +46,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
.Ft int
.Fn printf "const char *format" ...
.Ft int
@@ -57,7 +57,7 @@
.Fn snprintf "char *str" "size_t size" "const char *format" ...
.Ft int
.Fn asprintf "char **ret" "const char *format" ...
-.Fd #include <stdarg.h>
+.In stdarg.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 7f180b4..c8165ed 100644
--- a/lib/libc/stdio/putc.3
+++ b/lib/libc/stdio/putc.3
@@ -48,7 +48,7 @@
.Sh LIBRARY
.Lb libc
.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 c463a55..cf088c7 100644
--- a/lib/libc/stdio/remove.3
+++ b/lib/libc/stdio/remove.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
.Ft int
.Fn remove "const char *path"
.Sh DESCRIPTION
diff --git a/lib/libc/stdio/scanf.3 b/lib/libc/stdio/scanf.3
index fdc7fd2..aceea37 100644
--- a/lib/libc/stdio/scanf.3
+++ b/lib/libc/stdio/scanf.3
@@ -50,14 +50,14 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
.Ft int
.Fn scanf "const char *format" ...
.Ft int
.Fn fscanf "FILE *stream" "const char *format" ...
.Ft int
.Fn sscanf "const char *str" "const char *format" ...
-.Fd #include <stdarg.h>
+.In stdarg.h
.Ft int
.Fn vscanf "const char *format" "va_list ap"
.Ft int
diff --git a/lib/libc/stdio/setbuf.3 b/lib/libc/stdio/setbuf.3
index d2b2056..d25f1b8 100644
--- a/lib/libc/stdio/setbuf.3
+++ b/lib/libc/stdio/setbuf.3
@@ -48,7 +48,7 @@
.Sh LIBRARY
.Lb libc
.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 f91e2f7..0c2c20b 100644
--- a/lib/libc/stdio/stdio.3
+++ b/lib/libc/stdio/stdio.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
.Vt FILE *stdin ;
.Vt FILE *stdout ;
.Vt FILE *stderr ;
diff --git a/lib/libc/stdio/tmpnam.3 b/lib/libc/stdio/tmpnam.3
index 9a9d037..fa61c3d 100644
--- a/lib/libc/stdio/tmpnam.3
+++ b/lib/libc/stdio/tmpnam.3
@@ -47,7 +47,7 @@
.Sh LIBRARY
.Lb libc
.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 054213c..c1506d9 100644
--- a/lib/libc/stdio/ungetc.3
+++ b/lib/libc/stdio/ungetc.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
.Ft int
.Fn ungetc "int c" "FILE *stream"
.Sh DESCRIPTION
diff --git a/lib/libc/stdtime/ctime.3 b/lib/libc/stdtime/ctime.3
index b3d53ef..d970e4f 100644
--- a/lib/libc/stdtime/ctime.3
+++ b/lib/libc/stdtime/ctime.3
@@ -53,7 +53,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <time.h>
+.In time.h
.Vt extern char *tzname[2] ;
.Ft char *
.Fn ctime "const time_t *clock"
diff --git a/lib/libc/stdtime/strftime.3 b/lib/libc/stdtime/strftime.3
index b4cb993..e6fed17 100644
--- a/lib/libc/stdtime/strftime.3
+++ b/lib/libc/stdtime/strftime.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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/stdtime/strptime.3 b/lib/libc/stdtime/strptime.3
index 78ffd77..e04678d 100644
--- a/lib/libc/stdtime/strptime.3
+++ b/lib/libc/stdtime/strptime.3
@@ -34,7 +34,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <time.h>
+.In time.h
.Ft char *
.Fn strptime "const char *buf" "const char *format" "struct tm *timeptr"
.Sh DESCRIPTION
diff --git a/lib/libc/stdtime/time2posix.3 b/lib/libc/stdtime/time2posix.3
index c64879b..c11a402 100644
--- a/lib/libc/stdtime/time2posix.3
+++ b/lib/libc/stdtime/time2posix.3
@@ -10,7 +10,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <time.h>
+.In time.h
.Ft time_t
.Fn time2posix "const time_t *t"
.Ft time_t
diff --git a/lib/libc/string/bcmp.3 b/lib/libc/string/bcmp.3
index 8d06b8b..c33dd21 100644
--- a/lib/libc/string/bcmp.3
+++ b/lib/libc/string/bcmp.3
@@ -43,7 +43,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
.Ft int
.Fn bcmp "const void *b1" "const void *b2" "size_t len"
.Sh DESCRIPTION
diff --git a/lib/libc/string/bcopy.3 b/lib/libc/string/bcopy.3
index 095ae05..5fecc5b 100644
--- a/lib/libc/string/bcopy.3
+++ b/lib/libc/string/bcopy.3
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libc
.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/bstring.3 b/lib/libc/string/bstring.3
index 28ec676..4052655 100644
--- a/lib/libc/string/bstring.3
+++ b/lib/libc/string/bstring.3
@@ -51,7 +51,7 @@
.Sh LIBRARY
.Lb libc
.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 73d3428..7803835 100644
--- a/lib/libc/string/bzero.3
+++ b/lib/libc/string/bzero.3
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libc
.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 f8d8d6b..71e13b2 100644
--- a/lib/libc/string/ffs.3
+++ b/lib/libc/string/ffs.3
@@ -43,7 +43,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
.Ft int
.Fn ffs "int value"
.Sh DESCRIPTION
diff --git a/lib/libc/string/index.3 b/lib/libc/string/index.3
index d023658..902b19c 100644
--- a/lib/libc/string/index.3
+++ b/lib/libc/string/index.3
@@ -43,7 +43,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
.Ft char *
.Fn index "const char *s" "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/string/memccpy.3 b/lib/libc/string/memccpy.3
index d74fc1a..84f385d 100644
--- a/lib/libc/string/memccpy.3
+++ b/lib/libc/string/memccpy.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 fc56ee6..8721553 100644
--- a/lib/libc/string/memchr.3
+++ b/lib/libc/string/memchr.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
.Ft void *
.Fn memchr "const void *b" "int c" "size_t len"
.Sh DESCRIPTION
diff --git a/lib/libc/string/memcmp.3 b/lib/libc/string/memcmp.3
index 1bf3c8f..d38154a 100644
--- a/lib/libc/string/memcmp.3
+++ b/lib/libc/string/memcmp.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 267b496..bc7d786 100644
--- a/lib/libc/string/memcpy.3
+++ b/lib/libc/string/memcpy.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 8d14efc..39543c3 100644
--- a/lib/libc/string/memmove.3
+++ b/lib/libc/string/memmove.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 baeca31..71ab4d5 100644
--- a/lib/libc/string/memset.3
+++ b/lib/libc/string/memset.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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/rindex.3 b/lib/libc/string/rindex.3
index e6c019f..b5ffd1c 100644
--- a/lib/libc/string/rindex.3
+++ b/lib/libc/string/rindex.3
@@ -43,7 +43,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
.Ft char *
.Fn rindex "const char *s" "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/string/strcasecmp.3 b/lib/libc/string/strcasecmp.3
index 8941e18..aac8ab7 100644
--- a/lib/libc/string/strcasecmp.3
+++ b/lib/libc/string/strcasecmp.3
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libc
.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 fed5979..a24a60c 100644
--- a/lib/libc/string/strcat.3
+++ b/lib/libc/string/strcat.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 9d8d6ee..90c78d4 100644
--- a/lib/libc/string/strchr.3
+++ b/lib/libc/string/strchr.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
.Ft char *
.Fn strchr "const char *s" "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/string/strcmp.3 b/lib/libc/string/strcmp.3
index 60d99c4..33db3c6 100644
--- a/lib/libc/string/strcmp.3
+++ b/lib/libc/string/strcmp.3
@@ -46,7 +46,7 @@
.Sh LIBRARY
.Lb libc
.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 40cb2f5..2e41cd8 100644
--- a/lib/libc/string/strcoll.3
+++ b/lib/libc/string/strcoll.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 61d04d3..0666e7d 100644
--- a/lib/libc/string/strcpy.3
+++ b/lib/libc/string/strcpy.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 c3eff53..2dfda10 100644
--- a/lib/libc/string/strcspn.3
+++ b/lib/libc/string/strcspn.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 c582a70..ec91f35 100644
--- a/lib/libc/string/strdup.3
+++ b/lib/libc/string/strdup.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
.Ft char *
.Fn strdup "const char *str"
.Sh DESCRIPTION
diff --git a/lib/libc/string/strerror.3 b/lib/libc/string/strerror.3
index e714ff2..447e208 100644
--- a/lib/libc/string/strerror.3
+++ b/lib/libc/string/strerror.3
@@ -48,12 +48,12 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
.Ft void
.Fn perror "const char *string"
.Vt extern const char * const sys_errlist[] ;
.Vt extern const int sys_nerr ;
-.Fd #include <string.h>
+.In string.h
.Ft char *
.Fn strerror "int errnum"
.Sh DESCRIPTION
diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3
index e822f7f..fb0d7db 100644
--- a/lib/libc/string/string.3
+++ b/lib/libc/string/string.3
@@ -62,7 +62,7 @@
.Sh LIBRARY
.Lb libc
.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 14cf18d..55a6a41 100644
--- a/lib/libc/string/strlcpy.3
+++ b/lib/libc/string/strlcpy.3
@@ -37,7 +37,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
.Ft size_t
.Fn strlcpy "char *dst" "const char *src" "size_t size"
.Ft size_t
diff --git a/lib/libc/string/strlen.3 b/lib/libc/string/strlen.3
index 07b8f61..69b8945 100644
--- a/lib/libc/string/strlen.3
+++ b/lib/libc/string/strlen.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
.Ft size_t
.Fn strlen "const char *s"
.Sh DESCRIPTION
diff --git a/lib/libc/string/strmode.3 b/lib/libc/string/strmode.3
index 4fffc92..8615f0f 100644
--- a/lib/libc/string/strmode.3
+++ b/lib/libc/string/strmode.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.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 b7fa710..92a3388 100644
--- a/lib/libc/string/strpbrk.3
+++ b/lib/libc/string/strpbrk.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 4d5ec03..a930313 100644
--- a/lib/libc/string/strrchr.3
+++ b/lib/libc/string/strrchr.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
.Ft char *
.Fn strrchr "const char *s" "int c"
.Sh DESCRIPTION
diff --git a/lib/libc/string/strsep.3 b/lib/libc/string/strsep.3
index e0fe124..ba42c48 100644
--- a/lib/libc/string/strsep.3
+++ b/lib/libc/string/strsep.3
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libc
.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/strspn.3 b/lib/libc/string/strspn.3
index 07e4158..17ab817 100644
--- a/lib/libc/string/strspn.3
+++ b/lib/libc/string/strspn.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 c29ddf1..0cea427 100644
--- a/lib/libc/string/strstr.3
+++ b/lib/libc/string/strstr.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
.Ft char *
.Fn strstr "const char *big" "const char *little"
.Sh DESCRIPTION
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
index 814cee5..b9a8a1d 100644
--- a/lib/libc/string/strtok.3
+++ b/lib/libc/string/strtok.3
@@ -59,7 +59,7 @@
.Sh LIBRARY
.Lb libc
.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 617cf7c..e3efbd8 100644
--- a/lib/libc/string/strxfrm.3
+++ b/lib/libc/string/strxfrm.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.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 02841f7..14b5148 100644
--- a/lib/libc/string/swab.3
+++ b/lib/libc/string/swab.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <string.h>
+.In string.h
.Ft void
.Fn swab "const void *src" "void *dst" "size_t len"
.Sh DESCRIPTION
diff --git a/lib/libc/string/wmemchr.3 b/lib/libc/string/wmemchr.3
index ff82e73..24ed0b4 100644
--- a/lib/libc/string/wmemchr.3
+++ b/lib/libc/string/wmemchr.3
@@ -67,7 +67,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <wchar.h>
+.In wchar.h
.Ft wchar_t *
.Fn wmemchr "const wchar_t *s" "wchar_t c" "size_t n"
.Ft int
diff --git a/lib/libc/sys/_exit.2 b/lib/libc/sys/_exit.2
index efeb4e8..0793374 100644
--- a/lib/libc/sys/_exit.2
+++ b/lib/libc/sys/_exit.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft void
.Fn _exit "int status"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/accept.2 b/lib/libc/sys/accept.2
index 968f4ce..736d068 100644
--- a/lib/libc/sys/accept.2
+++ b/lib/libc/sys/accept.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
+.In sys/types.h
+.In sys/socket.h
.Ft int
.Fn accept "int s" "struct sockaddr *addr" "socklen_t *addrlen"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/access.2 b/lib/libc/sys/access.2
index 23cc3c0..2460aec 100644
--- a/lib/libc/sys/access.2
+++ b/lib/libc/sys/access.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn access "const char *path" "int mode"
.Ft int
diff --git a/lib/libc/sys/acct.2 b/lib/libc/sys/acct.2
index ed41171..ab219bd 100644
--- a/lib/libc/sys/acct.2
+++ b/lib/libc/sys/acct.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn acct "const char *file"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/adjtime.2 b/lib/libc/sys/adjtime.2
index f6a0051..2301aaf 100644
--- a/lib/libc/sys/adjtime.2
+++ b/lib/libc/sys/adjtime.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/time.h>
+.In sys/time.h
.Ft int
.Fn adjtime "const struct timeval *delta" "struct timeval *olddelta"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/aio_cancel.2 b/lib/libc/sys/aio_cancel.2
index 320e36f..832356b 100644
--- a/lib/libc/sys/aio_cancel.2
+++ b/lib/libc/sys/aio_cancel.2
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <aio.h>
+.In aio.h
.Ft int
.Fn aio_cancel "int fildes" "struct aiocb * iocb"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/aio_error.2 b/lib/libc/sys/aio_error.2
index af5cade..4347758 100644
--- a/lib/libc/sys/aio_error.2
+++ b/lib/libc/sys/aio_error.2
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <aio.h>
+.In aio.h
.Ft int
.Fn aio_error "const struct aiocb *iocb"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/aio_read.2 b/lib/libc/sys/aio_read.2
index 839805e..b57de3e 100644
--- a/lib/libc/sys/aio_read.2
+++ b/lib/libc/sys/aio_read.2
@@ -33,8 +33,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <time.h>
-.Fd #include <aio.h>
+.In time.h
+.In aio.h
.Ft int
.Fn aio_read "struct aiocb *iocb"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/aio_return.2 b/lib/libc/sys/aio_return.2
index 64bc8c9..2d50143 100644
--- a/lib/libc/sys/aio_return.2
+++ b/lib/libc/sys/aio_return.2
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <aio.h>
+.In aio.h
.Ft int
.Fn aio_return "struct aiocb *iocb"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/aio_suspend.2 b/lib/libc/sys/aio_suspend.2
index d59cb8d..d208d91 100644
--- a/lib/libc/sys/aio_suspend.2
+++ b/lib/libc/sys/aio_suspend.2
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <aio.h>
+.In aio.h
.Ft int
.Fn aio_suspend "const struct aiocb * const iocbs[]" "int niocb" "const struct timespec * timeout"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/aio_waitcomplete.2 b/lib/libc/sys/aio_waitcomplete.2
index c554673..de01283 100644
--- a/lib/libc/sys/aio_waitcomplete.2
+++ b/lib/libc/sys/aio_waitcomplete.2
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <aio.h>
+.In aio.h
.Ft int
.Fn aio_waitcomplete "struct aiocb **iocbp" "struct timespec *timeout"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/aio_write.2 b/lib/libc/sys/aio_write.2
index 8215720..d7b57c6 100644
--- a/lib/libc/sys/aio_write.2
+++ b/lib/libc/sys/aio_write.2
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <aio.h>
+.In aio.h
.Ft int
.Fn aio_write "struct aiocb *iocb"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/bind.2 b/lib/libc/sys/bind.2
index 7024168..3f9d707 100644
--- a/lib/libc/sys/bind.2
+++ b/lib/libc/sys/bind.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
+.In sys/types.h
+.In sys/socket.h
.Ft int
.Fn bind "int s" "const struct sockaddr *addr" "socklen_t addrlen"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/brk.2 b/lib/libc/sys/brk.2
index c215be9..ac3a8d8 100644
--- a/lib/libc/sys/brk.2
+++ b/lib/libc/sys/brk.2
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft char *
.Fn brk "const char *addr"
.Ft char *
diff --git a/lib/libc/sys/chdir.2 b/lib/libc/sys/chdir.2
index 8648789..13da8b3 100644
--- a/lib/libc/sys/chdir.2
+++ b/lib/libc/sys/chdir.2
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn chdir "const char *path"
.Ft int
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index 05205c6..dae7efd 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -42,8 +42,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/stat.h>
-.Fd #include <unistd.h>
+.In sys/stat.h
+.In unistd.h
.Ft int
.Fn chflags "const char *path" "u_long flags"
.Ft int
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index 5a165ca..9121954 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -43,7 +43,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/stat.h>
+.In sys/stat.h
.Ft int
.Fn chmod "const char *path" "mode_t mode"
.Ft int
diff --git a/lib/libc/sys/chown.2 b/lib/libc/sys/chown.2
index 65fd888..dc1d067 100644
--- a/lib/libc/sys/chown.2
+++ b/lib/libc/sys/chown.2
@@ -43,7 +43,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn chown "const char *path" "uid_t owner" "gid_t group"
.Ft int
diff --git a/lib/libc/sys/chroot.2 b/lib/libc/sys/chroot.2
index eeb9def..c46f16e 100644
--- a/lib/libc/sys/chroot.2
+++ b/lib/libc/sys/chroot.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn chroot "const char *dirname"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libc/sys/clock_gettime.2
index 633f3f9..31f6a4e 100644
--- a/lib/libc/sys/clock_gettime.2
+++ b/lib/libc/sys/clock_gettime.2
@@ -43,7 +43,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/time.h>
+.In sys/time.h
.Ft int
.Fn clock_gettime "clockid_t clock_id" "struct timespec *tp"
.Ft int
diff --git a/lib/libc/sys/close.2 b/lib/libc/sys/close.2
index 6a6fb0f..9192ae1 100644
--- a/lib/libc/sys/close.2
+++ b/lib/libc/sys/close.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn close "int d"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/connect.2 b/lib/libc/sys/connect.2
index eb1c618..975b6c6 100644
--- a/lib/libc/sys/connect.2
+++ b/lib/libc/sys/connect.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
+.In sys/types.h
+.In sys/socket.h
.Ft int
.Fn connect "int s" "const struct sockaddr *name" "socklen_t namelen"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/dup.2 b/lib/libc/sys/dup.2
index 9c2a7b1..d9a7a3f 100644
--- a/lib/libc/sys/dup.2
+++ b/lib/libc/sys/dup.2
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn dup "int oldd"
.Ft int
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index 9086232..89c0ecb 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn execve "const char *path" "char *const argv[]" "char *const envp[]"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/extattr_get_file.2 b/lib/libc/sys/extattr_get_file.2
index bb44004..45b767d 100644
--- a/lib/libc/sys/extattr_get_file.2
+++ b/lib/libc/sys/extattr_get_file.2
@@ -39,8 +39,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/extattr.h>
-.Fd #include <sys/uio.h>
+.In sys/extattr.h
+.In sys/uio.h
.Ft int
.Fn extattr_get_fd "int fd" "int attrnamespace" "const char *attrname" "struct iovec *iovp" "unsigned iovcnt"
.Ft int
diff --git a/lib/libc/sys/fcntl.2 b/lib/libc/sys/fcntl.2
index 5e65f2c..f416903 100644
--- a/lib/libc/sys/fcntl.2
+++ b/lib/libc/sys/fcntl.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <fcntl.h>
+.In fcntl.h
.Ft int
.Fn fcntl "int fd" "int cmd" "..."
.Sh DESCRIPTION
diff --git a/lib/libc/sys/fhopen.2 b/lib/libc/sys/fhopen.2
index 270be1c..bf66a08 100644
--- a/lib/libc/sys/fhopen.2
+++ b/lib/libc/sys/fhopen.2
@@ -43,9 +43,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/mount.h>
-.Fd #include <sys/stat.h>
+.In sys/param.h
+.In sys/mount.h
+.In sys/stat.h
.Ft int
.Fn fhopen "const fhandle_t *fhp" "int flags"
.Ft int
diff --git a/lib/libc/sys/flock.2 b/lib/libc/sys/flock.2
index d890bed..33dcec5 100644
--- a/lib/libc/sys/flock.2
+++ b/lib/libc/sys/flock.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/file.h>
+.In sys/file.h
.Fd "#define LOCK_SH 0x01 /* shared file lock */"
.Fd "#define LOCK_EX 0x02 /* exclusive file lock */"
.Fd "#define LOCK_NB 0x04 /* don't block when locking */"
diff --git a/lib/libc/sys/fork.2 b/lib/libc/sys/fork.2
index 047e5a9..83f1471 100644
--- a/lib/libc/sys/fork.2
+++ b/lib/libc/sys/fork.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <unistd.h>
+.In sys/types.h
+.In unistd.h
.Ft pid_t
.Fn fork void
.Sh DESCRIPTION
diff --git a/lib/libc/sys/fsync.2 b/lib/libc/sys/fsync.2
index 33a0167..ac28aef 100644
--- a/lib/libc/sys/fsync.2
+++ b/lib/libc/sys/fsync.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn fsync "int fd"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2
index 48d2e0e..769ce32 100644
--- a/lib/libc/sys/getdirentries.2
+++ b/lib/libc/sys/getdirentries.2
@@ -42,8 +42,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <dirent.h>
+.In sys/types.h
+.In dirent.h
.Ft int
.Fn getdirentries "int fd" "char *buf" "int nbytes" "long *basep"
.Ft int
diff --git a/lib/libc/sys/getdtablesize.2 b/lib/libc/sys/getdtablesize.2
index 28344ac..a5ed3dc 100644
--- a/lib/libc/sys/getdtablesize.2
+++ b/lib/libc/sys/getdtablesize.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn getdtablesize void
.Sh DESCRIPTION
diff --git a/lib/libc/sys/getfh.2 b/lib/libc/sys/getfh.2
index 422c1f6..fcaff6c 100644
--- a/lib/libc/sys/getfh.2
+++ b/lib/libc/sys/getfh.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/mount.h>
+.In sys/param.h
+.In sys/mount.h
.Ft int
.Fn getfh "const char *path" "fhandle_t *fhp"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/getfsstat.2 b/lib/libc/sys/getfsstat.2
index bec4f14..8d4d545 100644
--- a/lib/libc/sys/getfsstat.2
+++ b/lib/libc/sys/getfsstat.2
@@ -41,9 +41,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/ucred.h>
-.Fd #include <sys/mount.h>
+.In sys/param.h
+.In sys/ucred.h
+.In sys/mount.h
.Ft int
.Fn getfsstat "struct statfs *buf" "long bufsize" "int flags"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/getgid.2 b/lib/libc/sys/getgid.2
index 39215e1..3bc8658 100644
--- a/lib/libc/sys/getgid.2
+++ b/lib/libc/sys/getgid.2
@@ -42,8 +42,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <unistd.h>
+.In sys/types.h
+.In unistd.h
.Ft gid_t
.Fn getgid void
.Ft gid_t
diff --git a/lib/libc/sys/getgroups.2 b/lib/libc/sys/getgroups.2
index 7b0789d..3538b38 100644
--- a/lib/libc/sys/getgroups.2
+++ b/lib/libc/sys/getgroups.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <unistd.h>
+.In sys/types.h
+.In unistd.h
.Ft int
.Fn getgroups "int gidsetlen" "gid_t *gidset"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/getitimer.2 b/lib/libc/sys/getitimer.2
index e99e9a8..5e3eda7 100644
--- a/lib/libc/sys/getitimer.2
+++ b/lib/libc/sys/getitimer.2
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/time.h>
+.In sys/time.h
.Fd "#define ITIMER_REAL 0"
.Fd "#define ITIMER_VIRTUAL 1"
.Fd "#define ITIMER_PROF 2"
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index 07e54f6..04a32a6 100644
--- a/lib/libc/sys/getlogin.2
+++ b/lib/libc/sys/getlogin.2
@@ -43,10 +43,10 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft char *
.Fn getlogin void
-.Fd #include <sys/param.h>
+.In sys/param.h
.Ft int
.Fn getlogin_r "char *name" "int len"
.Ft int
diff --git a/lib/libc/sys/getpeername.2 b/lib/libc/sys/getpeername.2
index 28d7a92..8aa5625 100644
--- a/lib/libc/sys/getpeername.2
+++ b/lib/libc/sys/getpeername.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
+.In sys/types.h
+.In sys/socket.h
.Ft int
.Fn getpeername "int s" "struct sockaddr *name" "socklen_t *namelen"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/getpgrp.2 b/lib/libc/sys/getpgrp.2
index 30209ac..a35f1ed 100644
--- a/lib/libc/sys/getpgrp.2
+++ b/lib/libc/sys/getpgrp.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft pid_t
.Fn getpgrp void
.Ft pid_t
diff --git a/lib/libc/sys/getpid.2 b/lib/libc/sys/getpid.2
index 656d7e7..4c9889c 100644
--- a/lib/libc/sys/getpid.2
+++ b/lib/libc/sys/getpid.2
@@ -42,8 +42,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <unistd.h>
+.In sys/types.h
+.In unistd.h
.Ft pid_t
.Fn getpid void
.Ft pid_t
diff --git a/lib/libc/sys/getpriority.2 b/lib/libc/sys/getpriority.2
index d156702..ef45d13b 100644
--- a/lib/libc/sys/getpriority.2
+++ b/lib/libc/sys/getpriority.2
@@ -42,8 +42,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/time.h>
-.Fd #include <sys/resource.h>
+.In sys/time.h
+.In sys/resource.h
.Ft int
.Fn getpriority "int which" "int who"
.Ft int
diff --git a/lib/libc/sys/getrlimit.2 b/lib/libc/sys/getrlimit.2
index d573fbc..5b5c149 100644
--- a/lib/libc/sys/getrlimit.2
+++ b/lib/libc/sys/getrlimit.2
@@ -42,9 +42,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/time.h>
-.Fd #include <sys/resource.h>
+.In sys/types.h
+.In sys/time.h
+.In sys/resource.h
.Ft int
.Fn getrlimit "int resource" "struct rlimit *rlp"
.Ft int
diff --git a/lib/libc/sys/getrusage.2 b/lib/libc/sys/getrusage.2
index 80e1197..599bebc 100644
--- a/lib/libc/sys/getrusage.2
+++ b/lib/libc/sys/getrusage.2
@@ -41,9 +41,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/time.h>
-.Fd #include <sys/resource.h>
+.In sys/types.h
+.In sys/time.h
+.In sys/resource.h
.Fd "#define RUSAGE_SELF 0"
.Fd "#define RUSAGE_CHILDREN -1"
.Ft int
diff --git a/lib/libc/sys/getsid.2 b/lib/libc/sys/getsid.2
index ea91e62..2800248 100644
--- a/lib/libc/sys/getsid.2
+++ b/lib/libc/sys/getsid.2
@@ -32,7 +32,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft pid_t
.Fn getsid "pid_t pid"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/getsockname.2 b/lib/libc/sys/getsockname.2
index e5b2c3c..5d0890d 100644
--- a/lib/libc/sys/getsockname.2
+++ b/lib/libc/sys/getsockname.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
+.In sys/types.h
+.In sys/socket.h
.Ft int
.Fn getsockname "int s" "struct sockaddr *name" "socklen_t *namelen"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index c61691e..f570085 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/lib/libc/sys/getsockopt.2
@@ -42,8 +42,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
+.In sys/types.h
+.In sys/socket.h
.Ft int
.Fn getsockopt "int s" "int level" "int optname" "void *optval" "socklen_t *optlen"
.Ft int
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index a0cb096..2a486d1 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/time.h>
+.In sys/time.h
.Ft int
.Fn gettimeofday "struct timeval *tp" "struct timezone *tzp"
.Ft int
diff --git a/lib/libc/sys/getuid.2 b/lib/libc/sys/getuid.2
index 95873bf..e352adf 100644
--- a/lib/libc/sys/getuid.2
+++ b/lib/libc/sys/getuid.2
@@ -42,8 +42,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
-.Fd #include <sys/types.h>
+.In unistd.h
+.In sys/types.h
.Ft uid_t
.Fn getuid void
.Ft uid_t
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index c4f3c4b..9780339 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <errno.h>
+.In errno.h
.Sh DESCRIPTION
This section provides an overview of the system calls,
their error returns, and other common definitions and concepts.
diff --git a/lib/libc/sys/ioctl.2 b/lib/libc/sys/ioctl.2
index 15c12e0..c16e12e 100644
--- a/lib/libc/sys/ioctl.2
+++ b/lib/libc/sys/ioctl.2
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/ioctl.h>
+.In sys/ioctl.h
.Ft int
.Fn ioctl "int d" "unsigned long request" ...
.Sh DESCRIPTION
diff --git a/lib/libc/sys/issetugid.2 b/lib/libc/sys/issetugid.2
index 2e1ff58..10aa6df 100644
--- a/lib/libc/sys/issetugid.2
+++ b/lib/libc/sys/issetugid.2
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn issetugid void
.Sh DESCRIPTION
diff --git a/lib/libc/sys/jail.2 b/lib/libc/sys/jail.2
index 15ff287..eae2f87 100644
--- a/lib/libc/sys/jail.2
+++ b/lib/libc/sys/jail.2
@@ -17,8 +17,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/jail.h>
+.In sys/types.h
+.In sys/jail.h
.Ft int
.Fn jail "struct jail *jail"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/kill.2 b/lib/libc/sys/kill.2
index 8180762..a04f46f 100644
--- a/lib/libc/sys/kill.2
+++ b/lib/libc/sys/kill.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <signal.h>
+.In sys/types.h
+.In signal.h
.Ft int
.Fn kill "pid_t pid" "int sig"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/kldfind.2 b/lib/libc/sys/kldfind.2
index 4cfc6a8..b7be17a 100644
--- a/lib/libc/sys/kldfind.2
+++ b/lib/libc/sys/kldfind.2
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/linker.h>
+.In sys/param.h
+.In sys/linker.h
.Ft int
.Fn kldfind "const char *file"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/kldfirstmod.2 b/lib/libc/sys/kldfirstmod.2
index adaa6e5..8b51be0 100644
--- a/lib/libc/sys/kldfirstmod.2
+++ b/lib/libc/sys/kldfirstmod.2
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/linker.h>
+.In sys/param.h
+.In sys/linker.h
.Ft int
.Fn kldfirstmod "int fileid"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/kldload.2 b/lib/libc/sys/kldload.2
index f5c5ef8..e289a5e 100644
--- a/lib/libc/sys/kldload.2
+++ b/lib/libc/sys/kldload.2
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/linker.h>
+.In sys/param.h
+.In sys/linker.h
.Ft int
.Fn kldload "const char *file"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/kldnext.2 b/lib/libc/sys/kldnext.2
index 3382c68..bf56ad0 100644
--- a/lib/libc/sys/kldnext.2
+++ b/lib/libc/sys/kldnext.2
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/linker.h>
+.In sys/param.h
+.In sys/linker.h
.Ft int
.Fn kldnext "int fileid"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/kldstat.2 b/lib/libc/sys/kldstat.2
index 5b3fe69..99b06f7 100644
--- a/lib/libc/sys/kldstat.2
+++ b/lib/libc/sys/kldstat.2
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/linker.h>
+.In sys/param.h
+.In sys/linker.h
.Ft int
.Fn kldstat "int fileid" "struct kld_file_stat *stat"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/kldunload.2 b/lib/libc/sys/kldunload.2
index c2fbf4b..f14d5e8 100644
--- a/lib/libc/sys/kldunload.2
+++ b/lib/libc/sys/kldunload.2
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/linker.h>
+.In sys/param.h
+.In sys/linker.h
.Ft int
.Fn kldunload "int fileid"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index 7298511..1227215 100644
--- a/lib/libc/sys/kqueue.2
+++ b/lib/libc/sys/kqueue.2
@@ -34,9 +34,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/event.h>
-.Fd #include <sys/time.h>
+.In sys/types.h
+.In sys/event.h
+.In sys/time.h
.Ft int
.Fn kqueue "void"
.Ft int
diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2
index e903ff2..6060e3f 100644
--- a/lib/libc/sys/ktrace.2
+++ b/lib/libc/sys/ktrace.2
@@ -41,10 +41,10 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/time.h>
-.Fd #include <sys/uio.h>
-.Fd #include <sys/ktrace.h>
+.In sys/param.h
+.In sys/time.h
+.In sys/uio.h
+.In sys/ktrace.h
.Ft int
.Fn ktrace "const char *tracefile" "int ops" "int trpoints" "int pid"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/link.2 b/lib/libc/sys/link.2
index 9c126c9..d9d9fa9 100644
--- a/lib/libc/sys/link.2
+++ b/lib/libc/sys/link.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn link "const char *name1" "const char *name2"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/listen.2 b/lib/libc/sys/listen.2
index a9ab96b..1a97658 100644
--- a/lib/libc/sys/listen.2
+++ b/lib/libc/sys/listen.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
+.In sys/types.h
+.In sys/socket.h
.Ft int
.Fn listen "int s" "int backlog"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/lseek.2 b/lib/libc/sys/lseek.2
index 4f3f430..988b52b 100644
--- a/lib/libc/sys/lseek.2
+++ b/lib/libc/sys/lseek.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft off_t
.Fn lseek "int fildes" "off_t offset" "int whence"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/madvise.2 b/lib/libc/sys/madvise.2
index 5ddfa96..71b464c 100644
--- a/lib/libc/sys/madvise.2
+++ b/lib/libc/sys/madvise.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/mman.h>
+.In sys/types.h
+.In sys/mman.h
.Ft int
.Fn madvise "void *addr" "size_t len" "int behav"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/mincore.2 b/lib/libc/sys/mincore.2
index 1bc309f..d39e752 100644
--- a/lib/libc/sys/mincore.2
+++ b/lib/libc/sys/mincore.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/mman.h>
+.In sys/types.h
+.In sys/mman.h
.Ft int
.Fn mincore "const void *addr" "size_t len" "char *vec"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/minherit.2 b/lib/libc/sys/minherit.2
index aadb50c..fd9bbee 100644
--- a/lib/libc/sys/minherit.2
+++ b/lib/libc/sys/minherit.2
@@ -42,8 +42,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/mman.h>
+.In sys/types.h
+.In sys/mman.h
.Ft int
.Fn minherit "void *addr" "size_t len" "int inherit"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/mkdir.2 b/lib/libc/sys/mkdir.2
index 25fad1e..cc5cd8c 100644
--- a/lib/libc/sys/mkdir.2
+++ b/lib/libc/sys/mkdir.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/stat.h>
+.In sys/types.h
+.In sys/stat.h
.Ft int
.Fn mkdir "const char *path" "mode_t mode"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/mkfifo.2 b/lib/libc/sys/mkfifo.2
index c711690..b85c021 100644
--- a/lib/libc/sys/mkfifo.2
+++ b/lib/libc/sys/mkfifo.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/stat.h>
+.In sys/types.h
+.In sys/stat.h
.Ft int
.Fn mkfifo "const char *path" "mode_t mode"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/mknod.2 b/lib/libc/sys/mknod.2
index a81c1aa..36f1f5b8 100644
--- a/lib/libc/sys/mknod.2
+++ b/lib/libc/sys/mknod.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn mknod "const char *path" "mode_t mode" "dev_t dev"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/mlock.2 b/lib/libc/sys/mlock.2
index fd92aa2..8379d81 100644
--- a/lib/libc/sys/mlock.2
+++ b/lib/libc/sys/mlock.2
@@ -42,8 +42,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/mman.h>
+.In sys/types.h
+.In sys/mman.h
.Ft int
.Fn mlock "const void *addr" "size_t len"
.Ft int
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index 7e0affc..29a0975 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/mman.h>
+.In sys/types.h
+.In sys/mman.h
.Ft void *
.Fn mmap "void *addr" "size_t len" "int prot" "int flags" "int fd" "off_t offset"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/modfind.2 b/lib/libc/sys/modfind.2
index 401eb60..35fa7c9 100644
--- a/lib/libc/sys/modfind.2
+++ b/lib/libc/sys/modfind.2
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/module.h>
+.In sys/param.h
+.In sys/module.h
.Ft int
.Fn modfind "const char *modname"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/modnext.2 b/lib/libc/sys/modnext.2
index ed6398e..dc578ad 100644
--- a/lib/libc/sys/modnext.2
+++ b/lib/libc/sys/modnext.2
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/module.h>
+.In sys/param.h
+.In sys/module.h
.Ft int
.Fn modnext "int modid"
.Ft int
diff --git a/lib/libc/sys/modstat.2 b/lib/libc/sys/modstat.2
index 9cadabd..d19f469 100644
--- a/lib/libc/sys/modstat.2
+++ b/lib/libc/sys/modstat.2
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/module.h>
+.In sys/param.h
+.In sys/module.h
.Ft int
.Fn modstat "int modid" "struct module_stat *stat"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
index d8f8dec..dc1b45b 100644
--- a/lib/libc/sys/mount.2
+++ b/lib/libc/sys/mount.2
@@ -42,8 +42,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/mount.h>
+.In sys/param.h
+.In sys/mount.h
.Ft int
.Fn mount "const char *type" "const char *dir" "int flags" "void *data"
.Ft int
diff --git a/lib/libc/sys/mprotect.2 b/lib/libc/sys/mprotect.2
index fe8df30..369dd59 100644
--- a/lib/libc/sys/mprotect.2
+++ b/lib/libc/sys/mprotect.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/mman.h>
+.In sys/types.h
+.In sys/mman.h
.Ft int
.Fn mprotect "const void *addr" "size_t len" "int prot"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/msync.2 b/lib/libc/sys/msync.2
index 9adc3ac..29c4613 100644
--- a/lib/libc/sys/msync.2
+++ b/lib/libc/sys/msync.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/mman.h>
+.In sys/types.h
+.In sys/mman.h
.Ft int
.Fn msync "void *addr" "size_t len" "int flags"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/munmap.2 b/lib/libc/sys/munmap.2
index 1644730..33f3724 100644
--- a/lib/libc/sys/munmap.2
+++ b/lib/libc/sys/munmap.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/mman.h>
+.In sys/types.h
+.In sys/mman.h
.Ft int
.Fn munmap "void *addr" "size_t len"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/nanosleep.2 b/lib/libc/sys/nanosleep.2
index b69ef33..5a39a44 100644
--- a/lib/libc/sys/nanosleep.2
+++ b/lib/libc/sys/nanosleep.2
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <time.h>
+.In time.h
.Ft int
.Fn nanosleep "const struct timespec *rqtp" "struct timespec *rmtp"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/nfssvc.2 b/lib/libc/sys/nfssvc.2
index d28edc1..1c24040 100644
--- a/lib/libc/sys/nfssvc.2
+++ b/lib/libc/sys/nfssvc.2
@@ -41,12 +41,12 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/mount.h>
-.Fd #include <sys/time.h>
-.Fd #include <nfs/rpcv2.h>
-.Fd #include <nfs/nfs.h>
-.Fd #include <unistd.h>
+.In sys/param.h
+.In sys/mount.h
+.In sys/time.h
+.In nfs/rpcv2.h
+.In nfs/nfs.h
+.In unistd.h
.Ft int
.Fn nfssvc "int flags" "void *argstructp"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2
index 5e4aeeb..874ce74 100644
--- a/lib/libc/sys/open.2
+++ b/lib/libc/sys/open.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <fcntl.h>
+.In fcntl.h
.Ft int
.Fn open "const char *path" "int flags" "..."
.Sh DESCRIPTION
diff --git a/lib/libc/sys/pathconf.2 b/lib/libc/sys/pathconf.2
index 90318c0..f560af9 100644
--- a/lib/libc/sys/pathconf.2
+++ b/lib/libc/sys/pathconf.2
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft long
.Fn pathconf "const char *path" "int name"
.Ft long
diff --git a/lib/libc/sys/pipe.2 b/lib/libc/sys/pipe.2
index 52f0f98..8372978 100644
--- a/lib/libc/sys/pipe.2
+++ b/lib/libc/sys/pipe.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn pipe "int *fildes"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/poll.2 b/lib/libc/sys/poll.2
index d594bbc..04a91df 100644
--- a/lib/libc/sys/poll.2
+++ b/lib/libc/sys/poll.2
@@ -37,8 +37,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <poll.h>
+.In sys/types.h
+.In poll.h
.Ft int
.Fn poll "struct pollfd *fds" "unsigned int nfds" "int timeout"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/profil.2 b/lib/libc/sys/profil.2
index 14b2bd5..7437ef7 100644
--- a/lib/libc/sys/profil.2
+++ b/lib/libc/sys/profil.2
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn profil "char *samples" "size_t size" "vm_offset_t offset" "int scale"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index a31d146..90ce6ba 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -11,8 +11,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/ptrace.h>
+.In sys/types.h
+.In sys/ptrace.h
.Ft int
.Fn ptrace "int request" "pid_t pid" "caddr_t addr" "int data"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/quotactl.2 b/lib/libc/sys/quotactl.2
index 9aa5a48..5730dd1 100644
--- a/lib/libc/sys/quotactl.2
+++ b/lib/libc/sys/quotactl.2
@@ -44,8 +44,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <ufs/ufs/quota.h>
+.In sys/types.h
+.In ufs/ufs/quota.h
.Ft int
.Fn quotactl "const char *path" "int cmd" "int id" "void *addr"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/read.2 b/lib/libc/sys/read.2
index 9c38809..e4f330a 100644
--- a/lib/libc/sys/read.2
+++ b/lib/libc/sys/read.2
@@ -43,9 +43,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/uio.h>
-.Fd #include <unistd.h>
+.In sys/types.h
+.In sys/uio.h
+.In unistd.h
.Ft ssize_t
.Fn read "int d" "void *buf" "size_t nbytes"
.Ft ssize_t
diff --git a/lib/libc/sys/readlink.2 b/lib/libc/sys/readlink.2
index 4708594..fd97e1d 100644
--- a/lib/libc/sys/readlink.2
+++ b/lib/libc/sys/readlink.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn readlink "const char *path" "char *buf" "int bufsiz"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index 8f247b2..8e3a19a 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
-.Fd #include <sys/reboot.h>
+.In unistd.h
+.In sys/reboot.h
.Ft int
.Fn reboot "int howto"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index 7a49e41..3acd694 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -43,8 +43,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
+.In sys/types.h
+.In sys/socket.h
.Ft ssize_t
.Fn recv "int s" "void *buf" "size_t len" "int flags"
.Ft ssize_t
diff --git a/lib/libc/sys/rename.2 b/lib/libc/sys/rename.2
index 8d5523a..2ef23f7 100644
--- a/lib/libc/sys/rename.2
+++ b/lib/libc/sys/rename.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
.Ft int
.Fn rename "const char *from" "const char *to"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/revoke.2 b/lib/libc/sys/revoke.2
index 8b6b01d..687a317 100644
--- a/lib/libc/sys/revoke.2
+++ b/lib/libc/sys/revoke.2
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn revoke "const char *path"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/rfork.2 b/lib/libc/sys/rfork.2
index 80d7f76..a037a6e 100644
--- a/lib/libc/sys/rfork.2
+++ b/lib/libc/sys/rfork.2
@@ -14,7 +14,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn rfork "int flags"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/rmdir.2 b/lib/libc/sys/rmdir.2
index 373b185..d6e052f 100644
--- a/lib/libc/sys/rmdir.2
+++ b/lib/libc/sys/rmdir.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn rmdir "const char *path"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/rtprio.2 b/lib/libc/sys/rtprio.2
index f5175ad..47e0af8 100644
--- a/lib/libc/sys/rtprio.2
+++ b/lib/libc/sys/rtprio.2
@@ -38,8 +38,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/rtprio.h>
+.In sys/types.h
+.In sys/rtprio.h
.Ft int
.Fn rtprio "int function" "pid_t pid" "struct rtprio *rtp"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/sched_get_priority_max.2 b/lib/libc/sys/sched_get_priority_max.2
index 0f1c8d8..eba278d 100644
--- a/lib/libc/sys/sched_get_priority_max.2
+++ b/lib/libc/sys/sched_get_priority_max.2
@@ -34,7 +34,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sched.h>
+.In sched.h
.Ft int
.Fn sched_get_priority_max "int policy"
.Ft int
diff --git a/lib/libc/sys/sched_setparam.2 b/lib/libc/sys/sched_setparam.2
index ac9be76..136e70d 100644
--- a/lib/libc/sys/sched_setparam.2
+++ b/lib/libc/sys/sched_setparam.2
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sched.h>
+.In sched.h
.Ft int
.Fn sched_setparam "pid_t pid" "const struct sched_param *param"
.Ft int
diff --git a/lib/libc/sys/sched_setscheduler.2 b/lib/libc/sys/sched_setscheduler.2
index 556b986..35c8627 100644
--- a/lib/libc/sys/sched_setscheduler.2
+++ b/lib/libc/sys/sched_setscheduler.2
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sched.h>
+.In sched.h
.Ft int
.Fn sched_setscheduler "pid_t pid" "int policy" "const struct sched_param *param"
.Ft int
diff --git a/lib/libc/sys/sched_yield.2 b/lib/libc/sys/sched_yield.2
index 2d8240c..3457a35 100644
--- a/lib/libc/sys/sched_yield.2
+++ b/lib/libc/sys/sched_yield.2
@@ -32,7 +32,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sched.h>
+.In sched.h
.Ft int
.Fn sched_yield void
.Sh DESCRIPTION
diff --git a/lib/libc/sys/select.2 b/lib/libc/sys/select.2
index d888bfb..b0affba 100644
--- a/lib/libc/sys/select.2
+++ b/lib/libc/sys/select.2
@@ -41,9 +41,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/time.h>
-.Fd #include <unistd.h>
+.In sys/types.h
+.In sys/time.h
+.In unistd.h
.Ft int
.Fn select "int nfds" "fd_set *readfds" "fd_set *writefds" "fd_set *exceptfds" "struct timeval *timeout"
.Fn FD_SET fd &fdset
diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2
index 2b3df68..4e3765c 100644
--- a/lib/libc/sys/semctl.2
+++ b/lib/libc/sys/semctl.2
@@ -34,9 +34,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/ipc.h>
-.Fd #include <sys/sem.h>
+.In sys/types.h
+.In sys/ipc.h
+.In sys/sem.h
.Ft int
.Fn semctl "int semid" "int semnum" "int cmd" ...
.Sh DESCRIPTION
diff --git a/lib/libc/sys/semget.2 b/lib/libc/sys/semget.2
index b35db9f..b9fad0d 100644
--- a/lib/libc/sys/semget.2
+++ b/lib/libc/sys/semget.2
@@ -34,9 +34,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/ipc.h>
-.Fd #include <sys/sem.h>
+.In sys/types.h
+.In sys/ipc.h
+.In sys/sem.h
.Ft int
.Fn semget "key_t key" "int nsems" "int flag"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/semop.2 b/lib/libc/sys/semop.2
index 7f18510..ac4e79c 100644
--- a/lib/libc/sys/semop.2
+++ b/lib/libc/sys/semop.2
@@ -34,9 +34,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/ipc.h>
-.Fd #include <sys/sem.h>
+.In sys/types.h
+.In sys/ipc.h
+.In sys/sem.h
.Ft int
.Fn semop "int semid" "struct sembuf array[]" "unsigned nops"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/send.2 b/lib/libc/sys/send.2
index 8ec9476..3ef0694 100644
--- a/lib/libc/sys/send.2
+++ b/lib/libc/sys/send.2
@@ -43,8 +43,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
+.In sys/types.h
+.In sys/socket.h
.Ft ssize_t
.Fn send "int s" "const void *msg" "size_t len" "int flags"
.Ft ssize_t
diff --git a/lib/libc/sys/sendfile.2 b/lib/libc/sys/sendfile.2
index 24296c2..f073b06 100644
--- a/lib/libc/sys/sendfile.2
+++ b/lib/libc/sys/sendfile.2
@@ -34,9 +34,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
-.Fd #include <sys/uio.h>
+.In sys/types.h
+.In sys/socket.h
+.In sys/uio.h
.Ft int
.Fn sendfile "int fd" "int s" "off_t offset" "size_t nbytes" "struct sf_hdtr *hdtr" "off_t *sbytes" "int flags"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/setgroups.2 b/lib/libc/sys/setgroups.2
index 3ba324d..355298e 100644
--- a/lib/libc/sys/setgroups.2
+++ b/lib/libc/sys/setgroups.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <unistd.h>
+.In sys/param.h
+.In unistd.h
.Ft int
.Fn setgroups "int ngroups" "const gid_t *gidset"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/setpgid.2 b/lib/libc/sys/setpgid.2
index 30667d6..14186ea 100644
--- a/lib/libc/sys/setpgid.2
+++ b/lib/libc/sys/setpgid.2
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn setpgid "pid_t pid" "pid_t pgrp"
.Ft int
diff --git a/lib/libc/sys/setregid.2 b/lib/libc/sys/setregid.2
index 1965349..d23e48a 100644
--- a/lib/libc/sys/setregid.2
+++ b/lib/libc/sys/setregid.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn setregid "gid_t rgid" "gid_t egid"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/setresuid.2 b/lib/libc/sys/setresuid.2
index d1a3b28..ad948f0 100644
--- a/lib/libc/sys/setresuid.2
+++ b/lib/libc/sys/setresuid.2
@@ -31,8 +31,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <unistd.h>
+.In sys/types.h
+.In unistd.h
.Ft int
.Fn getresgid "gid_t *rgid" "gid_t *egid" "gid_t *sgid"
.Ft int
diff --git a/lib/libc/sys/setreuid.2 b/lib/libc/sys/setreuid.2
index aa87657..fd5d636 100644
--- a/lib/libc/sys/setreuid.2
+++ b/lib/libc/sys/setreuid.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn setreuid "uid_t ruid" "uid_t euid"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/setsid.2 b/lib/libc/sys/setsid.2
index 0fffc8b..0dc1cef 100644
--- a/lib/libc/sys/setsid.2
+++ b/lib/libc/sys/setsid.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft pid_t
.Fn setsid void
.Sh DESCRIPTION
diff --git a/lib/libc/sys/setuid.2 b/lib/libc/sys/setuid.2
index 3403b108..5e959f9 100644
--- a/lib/libc/sys/setuid.2
+++ b/lib/libc/sys/setuid.2
@@ -44,8 +44,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <unistd.h>
+.In sys/types.h
+.In unistd.h
.Ft int
.Fn setuid "uid_t uid"
.Ft int
diff --git a/lib/libc/sys/shm_open.2 b/lib/libc/sys/shm_open.2
index 35ac103..0619133 100644
--- a/lib/libc/sys/shm_open.2
+++ b/lib/libc/sys/shm_open.2
@@ -39,8 +39,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/mman.h>
+.In sys/types.h
+.In sys/mman.h
.Ft int
.Fn shm_open "const char *path" "int flags" "mode_t mode"
.Ft int
diff --git a/lib/libc/sys/shmat.2 b/lib/libc/sys/shmat.2
index 63a08bc..429d0c8 100644
--- a/lib/libc/sys/shmat.2
+++ b/lib/libc/sys/shmat.2
@@ -35,10 +35,10 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <machine/param.h>
-.Fd #include <sys/types.h>
-.Fd #include <sys/ipc.h>
-.Fd #include <sys/shm.h>
+.In machine/param.h
+.In sys/types.h
+.In sys/ipc.h
+.In sys/shm.h
.Ft void *
.Fn shmat "int shmid" "void *addr" "int flag"
.Ft int
diff --git a/lib/libc/sys/shmctl.2 b/lib/libc/sys/shmctl.2
index e3ab92c..c321e5b 100644
--- a/lib/libc/sys/shmctl.2
+++ b/lib/libc/sys/shmctl.2
@@ -34,10 +34,10 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <machine/param.h>
-.Fd #include <sys/types.h>
-.Fd #include <sys/ipc.h>
-.Fd #include <sys/shm.h>
+.In machine/param.h
+.In sys/types.h
+.In sys/ipc.h
+.In sys/shm.h
.Ft int
.Fn shmctl "int shmid" "int cmd" "struct shmid_ds *buf"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/shmget.2 b/lib/libc/sys/shmget.2
index b176c53..281cc66 100644
--- a/lib/libc/sys/shmget.2
+++ b/lib/libc/sys/shmget.2
@@ -34,10 +34,10 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <machine/param.h>
-.Fd #include <sys/types.h>
-.Fd #include <sys/ipc.h>
-.Fd #include <sys/shm.h>
+.In machine/param.h
+.In sys/types.h
+.In sys/ipc.h
+.In sys/shm.h
.Ft int
.Fn shmget "key_t key" "int size" "int flag"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/shutdown.2 b/lib/libc/sys/shutdown.2
index 5cef2e5..ed61ecc 100644
--- a/lib/libc/sys/shutdown.2
+++ b/lib/libc/sys/shutdown.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
+.In sys/types.h
+.In sys/socket.h
.Ft int
.Fn shutdown "int s" "int how"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 1f9f950..187dd01 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
.Bd -literal
struct sigaction {
union {
diff --git a/lib/libc/sys/sigaltstack.2 b/lib/libc/sys/sigaltstack.2
index e39b893..600e16d 100644
--- a/lib/libc/sys/sigaltstack.2
+++ b/lib/libc/sys/sigaltstack.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
.Bd -literal
struct sigaltstack {
char *ss_sp;
diff --git a/lib/libc/sys/sigpending.2 b/lib/libc/sys/sigpending.2
index 8ab927b..e6635d3 100644
--- a/lib/libc/sys/sigpending.2
+++ b/lib/libc/sys/sigpending.2
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
.Ft int
.Fn sigpending "sigset_t *set"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/sigprocmask.2 b/lib/libc/sys/sigprocmask.2
index a7bf788..62b3e45 100644
--- a/lib/libc/sys/sigprocmask.2
+++ b/lib/libc/sys/sigprocmask.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
.Ft int
.Fn sigprocmask "int how" "const sigset_t *set" "sigset_t *oset"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/sigreturn.2 b/lib/libc/sys/sigreturn.2
index cc7ca47..9717345 100644
--- a/lib/libc/sys/sigreturn.2
+++ b/lib/libc/sys/sigreturn.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
.Pp
.Bd -literal
struct sigcontext {
diff --git a/lib/libc/sys/sigsuspend.2 b/lib/libc/sys/sigsuspend.2
index 280d6d9..1dbfe0b 100644
--- a/lib/libc/sys/sigsuspend.2
+++ b/lib/libc/sys/sigsuspend.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
.Ft int
.Fn sigsuspend "const sigset_t *sigmask"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/sigwait.2 b/lib/libc/sys/sigwait.2
index fba1f67..76376a6 100644
--- a/lib/libc/sys/sigwait.2
+++ b/lib/libc/sys/sigwait.2
@@ -35,7 +35,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <signal.h>
+.In signal.h
.Ft int
.Fn sigwait "const sigset_t *set" "int *sig"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index ef2669f..990658f 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
+.In sys/types.h
+.In sys/socket.h
.Ft int
.Fn socket "int domain" "int type" "int protocol"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/socketpair.2 b/lib/libc/sys/socketpair.2
index 875aea0..a1e6fb8 100644
--- a/lib/libc/sys/socketpair.2
+++ b/lib/libc/sys/socketpair.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/socket.h>
+.In sys/types.h
+.In sys/socket.h
.Ft int
.Fn socketpair "int d" "int type" "int protocol" "int *sv"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index e6936d3..28d77a7 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -43,8 +43,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/stat.h>
+.In sys/types.h
+.In sys/stat.h
.Ft int
.Fn stat "const char *path" "struct stat *sb"
.Ft int
diff --git a/lib/libc/sys/statfs.2 b/lib/libc/sys/statfs.2
index 17e8ebe..a4b7e8a 100644
--- a/lib/libc/sys/statfs.2
+++ b/lib/libc/sys/statfs.2
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <sys/mount.h>
+.In sys/param.h
+.In sys/mount.h
.Ft int
.Fn statfs "const char *path" "struct statfs *buf"
.Ft int
diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2
index 16e7e16..a852ba0 100644
--- a/lib/libc/sys/swapon.2
+++ b/lib/libc/sys/swapon.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn swapon "const char *special"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/symlink.2 b/lib/libc/sys/symlink.2
index 175ce9f..1fa0666 100644
--- a/lib/libc/sys/symlink.2
+++ b/lib/libc/sys/symlink.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn symlink "const char *name1" "const char *name2"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/sync.2 b/lib/libc/sys/sync.2
index d60c0e4..f304cce 100644
--- a/lib/libc/sys/sync.2
+++ b/lib/libc/sys/sync.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft void
.Fn sync void
.Sh DESCRIPTION
diff --git a/lib/libc/sys/sysarch.2 b/lib/libc/sys/sysarch.2
index b18dc0a..5439747 100644
--- a/lib/libc/sys/sysarch.2
+++ b/lib/libc/sys/sysarch.2
@@ -43,7 +43,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <machine/sysarch.h>
+.In machine/sysarch.h
.Ft int
.Fn sysarch "int number" "void *args"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/syscall.2 b/lib/libc/sys/syscall.2
index ea8d639..5ecbf8b 100644
--- a/lib/libc/sys/syscall.2
+++ b/lib/libc/sys/syscall.2
@@ -42,8 +42,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/syscall.h>
-.Fd #include <unistd.h>
+.In sys/syscall.h
+.In unistd.h
.Ft int
.Fn syscall "int number" ...
.Ft off_t
diff --git a/lib/libc/sys/truncate.2 b/lib/libc/sys/truncate.2
index aa6a4b6..6e3a07e 100644
--- a/lib/libc/sys/truncate.2
+++ b/lib/libc/sys/truncate.2
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn truncate "const char *path" "off_t length"
.Ft int
diff --git a/lib/libc/sys/umask.2 b/lib/libc/sys/umask.2
index 026a983..c747a63 100644
--- a/lib/libc/sys/umask.2
+++ b/lib/libc/sys/umask.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/stat.h>
+.In sys/stat.h
.Ft mode_t
.Fn umask "mode_t numask"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/undelete.2 b/lib/libc/sys/undelete.2
index d1fe935..8263314 100644
--- a/lib/libc/sys/undelete.2
+++ b/lib/libc/sys/undelete.2
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn undelete "const char *path"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/unlink.2 b/lib/libc/sys/unlink.2
index 2b5e3cb..5a10123 100644
--- a/lib/libc/sys/unlink.2
+++ b/lib/libc/sys/unlink.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn unlink "const char *path"
.Sh DESCRIPTION
diff --git a/lib/libc/sys/utimes.2 b/lib/libc/sys/utimes.2
index 1b2ef22..5d9691f 100644
--- a/lib/libc/sys/utimes.2
+++ b/lib/libc/sys/utimes.2
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/time.h>
+.In sys/time.h
.Ft int
.Fn utimes "const char *path" "const struct timeval *times"
.Ft int
diff --git a/lib/libc/sys/vfork.2 b/lib/libc/sys/vfork.2
index 49e36b6..680b67d 100644
--- a/lib/libc/sys/vfork.2
+++ b/lib/libc/sys/vfork.2
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft int
.Fn vfork void
.Sh DESCRIPTION
diff --git a/lib/libc/sys/wait.2 b/lib/libc/sys/wait.2
index bbb2c57..74309ab 100644
--- a/lib/libc/sys/wait.2
+++ b/lib/libc/sys/wait.2
@@ -44,12 +44,12 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/wait.h>
+.In sys/types.h
+.In sys/wait.h
.Ft pid_t
.Fn wait "int *status"
-.Fd #include <sys/time.h>
-.Fd #include <sys/resource.h>
+.In sys/time.h
+.In sys/resource.h
.Ft pid_t
.Fn waitpid "pid_t wpid" "int *status" "int options"
.Ft pid_t
diff --git a/lib/libc/sys/write.2 b/lib/libc/sys/write.2
index 5d4fdc2..77fba35 100644
--- a/lib/libc/sys/write.2
+++ b/lib/libc/sys/write.2
@@ -43,9 +43,9 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/uio.h>
-.Fd #include <unistd.h>
+.In sys/types.h
+.In sys/uio.h
+.In unistd.h
.Ft ssize_t
.Fn write "int d" "const void *buf" "size_t nbytes"
.Ft ssize_t
diff --git a/lib/libc/xdr/xdr.3 b/lib/libc/xdr/xdr.3
index 35554a7..96f6fc4 100644
--- a/lib/libc/xdr/xdr.3
+++ b/lib/libc/xdr/xdr.3
@@ -47,8 +47,8 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
-.Fd "#include <rpc/types.h>"
-.Fd "#include <rpc/xdr.h>"
+.In rpc/types.h
+.In rpc/xdr.h
.Pp
See
.Sx DESCRIPTION
OpenPOWER on IntegriCloud