aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2001-10-01 16:09:29 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2001-10-01 16:09:29 +0000
commit32eef9aeb1f39a1623cea55da147c89abbd5b9a5 (patch)
tree0ba5da0413d7f6bd39551fb636861f2919892751 /lib
parentf2ac7de925431ada9eb55447031e673f8c4e6257 (diff)
downloadsrc-32eef9aeb1f39a1623cea55da147c89abbd5b9a5.tar.gz
src-32eef9aeb1f39a1623cea55da147c89abbd5b9a5.zip
mdoc(7) police: Use the new .In macro for #include statements.
Notes
Notes: svn path=/head/; revision=84306
Diffstat (limited to 'lib')
-rw-r--r--lib/libalias/libalias.36
-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
-rw-r--r--lib/libc_r/man/pthread_attr.32
-rw-r--r--lib/libc_r/man/pthread_cancel.32
-rw-r--r--lib/libc_r/man/pthread_cleanup_pop.32
-rw-r--r--lib/libc_r/man/pthread_cleanup_push.32
-rw-r--r--lib/libc_r/man/pthread_cond_broadcast.32
-rw-r--r--lib/libc_r/man/pthread_cond_destroy.32
-rw-r--r--lib/libc_r/man/pthread_cond_init.32
-rw-r--r--lib/libc_r/man/pthread_cond_signal.32
-rw-r--r--lib/libc_r/man/pthread_cond_timedwait.32
-rw-r--r--lib/libc_r/man/pthread_cond_wait.32
-rw-r--r--lib/libc_r/man/pthread_condattr.32
-rw-r--r--lib/libc_r/man/pthread_create.32
-rw-r--r--lib/libc_r/man/pthread_detach.32
-rw-r--r--lib/libc_r/man/pthread_equal.32
-rw-r--r--lib/libc_r/man/pthread_exit.32
-rw-r--r--lib/libc_r/man/pthread_getspecific.32
-rw-r--r--lib/libc_r/man/pthread_join.32
-rw-r--r--lib/libc_r/man/pthread_key_create.32
-rw-r--r--lib/libc_r/man/pthread_key_delete.32
-rw-r--r--lib/libc_r/man/pthread_kill.34
-rw-r--r--lib/libc_r/man/pthread_mutex_destroy.32
-rw-r--r--lib/libc_r/man/pthread_mutex_init.32
-rw-r--r--lib/libc_r/man/pthread_mutex_lock.32
-rw-r--r--lib/libc_r/man/pthread_mutex_trylock.32
-rw-r--r--lib/libc_r/man/pthread_mutex_unlock.32
-rw-r--r--lib/libc_r/man/pthread_mutexattr.32
-rw-r--r--lib/libc_r/man/pthread_once.32
-rw-r--r--lib/libc_r/man/pthread_rwlock_destroy.32
-rw-r--r--lib/libc_r/man/pthread_rwlock_init.32
-rw-r--r--lib/libc_r/man/pthread_rwlock_rdlock.32
-rw-r--r--lib/libc_r/man/pthread_rwlock_unlock.32
-rw-r--r--lib/libc_r/man/pthread_rwlock_wrlock.32
-rw-r--r--lib/libc_r/man/pthread_rwlockattr_destroy.32
-rw-r--r--lib/libc_r/man/pthread_rwlockattr_getpshared.32
-rw-r--r--lib/libc_r/man/pthread_rwlockattr_init.32
-rw-r--r--lib/libc_r/man/pthread_rwlockattr_setpshared.32
-rw-r--r--lib/libc_r/man/pthread_schedparam.32
-rw-r--r--lib/libc_r/man/pthread_self.32
-rw-r--r--lib/libc_r/man/pthread_setspecific.32
-rw-r--r--lib/libc_r/man/pthread_sigmask.34
-rw-r--r--lib/libc_r/man/pthread_testcancel.32
-rw-r--r--lib/libc_r/man/sem_destroy.32
-rw-r--r--lib/libc_r/man/sem_getvalue.32
-rw-r--r--lib/libc_r/man/sem_init.32
-rw-r--r--lib/libc_r/man/sem_open.32
-rw-r--r--lib/libc_r/man/sem_post.32
-rw-r--r--lib/libc_r/man/sem_wait.32
-rw-r--r--lib/libc_r/man/sigwait.32
-rw-r--r--lib/libcalendar/calendar.32
-rw-r--r--lib/libcam/cam.34
-rw-r--r--lib/libcam/cam_cdbparse.34
-rw-r--r--lib/libcompat/4.1/cftime.32
-rw-r--r--lib/libcompat/4.1/ftime.34
-rw-r--r--lib/libcompat/4.1/getpw.32
-rw-r--r--lib/libcompat/4.1/stty.32
-rw-r--r--lib/libcompat/4.3/lsearch.32
-rw-r--r--lib/libcompat/4.3/re_comp.32
-rw-r--r--lib/libcompat/4.4/cuserid.32
-rw-r--r--lib/libcompat/regexp/regexp.32
-rw-r--r--lib/libcrypt/crypt.32
-rw-r--r--lib/libdevinfo/devinfo.32
-rw-r--r--lib/libdevstat/devstat.34
-rw-r--r--lib/libdisk/libdisk.34
-rw-r--r--lib/libfetch/fetch.36
-rw-r--r--lib/libftpio/ftpio.32
-rw-r--r--lib/libipsec/ipsec_set_policy.32
-rw-r--r--lib/libipsec/ipsec_strerror.32
-rw-r--r--lib/libipx/ipx.34
-rw-r--r--lib/libkvm/kvm_geterr.32
-rw-r--r--lib/libkvm/kvm_getfiles.36
-rw-r--r--lib/libkvm/kvm_getloadavg.32
-rw-r--r--lib/libkvm/kvm_getprocs.36
-rw-r--r--lib/libkvm/kvm_getswapinfo.32
-rw-r--r--lib/libkvm/kvm_nlist.34
-rw-r--r--lib/libkvm/kvm_open.34
-rw-r--r--lib/libkvm/kvm_read.32
-rw-r--r--lib/libm/common_source/acos.32
-rw-r--r--lib/libm/common_source/acosh.32
-rw-r--r--lib/libm/common_source/asin.32
-rw-r--r--lib/libm/common_source/asinh.32
-rw-r--r--lib/libm/common_source/atan.32
-rw-r--r--lib/libm/common_source/atan2.32
-rw-r--r--lib/libm/common_source/atanh.32
-rw-r--r--lib/libm/common_source/ceil.32
-rw-r--r--lib/libm/common_source/cos.32
-rw-r--r--lib/libm/common_source/cosh.32
-rw-r--r--lib/libm/common_source/erf.32
-rw-r--r--lib/libm/common_source/exp.32
-rw-r--r--lib/libm/common_source/fabs.32
-rw-r--r--lib/libm/common_source/floor.32
-rw-r--r--lib/libm/common_source/fmod.32
-rw-r--r--lib/libm/common_source/hypot.32
-rw-r--r--lib/libm/common_source/ieee.32
-rw-r--r--lib/libm/common_source/infnan.32
-rw-r--r--lib/libm/common_source/j0.32
-rw-r--r--lib/libm/common_source/lgamma.32
-rw-r--r--lib/libm/common_source/rint.32
-rw-r--r--lib/libm/common_source/sin.32
-rw-r--r--lib/libm/common_source/sinh.32
-rw-r--r--lib/libm/common_source/sqrt.32
-rw-r--r--lib/libm/common_source/tan.32
-rw-r--r--lib/libm/common_source/tanh.32
-rw-r--r--lib/libmd/mdX.34
-rw-r--r--lib/libmd/ripemd.34
-rw-r--r--lib/libmd/sha.34
-rw-r--r--lib/libnetgraph/netgraph.32
-rw-r--r--lib/libpthread/man/pthread_attr.32
-rw-r--r--lib/libpthread/man/pthread_cancel.32
-rw-r--r--lib/libpthread/man/pthread_cleanup_pop.32
-rw-r--r--lib/libpthread/man/pthread_cleanup_push.32
-rw-r--r--lib/libpthread/man/pthread_cond_broadcast.32
-rw-r--r--lib/libpthread/man/pthread_cond_destroy.32
-rw-r--r--lib/libpthread/man/pthread_cond_init.32
-rw-r--r--lib/libpthread/man/pthread_cond_signal.32
-rw-r--r--lib/libpthread/man/pthread_cond_timedwait.32
-rw-r--r--lib/libpthread/man/pthread_cond_wait.32
-rw-r--r--lib/libpthread/man/pthread_condattr.32
-rw-r--r--lib/libpthread/man/pthread_create.32
-rw-r--r--lib/libpthread/man/pthread_detach.32
-rw-r--r--lib/libpthread/man/pthread_equal.32
-rw-r--r--lib/libpthread/man/pthread_exit.32
-rw-r--r--lib/libpthread/man/pthread_getspecific.32
-rw-r--r--lib/libpthread/man/pthread_join.32
-rw-r--r--lib/libpthread/man/pthread_key_create.32
-rw-r--r--lib/libpthread/man/pthread_key_delete.32
-rw-r--r--lib/libpthread/man/pthread_kill.34
-rw-r--r--lib/libpthread/man/pthread_mutex_destroy.32
-rw-r--r--lib/libpthread/man/pthread_mutex_init.32
-rw-r--r--lib/libpthread/man/pthread_mutex_lock.32
-rw-r--r--lib/libpthread/man/pthread_mutex_trylock.32
-rw-r--r--lib/libpthread/man/pthread_mutex_unlock.32
-rw-r--r--lib/libpthread/man/pthread_mutexattr.32
-rw-r--r--lib/libpthread/man/pthread_once.32
-rw-r--r--lib/libpthread/man/pthread_rwlock_destroy.32
-rw-r--r--lib/libpthread/man/pthread_rwlock_init.32
-rw-r--r--lib/libpthread/man/pthread_rwlock_rdlock.32
-rw-r--r--lib/libpthread/man/pthread_rwlock_unlock.32
-rw-r--r--lib/libpthread/man/pthread_rwlock_wrlock.32
-rw-r--r--lib/libpthread/man/pthread_rwlockattr_destroy.32
-rw-r--r--lib/libpthread/man/pthread_rwlockattr_getpshared.32
-rw-r--r--lib/libpthread/man/pthread_rwlockattr_init.32
-rw-r--r--lib/libpthread/man/pthread_rwlockattr_setpshared.32
-rw-r--r--lib/libpthread/man/pthread_schedparam.32
-rw-r--r--lib/libpthread/man/pthread_self.32
-rw-r--r--lib/libpthread/man/pthread_setspecific.32
-rw-r--r--lib/libpthread/man/pthread_sigmask.34
-rw-r--r--lib/libpthread/man/pthread_testcancel.32
-rw-r--r--lib/libpthread/man/sem_destroy.32
-rw-r--r--lib/libpthread/man/sem_getvalue.32
-rw-r--r--lib/libpthread/man/sem_init.32
-rw-r--r--lib/libpthread/man/sem_open.32
-rw-r--r--lib/libpthread/man/sem_post.32
-rw-r--r--lib/libpthread/man/sem_wait.32
-rw-r--r--lib/libpthread/man/sigwait.32
-rw-r--r--lib/libradius/libradius.32
-rw-r--r--lib/libstand/libstand.36
-rw-r--r--lib/libtacplus/libtacplus.32
-rw-r--r--lib/libusb/usb.32
-rw-r--r--lib/libusbhid/usb.32
-rw-r--r--lib/libusbhid/usbhid.32
-rw-r--r--lib/libutil/_secure_path.34
-rw-r--r--lib/libutil/auth.34
-rw-r--r--lib/libutil/extattr.34
-rw-r--r--lib/libutil/fparseln.34
-rw-r--r--lib/libutil/login.36
-rw-r--r--lib/libutil/login_auth.34
-rw-r--r--lib/libutil/login_cap.34
-rw-r--r--lib/libutil/login_class.34
-rw-r--r--lib/libutil/login_ok.36
-rw-r--r--lib/libutil/login_times.36
-rw-r--r--lib/libutil/login_tty.32
-rw-r--r--lib/libutil/logout.34
-rw-r--r--lib/libutil/logwtmp.34
-rw-r--r--lib/libutil/property.34
-rw-r--r--lib/libutil/pty.38
-rw-r--r--lib/libutil/realhostname.36
-rw-r--r--lib/libutil/realhostname_sa.36
-rw-r--r--lib/libutil/trimdomain.34
-rw-r--r--lib/libutil/uucplock.34
-rw-r--r--lib/libvgl/vgl.38
-rw-r--r--lib/msun/man/acos.32
-rw-r--r--lib/msun/man/acosh.32
-rw-r--r--lib/msun/man/asin.32
-rw-r--r--lib/msun/man/asinh.32
-rw-r--r--lib/msun/man/atan.32
-rw-r--r--lib/msun/man/atan2.32
-rw-r--r--lib/msun/man/atanh.32
-rw-r--r--lib/msun/man/ceil.32
-rw-r--r--lib/msun/man/cos.32
-rw-r--r--lib/msun/man/cosh.32
-rw-r--r--lib/msun/man/erf.32
-rw-r--r--lib/msun/man/exp.32
-rw-r--r--lib/msun/man/fabs.32
-rw-r--r--lib/msun/man/floor.32
-rw-r--r--lib/msun/man/fmod.32
-rw-r--r--lib/msun/man/hypot.32
-rw-r--r--lib/msun/man/ieee.32
-rw-r--r--lib/msun/man/ieee_test.32
-rw-r--r--lib/msun/man/j0.32
-rw-r--r--lib/msun/man/lgamma.32
-rw-r--r--lib/msun/man/rint.32
-rw-r--r--lib/msun/man/sin.32
-rw-r--r--lib/msun/man/sinh.32
-rw-r--r--lib/msun/man/sqrt.32
-rw-r--r--lib/msun/man/tan.32
-rw-r--r--lib/msun/man/tanh.32
627 files changed, 903 insertions, 903 deletions
diff --git a/lib/libalias/libalias.3 b/lib/libalias/libalias.3
index aa804db4ab74..bc975c296426 100644
--- a/lib/libalias/libalias.3
+++ b/lib/libalias/libalias.3
@@ -32,9 +32,9 @@
.Nm libalias
.Nd packet aliasing library for masquerading and network address translation
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netinet/in.h>
-.Fd #include <alias.h>
+.In sys/types.h
+.In netinet/in.h
+.In alias.h
.Pp
Function prototypes are given in the main body of the text.
.Sh DESCRIPTION
diff --git a/lib/libc/compat-43/creat.2 b/lib/libc/compat-43/creat.2
index 334fc01de4dc..dcfa4c51bcef 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 dcf62505be74..27b6d6696276 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 13b8f06fac8a..5f4200887a69 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 465d81ed5a15..472e7fb08971 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 53333153eeff..1af1064785b4 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 305f9d210153..f30bcd1fc3d0 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 77dfb67ef977..25f1b14bca5b 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 9fabb3a4d222..99b2b1502ee7 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 e8a21bbc5aff..961ea8589eb9 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 5d38d57c5598..e25e575d4c58 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 f75b8e7bb8a8..4ed6df96f675 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 d3d401d14e12..38787167547c 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 334e094e9bb8..07803569b002 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 94f05901912c..2aac73886111 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 7e97d0908f0f..dba6921f39fb 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 0c76a0c51a52..a6cd7b58fc40 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 a3b6c9201d86..9a17a04ab754 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 1c6d2514fa4f..9106813158f9 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 84c69c03ecc1..1ed1062bcd9d 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 153114db6d20..c9ce0f4e8842 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 d7cc940feea5..ccc60c5a191c 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 e9f3a90ce9a2..cfe14390cdec 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 d94ca4faea61..624cf7244335 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 596fc7a9239c..0e1ca5c529b6 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 9301809b27c0..73cd38c53687 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 480d7c3a6293..45f1d9650de6 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 792b5e67f186..b2754f526387 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 841339bc7665..a3ef1438418a 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 972f0a8d1df5..e11687dc690f 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 f55e477ebb93..a6a8b0243bad 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 de1587e788d4..8236810a1bd5 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 cd7da7a0a5d9..41a50ed42684 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 a2b02443851b..0365598282b4 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 828ab2c74d13..cbf48630f94b 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 eebdabf8089e..d35729e4560d 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 f7c851dddaec..0dadd056e049 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 9acceaf95ee2..068bb87a98af 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 69d1b6737ac6..0c3bee48e92b 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 2998246ea916..06def9d5d86a 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 5c12b60b4b2d..a316bbcb558f 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 e9eadde263e2..ecf53f2f9543 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 76819b16eed5..7c0275d88a21 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 14479f49fdd5..37a8d678d255 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 01cd55d583d2..16f6fcc94490 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 d17ffd2a933c..689aeb791793 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 8e282c5dcd67..c9fd9b004385 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 8b5e2f7aaf6e..cc2fbf012fbc 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 0daeaafc0885..aa921d76b471 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 7f0222d5a7f0..53d39a60526b 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 1ad7a153db8c..634711889369 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 88762e10cc8d..593bef191184 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 6f84cb08c84d..e9eca6f02000 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 ebaf787d96ce..da115ec8920d 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 bdf2cbbc340c..5d46c31895b3 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 f58e372b0411..daca64ed5d16 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 23756b294a71..eb111513daef 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 e8fe770abc6a..6ebe68d6de9c 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 236c49a63824..c728320862ce 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 b60d060fc2ff..9089b002102d 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 3d1d55a09a91..cde32340c2c7 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 838e13a955f2..80f8da625e12 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 aa416625bbd4..76feaf07c638 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 3ee09c084396..aa253194541f 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 38bd0534db36..bfb01ae4620b 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 9597b37791a3..d72dad603753 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 8ffd75ccfff8..1822283ee015 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 c05978e88b84..b4371a26697a 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 fd8052890760..3c291a965110 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 47df68cf5fcc..0a8c2b0802d1 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 e2d82efa2813..8dac8f5e87c0 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 5386bce71034..1e16cbc0c942 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 ef8389f04c6e..73a35c22a2e6 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 0502bd26ab8b..fd090cc31d64 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 82f0946da621..8094a5323888 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 2ad564642e0d..d1cc3a4d3296 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 6226edc3b485..fd517c224a03 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 b735a56a96cb..07c9543cec3d 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 ca6bf6df4a00..71b9f43376a0 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 d015b909ca84..c89ea04a098b 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 29c2a9b95ef1..dd63909c4659 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 548f02e95635..bca8e684826a 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 07ac4daecfc8..6789a2661360 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 35ac103f609c..061913311a3f 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 4a3b4a4aea8c..79aed047fefa 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 5a43ffab20c1..20a5ef033d0e 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 d50da00b41b7..b0296c73950a 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 dbae4d353c4a..dd0a32204003 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 6708055af7d8..d3806f540937 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 529bd801c5cc..4b2d5c587412 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 65bd8260ec00..abbe3419c6da 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 9551466b7b49..8e0373b6e168 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 eafb63aa7053..96c0cfad2b18 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 d04f08451ac3..d6aaa7656552 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 9dfcca34ce67..5c9c36211de2 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 58de728c63b0..b83ccba3a0e5 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 a7d3409f598b..8ddb4690a82b 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 570a88d4b0cb..cb43bcea699c 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 45429d0613e2..4ef554cf48ae 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 9141dfc93d31..ce14a0d11d98 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 1c7622c9ce2f..fd1af45491a8 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 f2b269c0aafa..78bdfd4522c1 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 9a9d5fe27d8a..946f1e0df8a7 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 19302094825f..9f044b9b0374 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 ae89133ff2cb..807e7c53bc90 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 a14eea3081c1..44c48120a061 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 b15847fa13ab..06d290730855 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 f49290a8d420..dcb239a66d86 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 1966d72e8ddd..11621784f0b4 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 fcd1353bc562..76b9cd0f5fac 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 5b74325bb0f1..340c4f272be6 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 6c49cbed4cd4..28f2261f1fd2 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 185b537ea116..9a5eabe020e5 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 5c054685e565..d1ab22804072 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 6b239aab1005..7e460d4e37be 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 54d7e2064cdd..27405d0173aa 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 0a67f79ac122..f30e0a8e267b 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 e40a48dffee9..5c1650da587e 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 cefacad9bae6..070fb9e3a4c0 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 1a52fa35335e..2cabd4d74277 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 e835bfddf5ae..ccf5fc73cf6b 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 fc4720dd714d..9cf875775dd7 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 877f21fa8ce2..12c7459b64e8 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 87622b7bab16..6b9c943d02a3 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 de962f327104..538cf3c9f746 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 95b2427ebacd..ec43a7a03e97 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 0d79a37c789b..bf882558e7a6 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 959f8395b254..7228f7a92859 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 e909dce18bf6..34ac9ce38be6 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 04bbdc79ba2a..7c83ebc619c2 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 8f987e6cf2e1..77628b84b674 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 168da1e49ecb..e9a936ccd80c 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 e879973e4cc6..2c49cecc06c6 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 f9734e211158..664856cf0109 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 4003a83cecb8..ce5d720a8777 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 03c176b55cd1..475ace8d7421 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 6a9ea5529d55..650bda80f6e1 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 cd73f28a01ad..9c56af4db90f 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 b845c28183fe..82a849c680df 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 5572ceafdb06..92d354749fe6 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 f960957a11fc..5860fb837952 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 8dc026c8c8cc..b34fa11174a4 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 23e90ae7e715..746867ef295f 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 d073ac0558a7..8f48481f8004 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 5a0258ea122b..19cdfdf4e523 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 4c8ffd688cf2..9b9ad1c5388d 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 29ae464166aa..0cc039c208c8 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 76a76b815c76..2461694f84e7 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 726a41c7db40..3e1649ac5e23 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 d09bba6b35da..154f514b6953 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 4bc3ed1725fc..4407dca92f30 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 7631c4a3fa79..4b1c6e95beea 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 e8cc2ec209d0..f750bdd63645 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 8d7a686008ca..03371001e249 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 08b6e72c461d..119306526d7d 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 8f13af701502..7910d76101e5 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 c29b45d9d493..733face81fc6 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 f566abbfdccb..592f57cca28a 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 4c0dccc94d29..9fd8b826f9f4 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 6f74b8bf078b..6ce643166db1 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 9be4f69e05e6..5649d12813d9 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 719f7b71bdbb..db3ecfb23e0a 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 7768a41afb0d..fb5976f95ed7 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 1c13bc26b459..c6cdf8db0d51 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 c5820bd29597..47db02f30f8c 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 8e9cea5bf4b5..220638c867ee 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 05c6e1fa3fa1..45cddb09f57f 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 fbc955178f49..3f8d27bc45f5 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 b08b2bad1c59..e43ca2b02e70 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 db185af9c836..cd457c46df85 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 13a1f427dd34..25e8597d550b 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 5121d1ae10fa..c1dd5b52186e 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 179849708d28..96cd55aa3fe8 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 9145c3222592..44477f2b1482 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 b52458862753..293b6006a7c6 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 591ce7f4b20a..be5df9bac53c 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 cfb526fd750d..c14d47ccc341 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 cebf006def17..384d5272c6f8 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 08f2dbd2a0da..1a3fa5077688 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 ce3bd91af9d1..a4d8bfe65445 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 1495990a49c8..abc77d9262a4 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 05e626e45d17..57ce397e4658 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 eb990a236aee..93a05eeb0159 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 9dbdcac72650..6e1b3d998fea 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 01ee569e8ca1..088d3f73453f 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 fbe8952a8786..37ab7b58c4b9 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 9ea0396f59d7..857165f366e5 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 aed8587c04e6..e121ce967546 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 1af929254fb1..caa14bcc5969 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 2493fdad8acd..59a5fc1135c3 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 2ebf5c8dcf41..400650cab258 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 753ced9b8a94..1bf442f75d7a 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 4f246d5c454e..073353dbe6a4 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 542340faf3bd..128bec69bec4 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 ea6b522b6dc4..e45cdae12915 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 fd9e18f9b95d..998ddaa9e3a8 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 cdfa9a008428..77e8b7f0432b 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 c7681c759248..857f55266348 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 e3996eae8b41..740dd1522412 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 f16e452af597..0655d56dbb5d 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 fb1151eebd4c..74a4a21597b9 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 c4d6f0080992..f2d7358938b0 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 3f03c18d265f..190bf8acb041 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 5f9489b39a28..6a46c9aedf33 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 a52b24f0041b..8c154b9610fc 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 43af256b5c94..3a5b5b37e75b 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 134e083bc19d..34d7698e2f61 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 b0f5ef0510bb..7266c026f839 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 65ad98f2c859..03d5e4a163cb 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 1065a48fb8a3..ba531cebc1fe 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 af395367defd..8ee7225c69fe 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 f2d7b2dcb935..f557f7ad1b1f 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 3a6e0c9fd4f1..fd862181d088 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 c6ff3b8ee83f..a65d3ade0aa8 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 e021a330f8f7..6eb7c7230b92 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 309269648607..df6890195a0d 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 3897fc82991c..d402c269f010 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 04cae30877f1..6d7181199b0e 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 9ccad39aa6e3..e11ec7c575b5 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 73678a80cf91..35ccd452fea6 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 6cb42f1878f2..61b5cf23a4f3 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 427b88ed52e9..c54865deaf51 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 ffa699d3defb..26369d605cae 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 6d2b1f96fb5d..ce445433755b 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 2a2d10b7fdff..6d4a79c38e35 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 fe7f31332ec1..29b66b36d99a 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 95ae423397cb..bf2c15f5fc78 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 0a6a649b2ab6..7b81b6b9b8c8 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 27fc96902553..06fe894e01a5 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 220e3e66e422..784bb77e12ff 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 7f180b42bf04..c8165ede408a 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 c463a5558af3..cf088c7e7187 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 fdc7fd237183..aceea37b967b 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 d2b20564902d..d25f1b8dd6ca 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 f91e2f74bebf..0c2c20b0dfb2 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 9a9d037ac5c1..fa61c3d2e4ab 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 054213c0d234..c1506d9a51e8 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 b3d53ef9b0bf..d970e4f5ed5e 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 b4cb993fce33..e6fed171d18e 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 78ffd777d05e..e04678dff1e8 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 c64879ba6388..c11a402a3fff 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 8d06b8b6fb5a..c33dd21eb5ed 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 095ae053fa83..5fecc5bd400d 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 28ec676ec6f6..40526551110e 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 73d34289d416..78038352e376 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 f8d8d6b925b2..71e13b2a617e 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 d0236586df94..902b19ca8df5 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 d74fc1ac8f8a..84f385d3be6b 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 fc56ee67698d..87215534b828 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 1bf3c8f3e742..d38154a4d255 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 267b49679ce5..bc7d786a26af 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 8d14efc68412..39543c3b486c 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 baeca31fc26d..71ab4d58c55f 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 e6c019f11c91..b5ffd1c9708b 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 8941e186bbda..aac8ab7998cf 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 fed597941e68..a24a60c9d338 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 9d8d6eec4541..90c78d41c3f5 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 60d99c480762..33db3c66c8be 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 40cb2f5569f3..2e41cd856227 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 61d04d32571b..0666e7d1a658 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 c3eff53b8efe..2dfda10c45cc 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 c582a70d2ad2..ec91f3568608 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 e714ff24b4c3..447e208c39c0 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 e822f7f841be..fb0d7dbd383b 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 14cf18d2d37c..55a6a41b1fd7 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 07b8f6129b52..69b89453321c 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 4fffc925c1b6..8615f0ff6894 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 b7fa71005480..92a3388ab1a9 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 4d5ec0352354..a930313a3fae 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 e0fe12402aab..ba42c48555c1 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 07e4158c43f8..17ab817cd2dd 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 c29ddf14536e..0cea4277e849 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 814cee57388c..b9a8a1d29657 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 617cf7c19c22..e3efbd835a04 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 02841f7e5401..14b5148c9772 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 ff82e73a3564..24ed0b4be456 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 efeb4e86a7ad..0793374a8f55 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 968f4cecbd7d..736d0681dfb2 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 23cc3c08a877..2460aec49b5a 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 ed41171cf729..ab219bd883b2 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 f6a005171d50..2301aafd7168 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 320e36f4c87c..832356b545a1 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 af5cade2c85b..434775811ee2 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 839805e6116e..b57de3eaef25 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 64bc8c9d6dc5..2d50143b9e2a 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 d59cb8d65e63..d208d9151cf1 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 c554673a3e2c..de01283451a8 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 821572061524..d7b57c6a6343 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 7024168d74f1..3f9d70776a01 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 c215be962bf3..ac3a8d80bd57 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 864878985a4b..13da8b3a60f4 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 05205c625b46..dae7efd45a8d 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 5a165ca709af..91219541dca6 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 65fd888f9228..dc1d067ffe9f 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 eeb9def46521..c46f16e15a67 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 633f3f9a64bc..31f6a4eda490 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 6a6fb0f53f63..9192ae15be12 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 eb1c6182cfb8..975b6c67b667 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 9c2a7b1b462b..d9a7a3f53413 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 9086232b44e0..89c0ecb3085f 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 bb4400459f82..45b767d2c093 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 5e65f2c7a464..f416903ed05a 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 270be1cd3ea1..bf66a08c5311 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 d890bedadcc9..33dcec5fff1e 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 047e5a98ff15..83f14716d1a1 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 33a0167c06b4..ac28aef172bc 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 48d2e0e180c4..769ce32528d3 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 28344ac430fd..a5ed3dc2031a 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 422c1f6fb814..fcaff6cf857b 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 bec4f1479645..8d4d545e7525 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 39215e19a225..3bc8658472c2 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 7b0789d90fcf..3538b38350c9 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 e99e9a863b83..5e3eda7e7c81 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 07e54f65a413..04a32a673ccb 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 28d7a92e18cd..8aa56254f881 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 30209ac663c7..a35f1ed16c2c 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 656d7e71b606..4c9889c1930d 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 d156702110fb..ef45d13bbc4e 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 d573fbc25b6e..5b5c1490347b 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 80e119791297..599bebc97993 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 ea91e62c2249..28002485bc44 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 e5b2c3c5048c..5d0890d7989f 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 c61691e2038b..f570085f5f19 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 a0cb09687b71..2a486d162e4a 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 95873bf23b33..e352adf48adf 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 c4f3c4bc4416..978033944267 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 15c12e09f0d3..c16e12ef7368 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 2e1ff585e06d..10aa6dfd3a89 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 15ff2875587a..eae2f87b4506 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 8180762a6fac..a04f46f8d903 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 4cfc6a80c60c..b7be17a7e45f 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 adaa6e5ed342..8b51be01efe8 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 f5c5ef8092bf..e289a5ed4cd9 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 3382c6800f99..bf56ad000918 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 5b3fe699a8fc..99b06f7a6eb9 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 c2fbf4b7c6e7..f14d5e8a27f0 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 72985119b6bc..1227215b8205 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 e903ff273b19..6060e3f6bfd4 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 9c126c94bb06..d9d9fa9ee05e 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 a9ab96bc6976..1a976587a7a0 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 4f3f4302f9f8..988b52bef3b6 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 5ddfa96fad78..71b464c292ab 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 1bc309f1af9b..d39e75284f35 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 aadb50c55d2e..fd9bbeef30d0 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 25fad1ebef34..cc5cd8ce818a 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 c711690083a6..b85c021afb3b 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 a81c1aaad9e5..36f1f5b8b8fe 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 fd92aa2830c6..8379d8106ee8 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 7e0affc029a6..29a097546580 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 401eb601f81e..35fa7c902320 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 ed6398e27fcc..dc578adbb146 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 9cadabd676f3..d19f46978205 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 d8f8decc295c..dc1b45b366bd 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 fe8df3039d49..369dd595ceff 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 9adc3acd919a..29c4613bbcfb 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 164473002934..33f3724a5c4d 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 b69ef331503c..5a39a4458646 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 d28edc13d3e5..1c240406e474 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 5e4aeeba4ccb..874ce7456dc3 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 90318c02b595..f560af93c98f 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 52f0f98bece8..8372978580c8 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 d594bbce6a72..04a91df4fe3a 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 14b2bd52edd7..7437ef77c1b3 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 a31d14612764..90ce6baaec64 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 9aa5a481efe6..5730dd1de835 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 9c38809d21a9..e4f330aaeccb 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 4708594b4289..fd97e1d9ae50 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 8f247b2c30e3..8e3a19ad71c5 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 7a49e41d438d..3acd69461767 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 8d5523a1c00a..2ef23f7bf9b3 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 8b6b01d58489..687a3171adac 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 80d7f76d3da7..a037a6e9feba 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 373b185800c9..d6e052fd77fb 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 f5175adb16b8..47e0af8b0f25 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 0f1c8d83573c..eba278de490e 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 ac9be7661548..136e70d03d29 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 556b9863c345..35c8627ac4ab 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 2d8240cd8f53..3457a35af461 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 d888bfb91bf3..b0affba71ada 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 2b3df6888dc4..4e3765c6349b 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 b35db9f2b158..b9fad0dc104a 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 7f18510d89c6..ac4e79c67b72 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 8ec9476ee32d..3ef0694ad707 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 24296c2d041d..f073b067fccf 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 3ba324dd3cf0..355298eb8ca8 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 30667d67ee71..14186ead6f4e 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 196534933a0d..d23e48a0c667 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 d1a3b28613bb..ad948f0bcdc9 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 aa8765774c4e..fd5d636c6eed 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 0fffc8b361e7..0dc1cef04dce 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 3403b108556d..5e959f920b41 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 35ac103f609c..061913311a3f 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 63a08bcd9c67..429d0c8087ac 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 e3ab92cf296d..c321e5b911c1 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 b176c536b132..281cc66f6092 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 5cef2e53042d..ed61ecc3ea1b 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 1f9f9505a2b0..187dd01e3f2a 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 e39b8930636b..600e16d01d2a 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 8ab927bb2dc1..e6635d39debb 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 a7bf788883a0..62b3e453251b 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 cc7ca47fc62f..97173455975f 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 280d6d960861..1dbfe0bc6c5a 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 fba1f67d3fdf..76376a6d3131 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 ef2669feec25..990658f94831 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 875aea04b37a..a1e6fb897ac5 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 e6936d3e3831..28d77a7be9b3 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 17e8ebe6d08e..a4b7e8a57970 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 16e7e163f900..a852ba012c4b 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 175ce9fecd89..1fa06667757f 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 d60c0e42c2b2..f304ccec08b7 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 b18dc0a1fa1c..5439747f48ac 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 ea8d639cd3cb..5ecbf8b2e310 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 aa6a4b60d071..6e3a07e9615c 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 026a983e2ce9..c747a632fc39 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 d1fe935bff55..82633147c803 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 2b5e3cb725f2..5a10123d562f 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 1b2ef22aff43..5d9691f99c5f 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 49e36b67fdbb..680b67d8c01a 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 bbb2c57c6500..74309ab4df72 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 5d4fdc265b8d..77fba35cd25a 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 35554a7478ba..96f6fc400fc5 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
diff --git a/lib/libc_r/man/pthread_attr.3 b/lib/libc_r/man/pthread_attr.3
index 5412c5913328..ff692e2ba77f 100644
--- a/lib/libc_r/man/pthread_attr.3
+++ b/lib/libc_r/man/pthread_attr.3
@@ -52,7 +52,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_attr_init "pthread_attr_t *attr"
.Ft int
diff --git a/lib/libc_r/man/pthread_cancel.3 b/lib/libc_r/man/pthread_cancel.3
index 2e392de79984..1b998e6eee1d 100644
--- a/lib/libc_r/man/pthread_cancel.3
+++ b/lib/libc_r/man/pthread_cancel.3
@@ -8,7 +8,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_cancel "pthread_t thread"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_cleanup_pop.3 b/lib/libc_r/man/pthread_cleanup_pop.3
index 38fc46ca05fd..532130320136 100644
--- a/lib/libc_r/man/pthread_cleanup_pop.3
+++ b/lib/libc_r/man/pthread_cleanup_pop.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft void
.Fn pthread_cleanup_pop "int execute"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_cleanup_push.3 b/lib/libc_r/man/pthread_cleanup_push.3
index 5cc2a1e0cb79..b7d797edfe62 100644
--- a/lib/libc_r/man/pthread_cleanup_push.3
+++ b/lib/libc_r/man/pthread_cleanup_push.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft void
.Fn pthread_cleanup_push "void \*[lp]*cleanup_routine\*[rp]\*[lp]void *\*[rp]" "void *arg"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_cond_broadcast.3 b/lib/libc_r/man/pthread_cond_broadcast.3
index f881886ed6cc..b3947bd8ac00 100644
--- a/lib/libc_r/man/pthread_cond_broadcast.3
+++ b/lib/libc_r/man/pthread_cond_broadcast.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_cond_broadcast "pthread_cond_t *cond"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_cond_destroy.3 b/lib/libc_r/man/pthread_cond_destroy.3
index 4ac17f951623..ab1ea0f8d2c3 100644
--- a/lib/libc_r/man/pthread_cond_destroy.3
+++ b/lib/libc_r/man/pthread_cond_destroy.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_cond_destroy "pthread_cond_t *cond"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_cond_init.3 b/lib/libc_r/man/pthread_cond_init.3
index 5339f38259a0..542110bbd6ad 100644
--- a/lib/libc_r/man/pthread_cond_init.3
+++ b/lib/libc_r/man/pthread_cond_init.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_cond_init "pthread_cond_t *cond" "const pthread_condattr_t *attr"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_cond_signal.3 b/lib/libc_r/man/pthread_cond_signal.3
index 654d5a803122..4bb85c942b39 100644
--- a/lib/libc_r/man/pthread_cond_signal.3
+++ b/lib/libc_r/man/pthread_cond_signal.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_cond_signal "pthread_cond_t *cond"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_cond_timedwait.3 b/lib/libc_r/man/pthread_cond_timedwait.3
index b0c56e80fe3a..afd16b5f0d02 100644
--- a/lib/libc_r/man/pthread_cond_timedwait.3
+++ b/lib/libc_r/man/pthread_cond_timedwait.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_cond_timedwait "pthread_cond_t *cond" "pthread_mutex_t *mutex" "const struct timespec *abstime"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_cond_wait.3 b/lib/libc_r/man/pthread_cond_wait.3
index e9fde91842f8..e464a1e524a5 100644
--- a/lib/libc_r/man/pthread_cond_wait.3
+++ b/lib/libc_r/man/pthread_cond_wait.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_cond_wait "pthread_cond_t *cond" "pthread_mutex_t *mutex"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_condattr.3 b/lib/libc_r/man/pthread_condattr.3
index 28df565c60f2..478e11264daf 100644
--- a/lib/libc_r/man/pthread_condattr.3
+++ b/lib/libc_r/man/pthread_condattr.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_condattr_init "pthread_condattr_t *attr"
.Ft int
diff --git a/lib/libc_r/man/pthread_create.3 b/lib/libc_r/man/pthread_create.3
index 5f2d24ce8ed3..53b68abc2dd1 100644
--- a/lib/libc_r/man/pthread_create.3
+++ b/lib/libc_r/man/pthread_create.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_create "pthread_t *thread" "const pthread_attr_t *attr" "void *(*start_routine)(void *)" "void *arg"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_detach.3 b/lib/libc_r/man/pthread_detach.3
index a3b660fdde64..15729af692c3 100644
--- a/lib/libc_r/man/pthread_detach.3
+++ b/lib/libc_r/man/pthread_detach.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_detach "pthread_t thread"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_equal.3 b/lib/libc_r/man/pthread_equal.3
index be55e90b46ba..8b733dabdf4d 100644
--- a/lib/libc_r/man/pthread_equal.3
+++ b/lib/libc_r/man/pthread_equal.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_equal "pthread_t t1" "pthread_t t2"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_exit.3 b/lib/libc_r/man/pthread_exit.3
index 1eabc9bcb94b..0bfdad666029 100644
--- a/lib/libc_r/man/pthread_exit.3
+++ b/lib/libc_r/man/pthread_exit.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft void
.Fn pthread_exit "void *value_ptr"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_getspecific.3 b/lib/libc_r/man/pthread_getspecific.3
index c003f3fca894..c7a04fadb646 100644
--- a/lib/libc_r/man/pthread_getspecific.3
+++ b/lib/libc_r/man/pthread_getspecific.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft void *
.Fn pthread_getspecific "pthread_key_t key"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_join.3 b/lib/libc_r/man/pthread_join.3
index f8e8e18a2fea..98ae70d888ef 100644
--- a/lib/libc_r/man/pthread_join.3
+++ b/lib/libc_r/man/pthread_join.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_join "pthread_t thread" "void **value_ptr"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_key_create.3 b/lib/libc_r/man/pthread_key_create.3
index d1fb92216949..7075dcc53d8a 100644
--- a/lib/libc_r/man/pthread_key_create.3
+++ b/lib/libc_r/man/pthread_key_create.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_key_create "pthread_key_t *key" "void (*destructor)(void *)"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_key_delete.3 b/lib/libc_r/man/pthread_key_delete.3
index 9baa5020f12b..bc0cf8a38aad 100644
--- a/lib/libc_r/man/pthread_key_delete.3
+++ b/lib/libc_r/man/pthread_key_delete.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_key_delete "pthread_key_t key"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_kill.3 b/lib/libc_r/man/pthread_kill.3
index 7a33cf6c6016..e46e2b26013d 100644
--- a/lib/libc_r/man/pthread_kill.3
+++ b/lib/libc_r/man/pthread_kill.3
@@ -35,8 +35,8 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
-.Fd #include <signal.h>
+.In pthread.h
+.In signal.h
.Ft int
.Fn pthread_kill "pthread_t thread" "int sig"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_mutex_destroy.3 b/lib/libc_r/man/pthread_mutex_destroy.3
index f7b915d82820..59d2b48980c5 100644
--- a/lib/libc_r/man/pthread_mutex_destroy.3
+++ b/lib/libc_r/man/pthread_mutex_destroy.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_mutex_destroy "pthread_mutex_t *mutex"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_mutex_init.3 b/lib/libc_r/man/pthread_mutex_init.3
index 42b3a26a61f9..c3fb60cd7a5f 100644
--- a/lib/libc_r/man/pthread_mutex_init.3
+++ b/lib/libc_r/man/pthread_mutex_init.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_mutex_init "pthread_mutex_t *mutex" "const pthread_mutexattr_t *attr"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_mutex_lock.3 b/lib/libc_r/man/pthread_mutex_lock.3
index 972d277eade4..cc35ff21f1ef 100644
--- a/lib/libc_r/man/pthread_mutex_lock.3
+++ b/lib/libc_r/man/pthread_mutex_lock.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_mutex_lock "pthread_mutex_t *mutex"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_mutex_trylock.3 b/lib/libc_r/man/pthread_mutex_trylock.3
index 143df146702c..5de24cee73c6 100644
--- a/lib/libc_r/man/pthread_mutex_trylock.3
+++ b/lib/libc_r/man/pthread_mutex_trylock.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_mutex_trylock "pthread_mutex_t *mutex"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_mutex_unlock.3 b/lib/libc_r/man/pthread_mutex_unlock.3
index 93e635496ec6..d5ae7dc4f4df 100644
--- a/lib/libc_r/man/pthread_mutex_unlock.3
+++ b/lib/libc_r/man/pthread_mutex_unlock.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_mutex_unlock "pthread_mutex_t *mutex"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_mutexattr.3 b/lib/libc_r/man/pthread_mutexattr.3
index 707984606094..7476ae16d6f6 100644
--- a/lib/libc_r/man/pthread_mutexattr.3
+++ b/lib/libc_r/man/pthread_mutexattr.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_mutexattr_init "pthread_mutexattr_t *attr"
.Ft int
diff --git a/lib/libc_r/man/pthread_once.3 b/lib/libc_r/man/pthread_once.3
index 72a132249ccb..7ad97fe98985 100644
--- a/lib/libc_r/man/pthread_once.3
+++ b/lib/libc_r/man/pthread_once.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Pp
pthread_once_t
.Fa once_control
diff --git a/lib/libc_r/man/pthread_rwlock_destroy.3 b/lib/libc_r/man/pthread_rwlock_destroy.3
index 70acf928ebe2..b65e0656750a 100644
--- a/lib/libc_r/man/pthread_rwlock_destroy.3
+++ b/lib/libc_r/man/pthread_rwlock_destroy.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlock_destroy "pthread_rwlock_t *lock"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_rwlock_init.3 b/lib/libc_r/man/pthread_rwlock_init.3
index 749a848d41d6..0360987db1e3 100644
--- a/lib/libc_r/man/pthread_rwlock_init.3
+++ b/lib/libc_r/man/pthread_rwlock_init.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlock_init "pthread_rwlock_t *lock" "const pthread_rwlockattr_t *attr"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_rwlock_rdlock.3 b/lib/libc_r/man/pthread_rwlock_rdlock.3
index d3ec9efe14cc..88dbb17fa599 100644
--- a/lib/libc_r/man/pthread_rwlock_rdlock.3
+++ b/lib/libc_r/man/pthread_rwlock_rdlock.3
@@ -34,7 +34,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlock_rdlock "pthread_rwlock_t *lock"
.Ft int
diff --git a/lib/libc_r/man/pthread_rwlock_unlock.3 b/lib/libc_r/man/pthread_rwlock_unlock.3
index f99b9558663a..9391f75df7af 100644
--- a/lib/libc_r/man/pthread_rwlock_unlock.3
+++ b/lib/libc_r/man/pthread_rwlock_unlock.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlock_unlock "pthread_rwlock_t *lock"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_rwlock_wrlock.3 b/lib/libc_r/man/pthread_rwlock_wrlock.3
index 149a7a0fb450..55ab5f933468 100644
--- a/lib/libc_r/man/pthread_rwlock_wrlock.3
+++ b/lib/libc_r/man/pthread_rwlock_wrlock.3
@@ -34,7 +34,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlock_wrlock "pthread_rwlock_t *lock"
.Ft int
diff --git a/lib/libc_r/man/pthread_rwlockattr_destroy.3 b/lib/libc_r/man/pthread_rwlockattr_destroy.3
index ab6a6e17768b..3ba97cf5e12c 100644
--- a/lib/libc_r/man/pthread_rwlockattr_destroy.3
+++ b/lib/libc_r/man/pthread_rwlockattr_destroy.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlockattr_destroy "pthread_rwlockattr_t *attr"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_rwlockattr_getpshared.3 b/lib/libc_r/man/pthread_rwlockattr_getpshared.3
index 40eed6e0232a..56bda4409c13 100644
--- a/lib/libc_r/man/pthread_rwlockattr_getpshared.3
+++ b/lib/libc_r/man/pthread_rwlockattr_getpshared.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlockattr_getpshared "const pthread_rwlockattr_t *attr" "int *pshared"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_rwlockattr_init.3 b/lib/libc_r/man/pthread_rwlockattr_init.3
index 4fbbe3676097..a4aef31fc289 100644
--- a/lib/libc_r/man/pthread_rwlockattr_init.3
+++ b/lib/libc_r/man/pthread_rwlockattr_init.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlockattr_init "pthread_rwlockattr_t *attr"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_rwlockattr_setpshared.3 b/lib/libc_r/man/pthread_rwlockattr_setpshared.3
index dfc7fe625ce2..48b854d21a6b 100644
--- a/lib/libc_r/man/pthread_rwlockattr_setpshared.3
+++ b/lib/libc_r/man/pthread_rwlockattr_setpshared.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlockattr_setpshared "pthread_rwlockattr_t *attr" "int pshared"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_schedparam.3 b/lib/libc_r/man/pthread_schedparam.3
index 50c556f2824a..c76f4d9033ed 100644
--- a/lib/libc_r/man/pthread_schedparam.3
+++ b/lib/libc_r/man/pthread_schedparam.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_setschedparam "pthread_t thread" "int policy" "const struct sched_param *param"
.Ft int
diff --git a/lib/libc_r/man/pthread_self.3 b/lib/libc_r/man/pthread_self.3
index acd46e9955b7..899af43094f3 100644
--- a/lib/libc_r/man/pthread_self.3
+++ b/lib/libc_r/man/pthread_self.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft pthread_t
.Fn pthread_self "void"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_setspecific.3 b/lib/libc_r/man/pthread_setspecific.3
index 5265def7e7f1..5bc274c6e640 100644
--- a/lib/libc_r/man/pthread_setspecific.3
+++ b/lib/libc_r/man/pthread_setspecific.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_setspecific "pthread_key_t key" "const void *value"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_sigmask.3 b/lib/libc_r/man/pthread_sigmask.3
index 2b23d3ba8149..5efa9256b6a1 100644
--- a/lib/libc_r/man/pthread_sigmask.3
+++ b/lib/libc_r/man/pthread_sigmask.3
@@ -35,8 +35,8 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
-.Fd #include <signal.h>
+.In pthread.h
+.In signal.h
.Ft int
.Fn pthread_sigmask "int how" "const sigset_t *set" "sigset_t *oset"
.Sh DESCRIPTION
diff --git a/lib/libc_r/man/pthread_testcancel.3 b/lib/libc_r/man/pthread_testcancel.3
index 110ab38b2cd7..95672fa1efb4 100644
--- a/lib/libc_r/man/pthread_testcancel.3
+++ b/lib/libc_r/man/pthread_testcancel.3
@@ -10,7 +10,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_setcancelstate "int state" "int *oldstate"
.Ft int
diff --git a/lib/libc_r/man/sem_destroy.3 b/lib/libc_r/man/sem_destroy.3
index 82f0946da621..8094a5323888 100644
--- a/lib/libc_r/man/sem_destroy.3
+++ b/lib/libc_r/man/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_r/man/sem_getvalue.3 b/lib/libc_r/man/sem_getvalue.3
index 2ad564642e0d..d1cc3a4d3296 100644
--- a/lib/libc_r/man/sem_getvalue.3
+++ b/lib/libc_r/man/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_r/man/sem_init.3 b/lib/libc_r/man/sem_init.3
index 6226edc3b485..fd517c224a03 100644
--- a/lib/libc_r/man/sem_init.3
+++ b/lib/libc_r/man/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_r/man/sem_open.3 b/lib/libc_r/man/sem_open.3
index b735a56a96cb..07c9543cec3d 100644
--- a/lib/libc_r/man/sem_open.3
+++ b/lib/libc_r/man/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_r/man/sem_post.3 b/lib/libc_r/man/sem_post.3
index ca6bf6df4a00..71b9f43376a0 100644
--- a/lib/libc_r/man/sem_post.3
+++ b/lib/libc_r/man/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_r/man/sem_wait.3 b/lib/libc_r/man/sem_wait.3
index d015b909ca84..c89ea04a098b 100644
--- a/lib/libc_r/man/sem_wait.3
+++ b/lib/libc_r/man/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_r/man/sigwait.3 b/lib/libc_r/man/sigwait.3
index fba1f67d3fdf..76376a6d3131 100644
--- a/lib/libc_r/man/sigwait.3
+++ b/lib/libc_r/man/sigwait.3
@@ -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/libcalendar/calendar.3 b/lib/libcalendar/calendar.3
index 1e7b51a04897..616399ca47fd 100644
--- a/lib/libcalendar/calendar.3
+++ b/lib/libcalendar/calendar.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libcalendar
.Sh SYNOPSIS
-.Fd #include <calendar.h>
+.In calendar.h
.Ft struct date *
.Fn easterg "int year" "struct date *dt"
.Ft struct date *
diff --git a/lib/libcam/cam.3 b/lib/libcam/cam.3
index 2253bda28308..439fe788d842 100644
--- a/lib/libcam/cam.3
+++ b/lib/libcam/cam.3
@@ -48,8 +48,8 @@
.Sh LIBRARY
.Lb libcam
.Sh SYNOPSIS
-.Fd #include <stdio.h>
-.Fd #include <camlib.h>
+.In stdio.h
+.In camlib.h
.Ft struct cam_device *
.Fo cam_open_device
.Fa "const char *path"
diff --git a/lib/libcam/cam_cdbparse.3 b/lib/libcam/cam_cdbparse.3
index e7612491a7d5..8379899dbb5c 100644
--- a/lib/libcam/cam_cdbparse.3
+++ b/lib/libcam/cam_cdbparse.3
@@ -78,8 +78,8 @@
.Sh LIBRARY
.Lb libcam
.Sh SYNOPSIS
-.Fd #include <stdio.h>
-.Fd #include <camlib.h>
+.In stdio.h
+.In camlib.h
.Ft int
.Fo csio_build
.Fa "struct ccb_scsiio *csio"
diff --git a/lib/libcompat/4.1/cftime.3 b/lib/libcompat/4.1/cftime.3
index fd4e0668e866..84b094b05e42 100644
--- a/lib/libcompat/4.1/cftime.3
+++ b/lib/libcompat/4.1/cftime.3
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libcompat
.Sh SYNOPSIS
-.Fd #include <time.h>
+.In time.h
.Ft int
.Fn cftime "char *s" "char *format" "const time_t *clock"
.Ft int
diff --git a/lib/libcompat/4.1/ftime.3 b/lib/libcompat/4.1/ftime.3
index 26423876dab0..4a80a8fbc89a 100644
--- a/lib/libcompat/4.1/ftime.3
+++ b/lib/libcompat/4.1/ftime.3
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libcompat
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/timeb.h>
+.In sys/types.h
+.In sys/timeb.h
.Ft int
.Fn ftime "struct timeb *tp"
.Sh DESCRIPTION
diff --git a/lib/libcompat/4.1/getpw.3 b/lib/libcompat/4.1/getpw.3
index f1a57c5e1784..3897136b9123 100644
--- a/lib/libcompat/4.1/getpw.3
+++ b/lib/libcompat/4.1/getpw.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libcompat
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
+.In sys/types.h
.Ft int
.Fn getpw "uid_t uid" "char *buf"
.Sh DESCRIPTION
diff --git a/lib/libcompat/4.1/stty.3 b/lib/libcompat/4.1/stty.3
index a1f89d1a2528..71b46147d800 100644
--- a/lib/libcompat/4.1/stty.3
+++ b/lib/libcompat/4.1/stty.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libcompat
.Sh SYNOPSIS
-.Fd #include <sgtty.h>
+.In sgtty.h
.Ft int
.Fn stty "int fd" "struct sgttyb *buf"
.Ft int
diff --git a/lib/libcompat/4.3/lsearch.3 b/lib/libcompat/4.3/lsearch.3
index 40b2c3e834cc..3863ce1e62d6 100644
--- a/lib/libcompat/4.3/lsearch.3
+++ b/lib/libcompat/4.3/lsearch.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libcompat
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
+.In sys/types.h
.Ft char *
.Fn lsearch "const void *key" "const void *base" "size_t *nelp" "size_t width" "int (*compar)(void *, void *)"
.Ft char *
diff --git a/lib/libcompat/4.3/re_comp.3 b/lib/libcompat/4.3/re_comp.3
index c4830b06fb12..902ef3d5e400 100644
--- a/lib/libcompat/4.3/re_comp.3
+++ b/lib/libcompat/4.3/re_comp.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libcompat
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft char *
.Fn re_comp "const char *s"
.Ft int
diff --git a/lib/libcompat/4.4/cuserid.3 b/lib/libcompat/4.4/cuserid.3
index 5141c0341d8e..dc4bf536731c 100644
--- a/lib/libcompat/4.4/cuserid.3
+++ b/lib/libcompat/4.4/cuserid.3
@@ -40,7 +40,7 @@
.Sh LIBRARY
.Lb libcompat
.Sh SYNOPSIS
-.Fd #include <stdio.h>
+.In stdio.h
.Ft char *
.Fn cuserid "char *s"
.Sh DESCRIPTION
diff --git a/lib/libcompat/regexp/regexp.3 b/lib/libcompat/regexp/regexp.3
index 3ddf30b29a22..601ffbd66e51 100644
--- a/lib/libcompat/regexp/regexp.3
+++ b/lib/libcompat/regexp/regexp.3
@@ -44,7 +44,7 @@
.Sh LIBRARY
.Lb libcompat
.Sh SYNOPSIS
-.Fd #include <regexp.h>
+.In regexp.h
.Ft regexp *
.Fn regcomp "const char *exp"
.Ft int
diff --git a/lib/libcrypt/crypt.3 b/lib/libcrypt/crypt.3
index d4d3020c94c1..a86c33296c43 100644
--- a/lib/libcrypt/crypt.3
+++ b/lib/libcrypt/crypt.3
@@ -40,7 +40,7 @@
.Sh LIBRARY
.Lb libcrypt
.Sh SYNOPSIS
-.Fd #include <unistd.h>
+.In unistd.h
.Ft char *
.Fn crypt "const char *key" "const char *salt"
.Ft const char *
diff --git a/lib/libdevinfo/devinfo.3 b/lib/libdevinfo/devinfo.3
index 76dd7b06777d..ec1a5e1e05a6 100644
--- a/lib/libdevinfo/devinfo.3
+++ b/lib/libdevinfo/devinfo.3
@@ -43,7 +43,7 @@
.Sh LIBRARY
.Lb libdevinfo
.Sh SYNOPSIS
-.Fd #include <devinfo.h>
+.In devinfo.h
.Ft int
.Fn devinfo_init "void"
.Ft void
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index 6e25954bbf11..460cc4b0af59 100644
--- a/lib/libdevstat/devstat.3
+++ b/lib/libdevstat/devstat.3
@@ -54,8 +54,8 @@
.Sh LIBRARY
.Lb libdevstat
.Sh SYNOPSIS
-.Fd #include <sys/dkstat.h>
-.Fd #include <devstat.h>
+.In sys/dkstat.h
+.In devstat.h
.Ft int
.Fo devstat_getnumdevs
.Fa "kvm_t *kd"
diff --git a/lib/libdisk/libdisk.3 b/lib/libdisk/libdisk.3
index 8f3c9cf7d9ab..91ceb4797160 100644
--- a/lib/libdisk/libdisk.3
+++ b/lib/libdisk/libdisk.3
@@ -63,8 +63,8 @@
.Sh LIBRARY
.Lb libdisk
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <libdisk.h>
+.In sys/types.h
+.In libdisk.h
.Pp
.Vt extern const char *chunk_n[] ;
.Ft const char *
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index f37735b9d6c9..fe7c175e0690 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -60,9 +60,9 @@
.Sh LIBRARY
.Lb libfetch
.Sh SYNOPSIS
-.Fd #include <sys/param.h>
-.Fd #include <stdio.h>
-.Fd #include <fetch.h>
+.In sys/param.h
+.In stdio.h
+.In fetch.h
.Ft struct url *
.Fn fetchMakeURL "const char *scheme" "const char *host" "int port" "const char *doc" "const char *user" "const char *pwd"
.Ft struct url *
diff --git a/lib/libftpio/ftpio.3 b/lib/libftpio/ftpio.3
index e8af68976004..38527913c3a2 100644
--- a/lib/libftpio/ftpio.3
+++ b/lib/libftpio/ftpio.3
@@ -45,7 +45,7 @@
.Nm ftpPutURLAf
.Nd FTPIO user library
.Sh SYNOPSIS
-.Fd #include <ftpio.h>
+.In ftpio.h
.Ft FILE *
.Fn ftpLogin "char *host" "char *user" "char *passwd" "int ftp_port" "int verbose" "int *retcode"
.Ft int
diff --git a/lib/libipsec/ipsec_set_policy.3 b/lib/libipsec/ipsec_set_policy.3
index 748ac1a1f8e7..cc7424ed9079 100644
--- a/lib/libipsec/ipsec_set_policy.3
+++ b/lib/libipsec/ipsec_set_policy.3
@@ -40,7 +40,7 @@
.Sh LIBRARY
.Lb libipsec
.Sh SYNOPSIS
-.Fd #include <netinet6/ipsec.h>
+.In netinet6/ipsec.h
.Ft "char *"
.Fn ipsec_set_policy "char *policy" "int len"
.Ft int
diff --git a/lib/libipsec/ipsec_strerror.3 b/lib/libipsec/ipsec_strerror.3
index 82fa99c89fc3..e4bde7d6b6f2 100644
--- a/lib/libipsec/ipsec_strerror.3
+++ b/lib/libipsec/ipsec_strerror.3
@@ -37,7 +37,7 @@
.Nd error message for IPsec policy manipulation library
.\"
.Sh SYNOPSIS
-.Fd #include <netinet6/ipsec.h>
+.In netinet6/ipsec.h
.Ft "const char *"
.Fn ipsec_strerror
.\"
diff --git a/lib/libipx/ipx.3 b/lib/libipx/ipx.3
index 93e21e266b04..e72ad6b0e05a 100644
--- a/lib/libipx/ipx.3
+++ b/lib/libipx/ipx.3
@@ -41,8 +41,8 @@
.Sh LIBRARY
.Lb libipx
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netipx/ipx.h>
+.In sys/types.h
+.In netipx/ipx.h
.Ft struct ipx_addr
.Fn ipx_addr "const char *cp"
.Ft char *
diff --git a/lib/libkvm/kvm_geterr.3 b/lib/libkvm/kvm_geterr.3
index 815828d49ab5..754d82213a06 100644
--- a/lib/libkvm/kvm_geterr.3
+++ b/lib/libkvm/kvm_geterr.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libkvm
.Sh SYNOPSIS
-.Fd #include <kvm.h>
+.In kvm.h
.Ft char *
.Fn kvm_geterr "kvm_t *kd"
.Sh DESCRIPTION
diff --git a/lib/libkvm/kvm_getfiles.3 b/lib/libkvm/kvm_getfiles.3
index 73272f834a75..793116de3067 100644
--- a/lib/libkvm/kvm_getfiles.3
+++ b/lib/libkvm/kvm_getfiles.3
@@ -45,10 +45,10 @@
.Sh LIBRARY
.Lb libkvm
.Sh SYNOPSIS
-.Fd #include <kvm.h>
-.Fd #include <sys/types.h>
+.In kvm.h
+.In sys/types.h
.Fd #define _KERNEL
-.Fd #include <sys/file.h>
+.In sys/file.h
.Fd #undef _KERNEL
.\" .Fa kvm_t *kd
.Ft char *
diff --git a/lib/libkvm/kvm_getloadavg.3 b/lib/libkvm/kvm_getloadavg.3
index a6137fdc7dbc..23310bc7ef16 100644
--- a/lib/libkvm/kvm_getloadavg.3
+++ b/lib/libkvm/kvm_getloadavg.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libkvm
.Sh SYNOPSIS
-.Fd #include <kvm.h>
+.In kvm.h
.Ft int
.Fn kvm_getloadavg "kvm_t *kd" "double loadavg[]" "int nelem"
.Sh DESCRIPTION
diff --git a/lib/libkvm/kvm_getprocs.3 b/lib/libkvm/kvm_getprocs.3
index e5e451d326fb..15b9b3df33a0 100644
--- a/lib/libkvm/kvm_getprocs.3
+++ b/lib/libkvm/kvm_getprocs.3
@@ -47,9 +47,9 @@
.Sh LIBRARY
.Lb libkvm
.Sh SYNOPSIS
-.Fd #include <kvm.h>
-.Fd #include <sys/param.h>
-.Fd #include <sys/sysctl.h>
+.In kvm.h
+.In sys/param.h
+.In sys/sysctl.h
.\" .Fa kvm_t *kd
.Ft struct kinfo_proc *
.Fn kvm_getprocs "kvm_t *kd" "int op" "int arg" "int *cnt"
diff --git a/lib/libkvm/kvm_getswapinfo.3 b/lib/libkvm/kvm_getswapinfo.3
index 21f988b5bf50..d28fc053a384 100644
--- a/lib/libkvm/kvm_getswapinfo.3
+++ b/lib/libkvm/kvm_getswapinfo.3
@@ -15,7 +15,7 @@
.Sh LIBRARY
.Lb libkvm
.Sh SYNOPSIS
-.Fd #include <kvm.h>
+.In kvm.h
.Ft int
.Fn kvm_getswapinfo "kvm_t *kd" "struct kvm_swap *" "int maxswap" "int flags"
.Sh DESCRIPTION
diff --git a/lib/libkvm/kvm_nlist.3 b/lib/libkvm/kvm_nlist.3
index 1fda8202f3a1..bb53858f6b88 100644
--- a/lib/libkvm/kvm_nlist.3
+++ b/lib/libkvm/kvm_nlist.3
@@ -45,8 +45,8 @@
.Sh LIBRARY
.Lb libkvm
.Sh SYNOPSIS
-.Fd #include <kvm.h>
-.Fd #include <nlist.h>
+.In kvm.h
+.In nlist.h
.Ft int
.Fn kvm_nlist "kvm_t *kd" "struct nlist *nl"
.Sh DESCRIPTION
diff --git a/lib/libkvm/kvm_open.3 b/lib/libkvm/kvm_open.3
index b3b0441c2bc9..04990b4e9ded 100644
--- a/lib/libkvm/kvm_open.3
+++ b/lib/libkvm/kvm_open.3
@@ -47,8 +47,8 @@
.Sh LIBRARY
.Lb libkvm
.Sh SYNOPSIS
-.Fd #include <fcntl.h>
-.Fd #include <kvm.h>
+.In fcntl.h
+.In kvm.h
.Ft kvm_t *
.Fn kvm_open "const char *execfile" "const char *corefile" "const char *swapfile" "int flags" "const char *errstr"
.Ft kvm_t *
diff --git a/lib/libkvm/kvm_read.3 b/lib/libkvm/kvm_read.3
index cfde604a80ba..2e5a3fb1eeed 100644
--- a/lib/libkvm/kvm_read.3
+++ b/lib/libkvm/kvm_read.3
@@ -46,7 +46,7 @@
.Sh LIBRARY
.Lb libkvm
.Sh SYNOPSIS
-.Fd #include <kvm.h>
+.In kvm.h
.Ft ssize_t
.Fn kvm_read "kvm_t *kd" "unsigned long addr" "void *buf" "size_t nbytes"
.Ft ssize_t
diff --git a/lib/libm/common_source/acos.3 b/lib/libm/common_source/acos.3
index b19dde4e10a7..5393247adcc6 100644
--- a/lib/libm/common_source/acos.3
+++ b/lib/libm/common_source/acos.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn acos "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/acosh.3 b/lib/libm/common_source/acosh.3
index 495f3d7bdb9c..597e63364515 100644
--- a/lib/libm/common_source/acosh.3
+++ b/lib/libm/common_source/acosh.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn acosh "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/asin.3 b/lib/libm/common_source/asin.3
index a1571abac47e..c45c3b14c7d3 100644
--- a/lib/libm/common_source/asin.3
+++ b/lib/libm/common_source/asin.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn asin "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/asinh.3 b/lib/libm/common_source/asinh.3
index 7266dade40d6..e9b50fc20d7a 100644
--- a/lib/libm/common_source/asinh.3
+++ b/lib/libm/common_source/asinh.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn asinh "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/atan.3 b/lib/libm/common_source/atan.3
index 2cc38f5ee8dd..b62719066126 100644
--- a/lib/libm/common_source/atan.3
+++ b/lib/libm/common_source/atan.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn atan "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/atan2.3 b/lib/libm/common_source/atan2.3
index dba32d4dee71..e4a447c6551d 100644
--- a/lib/libm/common_source/atan2.3
+++ b/lib/libm/common_source/atan2.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn atan2 "double y" "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/atanh.3 b/lib/libm/common_source/atanh.3
index db67a382bd39..065fd6d5eb4a 100644
--- a/lib/libm/common_source/atanh.3
+++ b/lib/libm/common_source/atanh.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn atanh "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/ceil.3 b/lib/libm/common_source/ceil.3
index 1aa6f2d3389d..031f40fcb9a4 100644
--- a/lib/libm/common_source/ceil.3
+++ b/lib/libm/common_source/ceil.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn ceil "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/cos.3 b/lib/libm/common_source/cos.3
index 6695270bc5cd..af528416494a 100644
--- a/lib/libm/common_source/cos.3
+++ b/lib/libm/common_source/cos.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn cos "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/cosh.3 b/lib/libm/common_source/cosh.3
index 47cb32099271..ef97b480ba45 100644
--- a/lib/libm/common_source/cosh.3
+++ b/lib/libm/common_source/cosh.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn cosh "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/erf.3 b/lib/libm/common_source/erf.3
index d0f407188183..a76815ae26e8 100644
--- a/lib/libm/common_source/erf.3
+++ b/lib/libm/common_source/erf.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn erf "double x"
.Ft double
diff --git a/lib/libm/common_source/exp.3 b/lib/libm/common_source/exp.3
index 842b72c54429..fa31db8e02e0 100644
--- a/lib/libm/common_source/exp.3
+++ b/lib/libm/common_source/exp.3
@@ -46,7 +46,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn exp "double x"
.Ft double
diff --git a/lib/libm/common_source/fabs.3 b/lib/libm/common_source/fabs.3
index 2ffeaed4b205..9a5533cc4b73 100644
--- a/lib/libm/common_source/fabs.3
+++ b/lib/libm/common_source/fabs.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn fabs "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/floor.3 b/lib/libm/common_source/floor.3
index e2d848f5668b..1751f815abec 100644
--- a/lib/libm/common_source/floor.3
+++ b/lib/libm/common_source/floor.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn floor "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/fmod.3 b/lib/libm/common_source/fmod.3
index 57619692cd34..9f5b2062d273 100644
--- a/lib/libm/common_source/fmod.3
+++ b/lib/libm/common_source/fmod.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn fmod "double x" "double y"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/hypot.3 b/lib/libm/common_source/hypot.3
index 7c1b14aecc27..1c53d7dd937d 100644
--- a/lib/libm/common_source/hypot.3
+++ b/lib/libm/common_source/hypot.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn hypot "double x" "double y"
.Vt struct {double x, y;} z ;
diff --git a/lib/libm/common_source/ieee.3 b/lib/libm/common_source/ieee.3
index c0e04740f551..a906ba193855 100644
--- a/lib/libm/common_source/ieee.3
+++ b/lib/libm/common_source/ieee.3
@@ -45,7 +45,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn copysign "double x" "double y"
.Ft double
diff --git a/lib/libm/common_source/infnan.3 b/lib/libm/common_source/infnan.3
index 1b6927eb2cfa..94a0094423d4 100644
--- a/lib/libm/common_source/infnan.3
+++ b/lib/libm/common_source/infnan.3
@@ -43,7 +43,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn infnan "int iarg"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/j0.3 b/lib/libm/common_source/j0.3
index 5bfb9a7b6087..dbc603d2b50a 100644
--- a/lib/libm/common_source/j0.3
+++ b/lib/libm/common_source/j0.3
@@ -46,7 +46,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn j0 "double x"
.Ft double
diff --git a/lib/libm/common_source/lgamma.3 b/lib/libm/common_source/lgamma.3
index 24f769e24faf..13dcee968420 100644
--- a/lib/libm/common_source/lgamma.3
+++ b/lib/libm/common_source/lgamma.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft extern int
.Fa signgam ;
.sp
diff --git a/lib/libm/common_source/rint.3 b/lib/libm/common_source/rint.3
index 010ec60d14b4..599851ca4786 100644
--- a/lib/libm/common_source/rint.3
+++ b/lib/libm/common_source/rint.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn rint "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/sin.3 b/lib/libm/common_source/sin.3
index abf34883b556..fba047640c81 100644
--- a/lib/libm/common_source/sin.3
+++ b/lib/libm/common_source/sin.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn sin "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/sinh.3 b/lib/libm/common_source/sinh.3
index a5cfbee4ecef..2b1c0d76263b 100644
--- a/lib/libm/common_source/sinh.3
+++ b/lib/libm/common_source/sinh.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn sinh "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/sqrt.3 b/lib/libm/common_source/sqrt.3
index 3fc833ec43c8..36c42875aa22 100644
--- a/lib/libm/common_source/sqrt.3
+++ b/lib/libm/common_source/sqrt.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn cbrt "double x"
.Ft double
diff --git a/lib/libm/common_source/tan.3 b/lib/libm/common_source/tan.3
index 526be7da57d3..3365dc6ea06e 100644
--- a/lib/libm/common_source/tan.3
+++ b/lib/libm/common_source/tan.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn tan "double x"
.Sh DESCRIPTION
diff --git a/lib/libm/common_source/tanh.3 b/lib/libm/common_source/tanh.3
index 1201b508bfc2..ab181a404a21 100644
--- a/lib/libm/common_source/tanh.3
+++ b/lib/libm/common_source/tanh.3
@@ -41,7 +41,7 @@
.Sh LIBRARY
.Lb libm
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn tanh "double x"
.Sh DESCRIPTION
diff --git a/lib/libmd/mdX.3 b/lib/libmd/mdX.3
index 9dfe187c5af5..b6fe196447f4 100644
--- a/lib/libmd/mdX.3
+++ b/lib/libmd/mdX.3
@@ -24,8 +24,8 @@
.Sh LIBRARY
.Lb libmd
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <mdX.h>
+.In sys/types.h
+.In mdX.h
.Ft void
.Fn MDXInit "MDX_CTX *context"
.Ft void
diff --git a/lib/libmd/ripemd.3 b/lib/libmd/ripemd.3
index 2e2abc82a1d9..8dab81364250 100644
--- a/lib/libmd/ripemd.3
+++ b/lib/libmd/ripemd.3
@@ -24,8 +24,8 @@
.Sh LIBRARY
.Lb libmd
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <ripemd.h>
+.In sys/types.h
+.In ripemd.h
.Ft void
.Fn RIPEMD160_Init "RIPEMD160_CTX *context"
.Ft void
diff --git a/lib/libmd/sha.3 b/lib/libmd/sha.3
index 9151857b7963..ff12f4449c5a 100644
--- a/lib/libmd/sha.3
+++ b/lib/libmd/sha.3
@@ -31,8 +31,8 @@
.Sh LIBRARY
.Lb libmd
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sha.h>
+.In sys/types.h
+.In sha.h
.Ft void
.Fn SHA_Init "SHA_CTX *context"
.Ft void
diff --git a/lib/libnetgraph/netgraph.3 b/lib/libnetgraph/netgraph.3
index 53a2b5f6408a..8a35cae2902f 100644
--- a/lib/libnetgraph/netgraph.3
+++ b/lib/libnetgraph/netgraph.3
@@ -51,7 +51,7 @@
.Sh LIBRARY
.Lb libnetgraph
.Sh SYNOPSIS
-.Fd #include <netgraph.h>
+.In netgraph.h
.Ft int
.Fn NgMkSockNode "const char *name" "int *csp" "int *dsp"
.Ft int
diff --git a/lib/libpthread/man/pthread_attr.3 b/lib/libpthread/man/pthread_attr.3
index 5412c5913328..ff692e2ba77f 100644
--- a/lib/libpthread/man/pthread_attr.3
+++ b/lib/libpthread/man/pthread_attr.3
@@ -52,7 +52,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_attr_init "pthread_attr_t *attr"
.Ft int
diff --git a/lib/libpthread/man/pthread_cancel.3 b/lib/libpthread/man/pthread_cancel.3
index 2e392de79984..1b998e6eee1d 100644
--- a/lib/libpthread/man/pthread_cancel.3
+++ b/lib/libpthread/man/pthread_cancel.3
@@ -8,7 +8,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_cancel "pthread_t thread"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_cleanup_pop.3 b/lib/libpthread/man/pthread_cleanup_pop.3
index 38fc46ca05fd..532130320136 100644
--- a/lib/libpthread/man/pthread_cleanup_pop.3
+++ b/lib/libpthread/man/pthread_cleanup_pop.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft void
.Fn pthread_cleanup_pop "int execute"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_cleanup_push.3 b/lib/libpthread/man/pthread_cleanup_push.3
index 5cc2a1e0cb79..b7d797edfe62 100644
--- a/lib/libpthread/man/pthread_cleanup_push.3
+++ b/lib/libpthread/man/pthread_cleanup_push.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft void
.Fn pthread_cleanup_push "void \*[lp]*cleanup_routine\*[rp]\*[lp]void *\*[rp]" "void *arg"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_cond_broadcast.3 b/lib/libpthread/man/pthread_cond_broadcast.3
index f881886ed6cc..b3947bd8ac00 100644
--- a/lib/libpthread/man/pthread_cond_broadcast.3
+++ b/lib/libpthread/man/pthread_cond_broadcast.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_cond_broadcast "pthread_cond_t *cond"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_cond_destroy.3 b/lib/libpthread/man/pthread_cond_destroy.3
index 4ac17f951623..ab1ea0f8d2c3 100644
--- a/lib/libpthread/man/pthread_cond_destroy.3
+++ b/lib/libpthread/man/pthread_cond_destroy.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_cond_destroy "pthread_cond_t *cond"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_cond_init.3 b/lib/libpthread/man/pthread_cond_init.3
index 5339f38259a0..542110bbd6ad 100644
--- a/lib/libpthread/man/pthread_cond_init.3
+++ b/lib/libpthread/man/pthread_cond_init.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_cond_init "pthread_cond_t *cond" "const pthread_condattr_t *attr"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_cond_signal.3 b/lib/libpthread/man/pthread_cond_signal.3
index 654d5a803122..4bb85c942b39 100644
--- a/lib/libpthread/man/pthread_cond_signal.3
+++ b/lib/libpthread/man/pthread_cond_signal.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_cond_signal "pthread_cond_t *cond"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_cond_timedwait.3 b/lib/libpthread/man/pthread_cond_timedwait.3
index b0c56e80fe3a..afd16b5f0d02 100644
--- a/lib/libpthread/man/pthread_cond_timedwait.3
+++ b/lib/libpthread/man/pthread_cond_timedwait.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_cond_timedwait "pthread_cond_t *cond" "pthread_mutex_t *mutex" "const struct timespec *abstime"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_cond_wait.3 b/lib/libpthread/man/pthread_cond_wait.3
index e9fde91842f8..e464a1e524a5 100644
--- a/lib/libpthread/man/pthread_cond_wait.3
+++ b/lib/libpthread/man/pthread_cond_wait.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_cond_wait "pthread_cond_t *cond" "pthread_mutex_t *mutex"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_condattr.3 b/lib/libpthread/man/pthread_condattr.3
index 28df565c60f2..478e11264daf 100644
--- a/lib/libpthread/man/pthread_condattr.3
+++ b/lib/libpthread/man/pthread_condattr.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_condattr_init "pthread_condattr_t *attr"
.Ft int
diff --git a/lib/libpthread/man/pthread_create.3 b/lib/libpthread/man/pthread_create.3
index 5f2d24ce8ed3..53b68abc2dd1 100644
--- a/lib/libpthread/man/pthread_create.3
+++ b/lib/libpthread/man/pthread_create.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_create "pthread_t *thread" "const pthread_attr_t *attr" "void *(*start_routine)(void *)" "void *arg"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_detach.3 b/lib/libpthread/man/pthread_detach.3
index a3b660fdde64..15729af692c3 100644
--- a/lib/libpthread/man/pthread_detach.3
+++ b/lib/libpthread/man/pthread_detach.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_detach "pthread_t thread"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_equal.3 b/lib/libpthread/man/pthread_equal.3
index be55e90b46ba..8b733dabdf4d 100644
--- a/lib/libpthread/man/pthread_equal.3
+++ b/lib/libpthread/man/pthread_equal.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_equal "pthread_t t1" "pthread_t t2"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_exit.3 b/lib/libpthread/man/pthread_exit.3
index 1eabc9bcb94b..0bfdad666029 100644
--- a/lib/libpthread/man/pthread_exit.3
+++ b/lib/libpthread/man/pthread_exit.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft void
.Fn pthread_exit "void *value_ptr"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_getspecific.3 b/lib/libpthread/man/pthread_getspecific.3
index c003f3fca894..c7a04fadb646 100644
--- a/lib/libpthread/man/pthread_getspecific.3
+++ b/lib/libpthread/man/pthread_getspecific.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft void *
.Fn pthread_getspecific "pthread_key_t key"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_join.3 b/lib/libpthread/man/pthread_join.3
index f8e8e18a2fea..98ae70d888ef 100644
--- a/lib/libpthread/man/pthread_join.3
+++ b/lib/libpthread/man/pthread_join.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_join "pthread_t thread" "void **value_ptr"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_key_create.3 b/lib/libpthread/man/pthread_key_create.3
index d1fb92216949..7075dcc53d8a 100644
--- a/lib/libpthread/man/pthread_key_create.3
+++ b/lib/libpthread/man/pthread_key_create.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_key_create "pthread_key_t *key" "void (*destructor)(void *)"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_key_delete.3 b/lib/libpthread/man/pthread_key_delete.3
index 9baa5020f12b..bc0cf8a38aad 100644
--- a/lib/libpthread/man/pthread_key_delete.3
+++ b/lib/libpthread/man/pthread_key_delete.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_key_delete "pthread_key_t key"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_kill.3 b/lib/libpthread/man/pthread_kill.3
index 7a33cf6c6016..e46e2b26013d 100644
--- a/lib/libpthread/man/pthread_kill.3
+++ b/lib/libpthread/man/pthread_kill.3
@@ -35,8 +35,8 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
-.Fd #include <signal.h>
+.In pthread.h
+.In signal.h
.Ft int
.Fn pthread_kill "pthread_t thread" "int sig"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_mutex_destroy.3 b/lib/libpthread/man/pthread_mutex_destroy.3
index f7b915d82820..59d2b48980c5 100644
--- a/lib/libpthread/man/pthread_mutex_destroy.3
+++ b/lib/libpthread/man/pthread_mutex_destroy.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_mutex_destroy "pthread_mutex_t *mutex"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_mutex_init.3 b/lib/libpthread/man/pthread_mutex_init.3
index 42b3a26a61f9..c3fb60cd7a5f 100644
--- a/lib/libpthread/man/pthread_mutex_init.3
+++ b/lib/libpthread/man/pthread_mutex_init.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_mutex_init "pthread_mutex_t *mutex" "const pthread_mutexattr_t *attr"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_mutex_lock.3 b/lib/libpthread/man/pthread_mutex_lock.3
index 972d277eade4..cc35ff21f1ef 100644
--- a/lib/libpthread/man/pthread_mutex_lock.3
+++ b/lib/libpthread/man/pthread_mutex_lock.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_mutex_lock "pthread_mutex_t *mutex"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_mutex_trylock.3 b/lib/libpthread/man/pthread_mutex_trylock.3
index 143df146702c..5de24cee73c6 100644
--- a/lib/libpthread/man/pthread_mutex_trylock.3
+++ b/lib/libpthread/man/pthread_mutex_trylock.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_mutex_trylock "pthread_mutex_t *mutex"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_mutex_unlock.3 b/lib/libpthread/man/pthread_mutex_unlock.3
index 93e635496ec6..d5ae7dc4f4df 100644
--- a/lib/libpthread/man/pthread_mutex_unlock.3
+++ b/lib/libpthread/man/pthread_mutex_unlock.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_mutex_unlock "pthread_mutex_t *mutex"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_mutexattr.3 b/lib/libpthread/man/pthread_mutexattr.3
index 707984606094..7476ae16d6f6 100644
--- a/lib/libpthread/man/pthread_mutexattr.3
+++ b/lib/libpthread/man/pthread_mutexattr.3
@@ -42,7 +42,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_mutexattr_init "pthread_mutexattr_t *attr"
.Ft int
diff --git a/lib/libpthread/man/pthread_once.3 b/lib/libpthread/man/pthread_once.3
index 72a132249ccb..7ad97fe98985 100644
--- a/lib/libpthread/man/pthread_once.3
+++ b/lib/libpthread/man/pthread_once.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Pp
pthread_once_t
.Fa once_control
diff --git a/lib/libpthread/man/pthread_rwlock_destroy.3 b/lib/libpthread/man/pthread_rwlock_destroy.3
index 70acf928ebe2..b65e0656750a 100644
--- a/lib/libpthread/man/pthread_rwlock_destroy.3
+++ b/lib/libpthread/man/pthread_rwlock_destroy.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlock_destroy "pthread_rwlock_t *lock"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_rwlock_init.3 b/lib/libpthread/man/pthread_rwlock_init.3
index 749a848d41d6..0360987db1e3 100644
--- a/lib/libpthread/man/pthread_rwlock_init.3
+++ b/lib/libpthread/man/pthread_rwlock_init.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlock_init "pthread_rwlock_t *lock" "const pthread_rwlockattr_t *attr"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_rwlock_rdlock.3 b/lib/libpthread/man/pthread_rwlock_rdlock.3
index d3ec9efe14cc..88dbb17fa599 100644
--- a/lib/libpthread/man/pthread_rwlock_rdlock.3
+++ b/lib/libpthread/man/pthread_rwlock_rdlock.3
@@ -34,7 +34,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlock_rdlock "pthread_rwlock_t *lock"
.Ft int
diff --git a/lib/libpthread/man/pthread_rwlock_unlock.3 b/lib/libpthread/man/pthread_rwlock_unlock.3
index f99b9558663a..9391f75df7af 100644
--- a/lib/libpthread/man/pthread_rwlock_unlock.3
+++ b/lib/libpthread/man/pthread_rwlock_unlock.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlock_unlock "pthread_rwlock_t *lock"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_rwlock_wrlock.3 b/lib/libpthread/man/pthread_rwlock_wrlock.3
index 149a7a0fb450..55ab5f933468 100644
--- a/lib/libpthread/man/pthread_rwlock_wrlock.3
+++ b/lib/libpthread/man/pthread_rwlock_wrlock.3
@@ -34,7 +34,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlock_wrlock "pthread_rwlock_t *lock"
.Ft int
diff --git a/lib/libpthread/man/pthread_rwlockattr_destroy.3 b/lib/libpthread/man/pthread_rwlockattr_destroy.3
index ab6a6e17768b..3ba97cf5e12c 100644
--- a/lib/libpthread/man/pthread_rwlockattr_destroy.3
+++ b/lib/libpthread/man/pthread_rwlockattr_destroy.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlockattr_destroy "pthread_rwlockattr_t *attr"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_rwlockattr_getpshared.3 b/lib/libpthread/man/pthread_rwlockattr_getpshared.3
index 40eed6e0232a..56bda4409c13 100644
--- a/lib/libpthread/man/pthread_rwlockattr_getpshared.3
+++ b/lib/libpthread/man/pthread_rwlockattr_getpshared.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlockattr_getpshared "const pthread_rwlockattr_t *attr" "int *pshared"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_rwlockattr_init.3 b/lib/libpthread/man/pthread_rwlockattr_init.3
index 4fbbe3676097..a4aef31fc289 100644
--- a/lib/libpthread/man/pthread_rwlockattr_init.3
+++ b/lib/libpthread/man/pthread_rwlockattr_init.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlockattr_init "pthread_rwlockattr_t *attr"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_rwlockattr_setpshared.3 b/lib/libpthread/man/pthread_rwlockattr_setpshared.3
index dfc7fe625ce2..48b854d21a6b 100644
--- a/lib/libpthread/man/pthread_rwlockattr_setpshared.3
+++ b/lib/libpthread/man/pthread_rwlockattr_setpshared.3
@@ -33,7 +33,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_rwlockattr_setpshared "pthread_rwlockattr_t *attr" "int pshared"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_schedparam.3 b/lib/libpthread/man/pthread_schedparam.3
index 50c556f2824a..c76f4d9033ed 100644
--- a/lib/libpthread/man/pthread_schedparam.3
+++ b/lib/libpthread/man/pthread_schedparam.3
@@ -36,7 +36,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_setschedparam "pthread_t thread" "int policy" "const struct sched_param *param"
.Ft int
diff --git a/lib/libpthread/man/pthread_self.3 b/lib/libpthread/man/pthread_self.3
index acd46e9955b7..899af43094f3 100644
--- a/lib/libpthread/man/pthread_self.3
+++ b/lib/libpthread/man/pthread_self.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft pthread_t
.Fn pthread_self "void"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_setspecific.3 b/lib/libpthread/man/pthread_setspecific.3
index 5265def7e7f1..5bc274c6e640 100644
--- a/lib/libpthread/man/pthread_setspecific.3
+++ b/lib/libpthread/man/pthread_setspecific.3
@@ -39,7 +39,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_setspecific "pthread_key_t key" "const void *value"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_sigmask.3 b/lib/libpthread/man/pthread_sigmask.3
index 2b23d3ba8149..5efa9256b6a1 100644
--- a/lib/libpthread/man/pthread_sigmask.3
+++ b/lib/libpthread/man/pthread_sigmask.3
@@ -35,8 +35,8 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
-.Fd #include <signal.h>
+.In pthread.h
+.In signal.h
.Ft int
.Fn pthread_sigmask "int how" "const sigset_t *set" "sigset_t *oset"
.Sh DESCRIPTION
diff --git a/lib/libpthread/man/pthread_testcancel.3 b/lib/libpthread/man/pthread_testcancel.3
index 110ab38b2cd7..95672fa1efb4 100644
--- a/lib/libpthread/man/pthread_testcancel.3
+++ b/lib/libpthread/man/pthread_testcancel.3
@@ -10,7 +10,7 @@
.Sh LIBRARY
.Lb libc_r
.Sh SYNOPSIS
-.Fd #include <pthread.h>
+.In pthread.h
.Ft int
.Fn pthread_setcancelstate "int state" "int *oldstate"
.Ft int
diff --git a/lib/libpthread/man/sem_destroy.3 b/lib/libpthread/man/sem_destroy.3
index 82f0946da621..8094a5323888 100644
--- a/lib/libpthread/man/sem_destroy.3
+++ b/lib/libpthread/man/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/libpthread/man/sem_getvalue.3 b/lib/libpthread/man/sem_getvalue.3
index 2ad564642e0d..d1cc3a4d3296 100644
--- a/lib/libpthread/man/sem_getvalue.3
+++ b/lib/libpthread/man/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/libpthread/man/sem_init.3 b/lib/libpthread/man/sem_init.3
index 6226edc3b485..fd517c224a03 100644
--- a/lib/libpthread/man/sem_init.3
+++ b/lib/libpthread/man/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/libpthread/man/sem_open.3 b/lib/libpthread/man/sem_open.3
index b735a56a96cb..07c9543cec3d 100644
--- a/lib/libpthread/man/sem_open.3
+++ b/lib/libpthread/man/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/libpthread/man/sem_post.3 b/lib/libpthread/man/sem_post.3
index ca6bf6df4a00..71b9f43376a0 100644
--- a/lib/libpthread/man/sem_post.3
+++ b/lib/libpthread/man/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/libpthread/man/sem_wait.3 b/lib/libpthread/man/sem_wait.3
index d015b909ca84..c89ea04a098b 100644
--- a/lib/libpthread/man/sem_wait.3
+++ b/lib/libpthread/man/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/libpthread/man/sigwait.3 b/lib/libpthread/man/sigwait.3
index fba1f67d3fdf..76376a6d3131 100644
--- a/lib/libpthread/man/sigwait.3
+++ b/lib/libpthread/man/sigwait.3
@@ -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/libradius/libradius.3 b/lib/libradius/libradius.3
index 7f55a3a044e3..7adf306e1d00 100644
--- a/lib/libradius/libradius.3
+++ b/lib/libradius/libradius.3
@@ -31,7 +31,7 @@
.Nm libradius
.Nd RADIUS client library
.Sh SYNOPSIS
-.Fd #include <radlib.h>
+.In radlib.h
.Ft struct rad_handle *
.Fn rad_acct_open "void"
.Ft int
diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3
index b3c89938d27f..c62d04f71a20 100644
--- a/lib/libstand/libstand.3
+++ b/lib/libstand/libstand.3
@@ -31,7 +31,7 @@
.Nm libstand
.Nd support library for standalone executables
.Sh SYNOPSIS
-.Fd #include <stand.h>
+.In stand.h
.Sh DESCRIPTION
.Nm
provides a set of supporting functions for standalone
@@ -175,7 +175,7 @@ Returns error messages for the subset of errno values supported by
.It Fn assert expression
.Pp
Requires
-.Fd #include <assert.h>
+.In assert.h
.It Xo
.Ft int
.Fn setjmp "jmp_buf env"
@@ -190,7 +190,7 @@ Defined as
and
.Fn _lonjmp
respectively as there is no signal state to manipulate. Requires
-.Fd #include <setjmp.h>
+.In setjmp.h
.El
.Sh CHARACTER I/O
.Bl -hang -width 10n
diff --git a/lib/libtacplus/libtacplus.3 b/lib/libtacplus/libtacplus.3
index ccea628dc7fb..baec68a87e9c 100644
--- a/lib/libtacplus/libtacplus.3
+++ b/lib/libtacplus/libtacplus.3
@@ -31,7 +31,7 @@
.Nm libtacplus
.Nd TACACS+ client library
.Sh SYNOPSIS
-.Fd #include <taclib.h>
+.In taclib.h
.Ft int
.Fn tac_add_server "struct tac_handle *h" "const char *host" "int port" "const char *secret" "int timeout" "int flags"
.Ft void
diff --git a/lib/libusb/usb.3 b/lib/libusb/usb.3
index bf3e9d999318..b9b939431509 100644
--- a/lib/libusb/usb.3
+++ b/lib/libusb/usb.3
@@ -47,7 +47,7 @@
.Sh LIBRARY
.Lb libusb
.Sh SYNOPSIS
-.Fd #include <libusb.h>
+.In libusb.h
.Ft report_desc_t
.Fn hid_get_report_desc "int file"
.Ft report_desc_t
diff --git a/lib/libusbhid/usb.3 b/lib/libusbhid/usb.3
index bf3e9d999318..b9b939431509 100644
--- a/lib/libusbhid/usb.3
+++ b/lib/libusbhid/usb.3
@@ -47,7 +47,7 @@
.Sh LIBRARY
.Lb libusb
.Sh SYNOPSIS
-.Fd #include <libusb.h>
+.In libusb.h
.Ft report_desc_t
.Fn hid_get_report_desc "int file"
.Ft report_desc_t
diff --git a/lib/libusbhid/usbhid.3 b/lib/libusbhid/usbhid.3
index bf3e9d999318..b9b939431509 100644
--- a/lib/libusbhid/usbhid.3
+++ b/lib/libusbhid/usbhid.3
@@ -47,7 +47,7 @@
.Sh LIBRARY
.Lb libusb
.Sh SYNOPSIS
-.Fd #include <libusb.h>
+.In libusb.h
.Ft report_desc_t
.Fn hid_get_report_desc "int file"
.Ft report_desc_t
diff --git a/lib/libutil/_secure_path.3 b/lib/libutil/_secure_path.3
index 082328d9bcc3..7545b2f9b71f 100644
--- a/lib/libutil/_secure_path.3
+++ b/lib/libutil/_secure_path.3
@@ -28,8 +28,8 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <libutil.h>
+.In sys/types.h
+.In libutil.h
.Ft int
.Fn _secure_path "const char *path" "uid_t uid" "gid_t gid"
.Sh DESCRIPTION
diff --git a/lib/libutil/auth.3 b/lib/libutil/auth.3
index 68539db899cf..56356e4dc2d1 100644
--- a/lib/libutil/auth.3
+++ b/lib/libutil/auth.3
@@ -35,8 +35,8 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <libutil.h>
+.In sys/types.h
+.In libutil.h
.Ft char *
.Fn auth_getval "const char *name"
.Sh DESCRIPTION
diff --git a/lib/libutil/extattr.3 b/lib/libutil/extattr.3
index fd9e18f9b95d..998ddaa9e3a8 100644
--- a/lib/libutil/extattr.3
+++ b/lib/libutil/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/libutil/fparseln.3 b/lib/libutil/fparseln.3
index e52a650faf61..1e8f30e7418e 100644
--- a/lib/libutil/fparseln.3
+++ b/lib/libutil/fparseln.3
@@ -37,8 +37,8 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <stdio.h>
-.Fd #include <libutil.h>
+.In stdio.h
+.In libutil.h
.Ft "char *"
.Fo fparseln
.Fa "FILE *stream" "size_t *len" "size_t *lineno"
diff --git a/lib/libutil/login.3 b/lib/libutil/login.3
index 41612fbf9e4e..dd595e99aa18 100644
--- a/lib/libutil/login.3
+++ b/lib/libutil/login.3
@@ -34,9 +34,9 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <utmp.h>
-.Fd #include <libutil.h>
+.In sys/types.h
+.In utmp.h
+.In libutil.h
.Ft void
.Fn login "struct utmp *ut"
.Sh DESCRIPTION
diff --git a/lib/libutil/login_auth.3 b/lib/libutil/login_auth.3
index 0144f5c9e3be..3750bd69182b 100644
--- a/lib/libutil/login_auth.3
+++ b/lib/libutil/login_auth.3
@@ -37,8 +37,8 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <login_cap.h>
+.In sys/types.h
+.In login_cap.h
.\" .Ft int
.\". Fn authenticate "const char *name" "const char *classname" "const char *style" "const char *service"
.\" .Ft int
diff --git a/lib/libutil/login_cap.3 b/lib/libutil/login_cap.3
index 12f6412809e0..d05426c2dec2 100644
--- a/lib/libutil/login_cap.3
+++ b/lib/libutil/login_cap.3
@@ -40,8 +40,8 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <login_cap.h>
+.In sys/types.h
+.In login_cap.h
.Ft void
.Fn login_close "login_cap_t *lc"
.Ft login_cap_t *
diff --git a/lib/libutil/login_class.3 b/lib/libutil/login_class.3
index 16f994e7adaf..4ad9dc75e47a 100644
--- a/lib/libutil/login_class.3
+++ b/lib/libutil/login_class.3
@@ -31,8 +31,8 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <login_cap.h>
+.In sys/types.h
+.In login_cap.h
.Ft int
.Fn setclasscontext "const char *classname" "unsigned int flags"
.Ft int
diff --git a/lib/libutil/login_ok.3 b/lib/libutil/login_ok.3
index 188f00c9c44b..c7fa84d6df08 100644
--- a/lib/libutil/login_ok.3
+++ b/lib/libutil/login_ok.3
@@ -30,9 +30,9 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <time.h>
-.Fd #include <login_cap.h>
+.In sys/types.h
+.In time.h
+.In login_cap.h
.Ft int
.Fn auth_ttyok "login_cap_t *lc" "const char *tty"
.Ft int
diff --git a/lib/libutil/login_times.3 b/lib/libutil/login_times.3
index 28afbfaa590f..10824049a17d 100644
--- a/lib/libutil/login_times.3
+++ b/lib/libutil/login_times.3
@@ -30,9 +30,9 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <time.h>
-.Fd #include <login_cap.h>
+.In sys/types.h
+.In time.h
+.In login_cap.h
.Ft login_time_t
.Fn parse_lt "const char *str"
.Ft int
diff --git a/lib/libutil/login_tty.3 b/lib/libutil/login_tty.3
index 8cbb200fd6a7..af3eaaf3d728 100644
--- a/lib/libutil/login_tty.3
+++ b/lib/libutil/login_tty.3
@@ -34,7 +34,7 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <libutil.h>
+.In libutil.h
.Ft int
.Fn login_tty "int fd"
.Sh DESCRIPTION
diff --git a/lib/libutil/logout.3 b/lib/libutil/logout.3
index a129e5466df4..d5beb7fc7202 100644
--- a/lib/libutil/logout.3
+++ b/lib/libutil/logout.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <libutil.h>
+.In sys/types.h
+.In libutil.h
.Ft int
.Fn logout "const char *line"
.Sh DESCRIPTION
diff --git a/lib/libutil/logwtmp.3 b/lib/libutil/logwtmp.3
index f8fa4b6a5b87..de046c5a94fe 100644
--- a/lib/libutil/logwtmp.3
+++ b/lib/libutil/logwtmp.3
@@ -34,8 +34,8 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <libutil.h>
+.In sys/types.h
+.In libutil.h
.Ft void
.Fn logwtmp "const char *line" "const char *name" "const char *host"
.Sh DESCRIPTION
diff --git a/lib/libutil/property.3 b/lib/libutil/property.3
index f945bd57e728..219c0e7c9782 100644
--- a/lib/libutil/property.3
+++ b/lib/libutil/property.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <libutil.h>
+.In sys/types.h
+.In libutil.h
.Ft properties
.Fn properties_read "int fd"
.Ft char *
diff --git a/lib/libutil/pty.3 b/lib/libutil/pty.3
index 32849687afd2..30c9f96f6915 100644
--- a/lib/libutil/pty.3
+++ b/lib/libutil/pty.3
@@ -35,10 +35,10 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <sys/ioctl.h>
-.Fd #include <termios.h>
-.Fd #include <libutil.h>
+.In sys/types.h
+.In sys/ioctl.h
+.In termios.h
+.In libutil.h
.Ft int
.Fn openpty "int *amaster" "int *aslave" "char *name" "struct termios *termp" "struct winsize *winp"
.Ft int
diff --git a/lib/libutil/realhostname.3 b/lib/libutil/realhostname.3
index 03b97d293448..1b4ae3d8c31c 100644
--- a/lib/libutil/realhostname.3
+++ b/lib/libutil/realhostname.3
@@ -33,9 +33,9 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netinet/in.h>
-.Fd #include <libutil.h>
+.In sys/types.h
+.In netinet/in.h
+.In libutil.h
.Ft int
.Fn realhostname "char *host" "size_t hsize" "const struct in_addr *ip"
.Sh DESCRIPTION
diff --git a/lib/libutil/realhostname_sa.3 b/lib/libutil/realhostname_sa.3
index 730e3d5a0154..e07720d87596 100644
--- a/lib/libutil/realhostname_sa.3
+++ b/lib/libutil/realhostname_sa.3
@@ -60,9 +60,9 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <netinet/in.h>
-.Fd #include <libutil.h>
+.In sys/types.h
+.In netinet/in.h
+.In libutil.h
.Ft int
.Fn realhostname_sa "char *host" "size_t hsize" "struct sockaddr *addr" "int addrlen"
.Sh DESCRIPTION
diff --git a/lib/libutil/trimdomain.3 b/lib/libutil/trimdomain.3
index b93ff0595c1d..2b6dd75c19b3 100644
--- a/lib/libutil/trimdomain.3
+++ b/lib/libutil/trimdomain.3
@@ -33,8 +33,8 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <libutil.h>
+.In sys/types.h
+.In libutil.h
.Ft void
.Fn trimdomain "char *fullhost" "int hostsize"
.Sh DESCRIPTION
diff --git a/lib/libutil/uucplock.3 b/lib/libutil/uucplock.3
index ad801cc354fa..a69af955d062 100644
--- a/lib/libutil/uucplock.3
+++ b/lib/libutil/uucplock.3
@@ -36,8 +36,8 @@
.Sh LIBRARY
.Lb libutil
.Sh SYNOPSIS
-.Fd #include <sys/types.h>
-.Fd #include <libutil.h>
+.In sys/types.h
+.In libutil.h
.Ft int
.Fn uu_lock "const char *ttyname"
.Ft int
diff --git a/lib/libvgl/vgl.3 b/lib/libvgl/vgl.3
index 7add8c26c5dc..10a9679c2c1e 100644
--- a/lib/libvgl/vgl.3
+++ b/lib/libvgl/vgl.3
@@ -65,10 +65,10 @@
.Sh LIBRARY
.Lb libvgl
.Sh SYNOPSIS
-.Fd #include <sys/fbio.h>
-.Fd #include <sys/consio.h>
-.Fd #include <sys/kbio.h>
-.Fd #include <vgl.h>
+.In sys/fbio.h
+.In sys/consio.h
+.In sys/kbio.h
+.In vgl.h
.Ft int
.Fn VGLInit "int mode"
.Ft void
diff --git a/lib/msun/man/acos.3 b/lib/msun/man/acos.3
index 582e1c08dd5d..f4442b74da46 100644
--- a/lib/msun/man/acos.3
+++ b/lib/msun/man/acos.3
@@ -40,7 +40,7 @@
.Nm acosf
.Nd arc cosine functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn acos "double x"
.Ft float
diff --git a/lib/msun/man/acosh.3 b/lib/msun/man/acosh.3
index 1b423abc8358..65adde349376 100644
--- a/lib/msun/man/acosh.3
+++ b/lib/msun/man/acosh.3
@@ -40,7 +40,7 @@
.Nm acoshf
.Nd inverse hyperbolic cosine functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn acosh "double x"
.Ft float
diff --git a/lib/msun/man/asin.3 b/lib/msun/man/asin.3
index 3bb80611b02b..0860b3cacbf2 100644
--- a/lib/msun/man/asin.3
+++ b/lib/msun/man/asin.3
@@ -40,7 +40,7 @@
.Nm asinf
.Nd arc sine functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn asin "double x"
.Ft float
diff --git a/lib/msun/man/asinh.3 b/lib/msun/man/asinh.3
index 09450f97f6b6..5f945a215636 100644
--- a/lib/msun/man/asinh.3
+++ b/lib/msun/man/asinh.3
@@ -40,7 +40,7 @@
.Nm asinhf
.Nd inverse hyperbolic sine functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn asinh "double x"
.Ft float
diff --git a/lib/msun/man/atan.3 b/lib/msun/man/atan.3
index 4c6fd6446586..7e0ee7bc33cf 100644
--- a/lib/msun/man/atan.3
+++ b/lib/msun/man/atan.3
@@ -40,7 +40,7 @@
.Nm atanf
.Nd arc tangent functions of one variable
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn atan "double x"
.Ft float
diff --git a/lib/msun/man/atan2.3 b/lib/msun/man/atan2.3
index 0c124e75597a..9898112727ce 100644
--- a/lib/msun/man/atan2.3
+++ b/lib/msun/man/atan2.3
@@ -40,7 +40,7 @@
.Nm atan2f
.Nd arc tangent functions of two variables
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn atan2 "double y" "double x"
.Ft float
diff --git a/lib/msun/man/atanh.3 b/lib/msun/man/atanh.3
index bff082b84f6f..57ddd46b3140 100644
--- a/lib/msun/man/atanh.3
+++ b/lib/msun/man/atanh.3
@@ -40,7 +40,7 @@
.Nm atanhf
.Nd inverse hyperbolic tangent functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn atanh "double x"
.Ft float
diff --git a/lib/msun/man/ceil.3 b/lib/msun/man/ceil.3
index f7fd5212478d..0a4992e4708c 100644
--- a/lib/msun/man/ceil.3
+++ b/lib/msun/man/ceil.3
@@ -40,7 +40,7 @@
.Nm ceilf
.Nd round to smallest integral value >= x
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn ceil "double x"
.Ft float
diff --git a/lib/msun/man/cos.3 b/lib/msun/man/cos.3
index bd1b31364467..61c049a346ef 100644
--- a/lib/msun/man/cos.3
+++ b/lib/msun/man/cos.3
@@ -40,7 +40,7 @@
.Nm cosf
.Nd cosine functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn cos "double x"
.Ft float
diff --git a/lib/msun/man/cosh.3 b/lib/msun/man/cosh.3
index 764677271198..e69c4c9ee913 100644
--- a/lib/msun/man/cosh.3
+++ b/lib/msun/man/cosh.3
@@ -40,7 +40,7 @@
.Nm coshf
.Nd hyperbolic cosine functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn cosh "double x"
.Ft float
diff --git a/lib/msun/man/erf.3 b/lib/msun/man/erf.3
index 6157fd8864c9..107fe21ea22e 100644
--- a/lib/msun/man/erf.3
+++ b/lib/msun/man/erf.3
@@ -42,7 +42,7 @@
.Nm erfcf
.Nd error function operators
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn erf "double x"
.Ft float
diff --git a/lib/msun/man/exp.3 b/lib/msun/man/exp.3
index 3ba89f479551..166eee4a2fae 100644
--- a/lib/msun/man/exp.3
+++ b/lib/msun/man/exp.3
@@ -54,7 +54,7 @@
.Nm powf
.Nd exponential, logarithm, power functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn exp "double x"
.Ft float
diff --git a/lib/msun/man/fabs.3 b/lib/msun/man/fabs.3
index 179d352a010f..51a4b39a6f39 100644
--- a/lib/msun/man/fabs.3
+++ b/lib/msun/man/fabs.3
@@ -41,7 +41,7 @@
.Nm fabsf
.Nd floating-point absolute value functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn fabs "double x"
.Ft float
diff --git a/lib/msun/man/floor.3 b/lib/msun/man/floor.3
index 39323833666d..75fa698f41b4 100644
--- a/lib/msun/man/floor.3
+++ b/lib/msun/man/floor.3
@@ -40,7 +40,7 @@
.Nm floorf
.Nd round to largest integral value <= x
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn floor "double x"
.Ft float
diff --git a/lib/msun/man/fmod.3 b/lib/msun/man/fmod.3
index ec1f0c7f3be2..343d4058c38b 100644
--- a/lib/msun/man/fmod.3
+++ b/lib/msun/man/fmod.3
@@ -40,7 +40,7 @@
.Nm fmodf
.Nd floating-point remainder functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn fmod "double x" "double y"
.Ft float
diff --git a/lib/msun/man/hypot.3 b/lib/msun/man/hypot.3
index 951e25355f6e..838952057af0 100644
--- a/lib/msun/man/hypot.3
+++ b/lib/msun/man/hypot.3
@@ -42,7 +42,7 @@
.Nm cabsf
.Nd euclidean distance and complex absolute value functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn hypot "double x" "double y"
.Ft float
diff --git a/lib/msun/man/ieee.3 b/lib/msun/man/ieee.3
index f0186e204842..411470418385 100644
--- a/lib/msun/man/ieee.3
+++ b/lib/msun/man/ieee.3
@@ -50,7 +50,7 @@
.Nm scalbnf
.Nd functions for IEEE arithmetic
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn copysign "double x" "double y"
.Ft float
diff --git a/lib/msun/man/ieee_test.3 b/lib/msun/man/ieee_test.3
index 84f78a5341b8..d9426a0000bc 100644
--- a/lib/msun/man/ieee_test.3
+++ b/lib/msun/man/ieee_test.3
@@ -44,7 +44,7 @@
.Nm significandf
.Nd IEEE test functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn logb "double x"
.Ft float
diff --git a/lib/msun/man/j0.3 b/lib/msun/man/j0.3
index dfd58b7ddee1..f774247a6310 100644
--- a/lib/msun/man/j0.3
+++ b/lib/msun/man/j0.3
@@ -50,7 +50,7 @@
.Nm ynf
.Nd Bessel functions of first and second kind
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn j0 "double x"
.Ft float
diff --git a/lib/msun/man/lgamma.3 b/lib/msun/man/lgamma.3
index 0b7e31b66bbf..0df380ef6454 100644
--- a/lib/msun/man/lgamma.3
+++ b/lib/msun/man/lgamma.3
@@ -42,7 +42,7 @@
.Nm gammaf
.Nd log gamma functions, gamma functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft extern int
.Fa signgam ;
.sp
diff --git a/lib/msun/man/rint.3 b/lib/msun/man/rint.3
index d4b7aeb3810e..1e946400e5d3 100644
--- a/lib/msun/man/rint.3
+++ b/lib/msun/man/rint.3
@@ -40,7 +40,7 @@
.Nm rintf
.Nd round to integral value in floating-point format
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn rint "double x"
.Ft float
diff --git a/lib/msun/man/sin.3 b/lib/msun/man/sin.3
index 200ee63fcfcb..59c1725cad7c 100644
--- a/lib/msun/man/sin.3
+++ b/lib/msun/man/sin.3
@@ -41,7 +41,7 @@
.Nm sinf
.Nd sine functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn sin "double x"
.Ft float
diff --git a/lib/msun/man/sinh.3 b/lib/msun/man/sinh.3
index 78995a0dfb95..a2b293f7347c 100644
--- a/lib/msun/man/sinh.3
+++ b/lib/msun/man/sinh.3
@@ -39,7 +39,7 @@
.Nm sinhf
.Nd hyperbolic sine function
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn sinh "double x"
.Ft float
diff --git a/lib/msun/man/sqrt.3 b/lib/msun/man/sqrt.3
index 956eb5d4c466..073827f232d7 100644
--- a/lib/msun/man/sqrt.3
+++ b/lib/msun/man/sqrt.3
@@ -42,7 +42,7 @@
.Nm sqrtf
.Nd cube root and square root functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn cbrt "double x"
.Ft float
diff --git a/lib/msun/man/tan.3 b/lib/msun/man/tan.3
index a1b245770415..c9ea7ac85493 100644
--- a/lib/msun/man/tan.3
+++ b/lib/msun/man/tan.3
@@ -40,7 +40,7 @@
.Nm tanf
.Nd tangent functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn tan "double x"
.Ft float
diff --git a/lib/msun/man/tanh.3 b/lib/msun/man/tanh.3
index e17ed3887b79..171b3277818e 100644
--- a/lib/msun/man/tanh.3
+++ b/lib/msun/man/tanh.3
@@ -40,7 +40,7 @@
.Nm tanhf
.Nd hyperbolic tangent functions
.Sh SYNOPSIS
-.Fd #include <math.h>
+.In math.h
.Ft double
.Fn tanh "double x"
.Ft float