diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index e7a8d42eab5c..7a96f7becdf2 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -210,7 +210,7 @@ The percentage of real memory used by this process.
 .It flags
 The flags associated with the process as in
 the include file
-.Aq Pa sys/proc.h :
+.In sys/proc.h :
 .Bl -column P_NOCLDSTOP P_NOCLDSTOP
 .It Dv "P_ADVLOCK" Ta No "0x00001	Process may hold a POSIX advisory lock"
 .It Dv "P_CONTROLT" Ta No "0x00002	Has a controlling terminal"
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index e15d1eeb1cf3..802856a6787c 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -583,7 +583,7 @@ an executed shell function.
 .Pp
 If a command is terminated by a signal, its exit status is 128 plus
 the signal number.  Signal numbers are defined in the header file
-.Aq Pa sys/signal.h .
+.In sys/signal.h .
 .Ss Complex Commands
 Complex commands are combinations of simple commands
 with control operators or reserved words, together creating a larger complex
diff --git a/lib/libalias/libalias.3 b/lib/libalias/libalias.3
index d9fff6a73b1b..a75cd2b02947 100644
--- a/lib/libalias/libalias.3
+++ b/lib/libalias/libalias.3
@@ -162,7 +162,7 @@ Only bits marked in
 .Fa mask
 are affected.
 The following mode bits are defined in
-.Aq Pa alias.h :
+.In alias.h :
 .Bl -tag -width indent
 .It Dv PKT_ALIAS_LOG
 Enables logging into
@@ -378,7 +378,7 @@ can be either
 or
 .Dv IPPROTO_UDP ,
 as defined in
-.Aq Pa netinet/in.h .
+.In netinet/in.h .
 .Pp
 If
 .Fa local_addr
diff --git a/lib/libc/compat-43/sigvec.2 b/lib/libc/compat-43/sigvec.2
index b7584167fe4e..230e4b3f1928 100644
--- a/lib/libc/compat-43/sigvec.2
+++ b/lib/libc/compat-43/sigvec.2
@@ -139,7 +139,7 @@ is returned to the user.
 .Pp
 The following is a list of all signals
 with names as in the include file
-.Aq Pa signal.h :
+.In signal.h :
 .Bl -column SIGVTALARMXX "create core imagexxx"
 .It Sy "NAME	Default Action	Description"
 .It Dv SIGHUP No "	terminate process" "	terminal line hangup"
@@ -332,7 +332,7 @@ argument
 is a pointer to the
 .Fa sigcontext
 structure (defined in
-.Aq Pa signal.h ) ,
+.In signal.h ) ,
 used to restore the context from before the signal.
 .Sh BUGS
 This manual page is still confusing.
diff --git a/lib/libc/db/man/btree.3 b/lib/libc/db/man/btree.3
index b861aeb94fdb..9c5fbfec6aa8 100644
--- a/lib/libc/db/man/btree.3
+++ b/lib/libc/db/man/btree.3
@@ -64,7 +64,7 @@ The
 access method specific data structure provided to
 .Fn dbopen
 is defined in the
-.Aq Pa db.h
+.In db.h
 include file as follows:
 .Bd -literal
 typedef struct {
diff --git a/lib/libc/db/man/dbm.3 b/lib/libc/db/man/dbm.3
index 1fd4d85ae12c..f2b7f465eae4 100644
--- a/lib/libc/db/man/dbm.3
+++ b/lib/libc/db/man/dbm.3
@@ -65,7 +65,7 @@ database.
 .Pp
 .Vt datum
 is declared in
-.Aq Pa ndbm.h :
+.In ndbm.h :
 .Bd -literal
 typedef struct {
 	char *dptr;
diff --git a/lib/libc/db/man/dbopen.3 b/lib/libc/db/man/dbopen.3
index e67fc29d941e..e68e3b52c1c1 100644
--- a/lib/libc/db/man/dbopen.3
+++ b/lib/libc/db/man/dbopen.3
@@ -119,7 +119,7 @@ The
 argument is of type
 .Ft DBTYPE
 (as defined in the
-.Aq Pa db.h
+.In db.h
 include file) and
 may be set to
 .Dv DB_BTREE , DB_HASH
@@ -148,7 +148,7 @@ on error.
 The
 .Ft DB
 structure is defined in the
-.Aq Pa db.h
+.In db.h
 include file, and contains at
 least the following fields:
 .Bd -literal
diff --git a/lib/libc/db/man/hash.3 b/lib/libc/db/man/hash.3
index 527f59ffcb37..6c2e93041da7 100644
--- a/lib/libc/db/man/hash.3
+++ b/lib/libc/db/man/hash.3
@@ -61,7 +61,7 @@ data structure is an extensible, dynamic hashing scheme.
 The access method specific data structure provided to
 .Fn dbopen
 is defined in the
-.Aq Pa db.h
+.In db.h
 include file as follows:
 .Bd -literal
 typedef struct {
diff --git a/lib/libc/db/man/recno.3 b/lib/libc/db/man/recno.3
index 07803569b002..9a786ddfe3cc 100644
--- a/lib/libc/db/man/recno.3
+++ b/lib/libc/db/man/recno.3
@@ -66,7 +66,7 @@ The
 access method specific data structure provided to
 .Fn dbopen
 is defined in the
-.Aq Pa db.h
+.In db.h
 include file as follows:
 .Bd -literal
 typedef struct {
@@ -179,7 +179,7 @@ The
 field of the key should be a pointer to a memory location of type
 .Ft recno_t ,
 as defined in the
-.Aq Pa db.h
+.In db.h
 include file.
 This type is normally the largest unsigned integral type available to
 the implementation.
diff --git a/lib/libc/gen/confstr.3 b/lib/libc/gen/confstr.3
index 5587e02e8d6d..63440591bdf5 100644
--- a/lib/libc/gen/confstr.3
+++ b/lib/libc/gen/confstr.3
@@ -62,7 +62,7 @@ The
 .Fa name
 argument specifies the system variable to be queried.
 Symbolic constants for each name value are found in the include file
-.Aq Pa unistd.h .
+.In unistd.h .
 The
 .Fa len
 argument specifies the size of the buffer referenced by the
diff --git a/lib/libc/gen/ctermid.3 b/lib/libc/gen/ctermid.3
index 71e20ac7db35..c8f3c100e31f 100644
--- a/lib/libc/gen/ctermid.3
+++ b/lib/libc/gen/ctermid.3
@@ -65,7 +65,7 @@ is assumed to be at least
 .Dv L_ctermid
 (as defined in the include
 file
-.Aq Pa stdio.h )
+.In stdio.h )
 bytes long.
 .Pp
 The
diff --git a/lib/libc/gen/dlinfo.3 b/lib/libc/gen/dlinfo.3
index a4ebff9e71bf..1658471a5779 100644
--- a/lib/libc/gen/dlinfo.3
+++ b/lib/libc/gen/dlinfo.3
@@ -102,7 +102,7 @@ example 1.
 The
 .Vt Link_map
 structure is defined in
-.Aq Pa link.h
+.In link.h
 and has the following members:
 .Bd -literal -offset indent
 caddr_t         l_addr;    /* Base Address of library */
@@ -159,7 +159,7 @@ The corresponding
 field contains one of more flags indicating the origin of the path (see the
 .Dv LA_SER_*
 flags defined in the
-.Aq Pa link.h
+.In link.h
 header file).
 See
 .Sx EXAMPLES ,
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3
index 6c9e28dd8c5c..3245ba89e148 100644
--- a/lib/libc/gen/fts.3
+++ b/lib/libc/gen/fts.3
@@ -93,7 +93,7 @@ or physically (visiting symbolic links), order the walk of the hierarchy or
 prune and/or re-visit portions of the hierarchy.
 .Pp
 Two structures are defined (and typedef'd) in the include file
-.Aq Pa fts.h .
+.In fts.h .
 The first is
 .Vt FTS ,
 the structure that represents the file hierarchy itself.
diff --git a/lib/libc/gen/getcwd.3 b/lib/libc/gen/getcwd.3
index 0dadd056e049..ba59c154e2a3 100644
--- a/lib/libc/gen/getcwd.3
+++ b/lib/libc/gen/getcwd.3
@@ -78,7 +78,7 @@ argument and a size of
 .Dv MAXPATHLEN
 (as defined in the include
 file
-.Aq Pa sys/param.h ) .
+.In sys/param.h ) .
 Obviously,
 .Fa buf
 should be at least
diff --git a/lib/libc/gen/getfsent.3 b/lib/libc/gen/getfsent.3
index 94069c990d67..299c8685ce82 100644
--- a/lib/libc/gen/getfsent.3
+++ b/lib/libc/gen/getfsent.3
@@ -70,7 +70,7 @@ functions
 each return a pointer to an object with the following structure
 containing the broken-out fields of a line in the file system
 description file,
-.Aq Pa fstab.h .
+.In fstab.h .
 .Bd -literal -offset indent
 struct fstab {
 	char	*fs_spec;	/* block special device name */
diff --git a/lib/libc/gen/getgrent.3 b/lib/libc/gen/getgrent.3
index ca85a4a081b4..be37567299c5 100644
--- a/lib/libc/gen/getgrent.3
+++ b/lib/libc/gen/getgrent.3
@@ -78,7 +78,7 @@ Each line of the database is defined by the structure
 .Vt group
 found in the include
 file
-.Aq Pa grp.h :
+.In grp.h :
 .Bd -literal -offset indent
 struct group {
 	char	*gr_name;	/* group name */
diff --git a/lib/libc/gen/gethostname.3 b/lib/libc/gen/gethostname.3
index ac0b9f24a03e..325ce42e32a8 100644
--- a/lib/libc/gen/gethostname.3
+++ b/lib/libc/gen/gethostname.3
@@ -108,7 +108,7 @@ Callers should be aware that
 may be variable or infinite, but is guaranteed to be no less than
 .Brq Dv _POSIX_HOST_NAME_MAX .
 On older systems, this limit was defined in the non-standard header
-.Aq Pa sys/param.h
+.In sys/param.h
 as
 .Dv MAXHOSTNAMELEN ,
 and counted the terminating null.
diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3
index 0a5580ee46d6..da1988cfbb8e 100644
--- a/lib/libc/gen/getpwent.3
+++ b/lib/libc/gen/getpwent.3
@@ -79,7 +79,7 @@ Each entry in the database is defined by the structure
 .Vt passwd
 found in the include
 file
-.Aq Pa pwd.h :
+.In pwd.h :
 .Bd -literal -offset indent
 struct passwd {
 	char	*pw_name;	/* user name */
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index 33dfe8107aea..916802185259 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -376,7 +376,7 @@ If
 terminates due to an error, it sets errno and returns one of the
 following non-zero constants, which are defined in the include
 file
-.Aq Pa glob.h :
+.In glob.h :
 .Bl -tag -width GLOB_NOCHECK
 .It Dv GLOB_NOSPACE
 An attempt to allocate memory failed, or if
diff --git a/lib/libc/gen/msgctl.3 b/lib/libc/gen/msgctl.3
index b0264b5428c7..f049a1cf551a 100644
--- a/lib/libc/gen/msgctl.3
+++ b/lib/libc/gen/msgctl.3
@@ -58,7 +58,7 @@ may be altered by
 and parts of which determine the actions of
 .Fn msgctl .
 The data structure is defined in
-.Aq Pa sys/msg.h
+.In sys/msg.h
 and contains (amongst others) the following members:
 .Bd -literal
 struct msqid_ds {
@@ -85,7 +85,7 @@ The
 structure used inside the
 .Vt shmid_ds
 structure is defined in
-.Aq Pa sys/ipc.h
+.In sys/ipc.h
 and looks like this:
 .Bd -literal
 struct ipc_perm {
@@ -133,7 +133,7 @@ can only be increased by the super-user.
 Values for
 .Va msg_qbytes
 that exceed the system limit (MSGMNB from
-.Aq Pa sys/msg.h )
+.In sys/msg.h )
 are silently truncated to that limit.
 .It Dv IPC_RMID
 Remove the message queue specified by
diff --git a/lib/libc/gen/signal.3 b/lib/libc/gen/signal.3
index c536cd76141a..0e3b9edb8336 100644
--- a/lib/libc/gen/signal.3
+++ b/lib/libc/gen/signal.3
@@ -89,7 +89,7 @@ signals, the
 function allows for a signal to be caught, to be ignored, or to generate
 an interrupt.
 These signals are defined in the file
-.Aq Pa signal.h :
+.In signal.h :
 .Bl -column SIGVTALARMXX "create core imagexxx"
 .It Sy "Name	Default Action	Description"
 .It Dv SIGHUP Ta "terminate process" Ta "terminal line hangup"
diff --git a/lib/libc/gen/sysconf.3 b/lib/libc/gen/sysconf.3
index 3d0a0b92575b..86fb16f4a88e 100644
--- a/lib/libc/gen/sysconf.3
+++ b/lib/libc/gen/sysconf.3
@@ -58,7 +58,7 @@ The
 .Fa name
 argument specifies the system variable to be queried.
 Symbolic constants for each name value are found in the include file
-.Aq Pa unistd.h .
+.In unistd.h .
 Shell programmers who need access to these parameters should use the
 .Xr getconf 1
 utility.
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index acda7fc8c969..e91cd55512e7 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -182,7 +182,7 @@ for (i = 0; i < 100; i++) {
 .Ed
 .Pp
 The top level names are defined with a CTL_ prefix in
-.Aq Pa sys/sysctl.h ,
+.In sys/sysctl.h ,
 and are as follows.
 The next and subsequent levels down are found in the include files
 listed here, and described in separate sections below.
@@ -420,7 +420,7 @@ and
 is updated when the available APIs change.
 .Pp
 The userland release version is available from
-.Aq Pa osreldate.h ;
+.In osreldate.h ;
 parse this file if you need to get the release version of
 the currently installed userland.
 .It Li KERN_OSRELEASE
@@ -816,23 +816,23 @@ A process without appropriate privilege attempts to set a value.
 .El
 .Sh FILES
 .Bl -tag -width <netinet/icmpXvar.h> -compact
-.It Aq Pa sys/sysctl.h
+.It In sys/sysctl.h
 definitions for top level identifiers, second level kernel and hardware
 identifiers, and user level identifiers
-.It Aq Pa sys/socket.h
+.It In sys/socket.h
 definitions for second level network identifiers
-.It Aq Pa sys/gmon.h
+.It In sys/gmon.h
 definitions for third level profiling identifiers
-.It Aq Pa vm/vm_param.h
+.It In vm/vm_param.h
 definitions for second level virtual memory identifiers
-.It Aq Pa netinet/in.h
+.It In netinet/in.h
 definitions for third level IPv4/IPv6 identifiers and
 fourth level IPv4/v6 identifiers
-.It Aq Pa netinet/icmp_var.h
+.It In netinet/icmp_var.h
 definitions for fourth level ICMP identifiers
-.It Aq Pa netinet/icmp6.h
+.It In netinet/icmp6.h
 definitions for fourth level ICMPv6 identifiers
-.It Aq Pa netinet/udp_var.h
+.It In netinet/udp_var.h
 definitions for fourth level UDP identifiers
 .El
 .Sh SEE ALSO
diff --git a/lib/libc/gen/tcsetattr.3 b/lib/libc/gen/tcsetattr.3
index a369a916fac2..82df2a6f4995 100644
--- a/lib/libc/gen/tcsetattr.3
+++ b/lib/libc/gen/tcsetattr.3
@@ -97,7 +97,7 @@ The input and output baud rates are found in the termios structure.
 The unsigned integer
 .Li speed_t
 is typedef'd in the include file
-.Aq Pa termios.h .
+.In termios.h .
 The value of the integer corresponds directly to the baud rate being
 represented, however, the following symbolic values are defined.
 .Bd -literal
@@ -218,7 +218,7 @@ The
 argument is created by
 .Em or Ns 'ing
 the following values, as specified in the include file
-.Aq Pa termios.h .
+.In termios.h .
 .Bl -tag -width "TCSADRAIN"
 .It Fa TCSANOW
 The change occurs immediately.
diff --git a/lib/libc/gen/uname.3 b/lib/libc/gen/uname.3
index 330347deea28..d88ba33cfd2d 100644
--- a/lib/libc/gen/uname.3
+++ b/lib/libc/gen/uname.3
@@ -56,7 +56,7 @@ the current system into the structure referenced by
 The
 .Vt utsname
 structure is defined in the
-.Aq Pa sys/utsname.h
+.In sys/utsname.h
 header file, and contains the following members:
 .Bl -tag -width nodenameXXXX -offset indent
 .It sysname
diff --git a/lib/libc/gen/wordexp.3 b/lib/libc/gen/wordexp.3
index dac41d04e27e..7138bdcb1a82 100644
--- a/lib/libc/gen/wordexp.3
+++ b/lib/libc/gen/wordexp.3
@@ -91,7 +91,7 @@ Report error on an attempt to expand an undefined shell variable.
 The
 .Vt wordexp_t
 structure is defined in
-.Aq Pa wordexp.h
+.In wordexp.h
 as:
 .Bd -literal -offset indent
 typedef struct {
diff --git a/lib/libc/i386/sys/i386_get_ldt.2 b/lib/libc/i386/sys/i386_get_ldt.2
index 61448b91dc9e..67ae712e21c6 100644
--- a/lib/libc/i386/sys/i386_get_ldt.2
+++ b/lib/libc/i386/sys/i386_get_ldt.2
@@ -70,7 +70,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
-.Aq Pa i386/segments.h .
+.In 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/locale/ctype.3 b/lib/libc/locale/ctype.3
index 232ebe4797f5..3362c286885e 100644
--- a/lib/libc/locale/ctype.3
+++ b/lib/libc/locale/ctype.3
@@ -112,7 +112,7 @@
 The above functions perform character tests and conversions on the integer
 .Fa c .
 They are available as macros, defined in the include file
-.Aq Pa ctype.h ,
+.In ctype.h ,
 or as true functions in the C library.
 See the specific manual pages for more information.
 .Sh SEE ALSO
diff --git a/lib/libc/locale/nl_langinfo.3 b/lib/libc/locale/nl_langinfo.3
index 08d0523ed4f7..57071c456c5c 100644
--- a/lib/libc/locale/nl_langinfo.3
+++ b/lib/libc/locale/nl_langinfo.3
@@ -44,7 +44,7 @@ the particular language or cultural area defined in the program's locale.
 The manifest constant names and values of
 .Fa item
 are defined in
-.Aq Pa langinfo.h .
+.In langinfo.h .
 .Pp
 Calls to
 .Fn setlocale
diff --git a/lib/libc/locale/rune.3 b/lib/libc/locale/rune.3
index 3e90e2069138..3ce4de33ba22 100644
--- a/lib/libc/locale/rune.3
+++ b/lib/libc/locale/rune.3
@@ -92,7 +92,7 @@ The
 .Fn setrunelocale
 controls the type of encoding used to represent runes as multibyte strings
 as well as the properties of the runes as defined in
-.Aq Pa ctype.h .
+.In ctype.h .
 The
 .Fa locale
 argument indicates which locale to load.
diff --git a/lib/libc/net/addr2ascii.3 b/lib/libc/net/addr2ascii.3
index 31e9f3f7bbe2..fc9373d59cb0 100644
--- a/lib/libc/net/addr2ascii.3
+++ b/lib/libc/net/addr2ascii.3
@@ -106,15 +106,15 @@ addresses in the specified family:
 .It Dv AF_INET
 .Li struct in_addr
 (in
-.Aq Pa netinet/in.h )
+.In netinet/in.h )
 .It Dv AF_LINK
 .Li struct sockaddr_dl
 (in
-.Aq Pa net/if_dl.h )
+.In net/if_dl.h )
 .\" .It Dv AF_INET6
 .\" .Li struct in6_addr
 .\" (in
-.\" .Aq Pa netinet6/in6.h )
+.\" .In netinet6/in6.h )
 .El
 .Sh RETURN VALUES
 The
diff --git a/lib/libc/net/ethers.3 b/lib/libc/net/ethers.3
index 813fd74d18f8..4f774e52ad14 100644
--- a/lib/libc/net/ethers.3
+++ b/lib/libc/net/ethers.3
@@ -61,7 +61,7 @@
 These functions operate on ethernet addresses using an
 .Vt ether_addr
 structure, which is defined in the header file
-.Aq Pa netinet/if_ether.h :
+.In netinet/if_ether.h :
 .Bd -literal -offset indent
 /*
  * The number of bytes in an ethernet (MAC) address.
diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index f8c8f571d00c..b40f29ac0d2e 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -71,7 +71,7 @@ but in a more sophisticated manner.
 The
 .Li addrinfo
 structure is defined as a result of including the
-.Aq Pa netdb.h
+.In netdb.h
 header:
 .Bd -literal -offset
 struct addrinfo {
@@ -516,7 +516,7 @@ Error return status from
 .Fn getaddrinfo
 is zero on success and non-zero on errors.
 Non-zero error codes are defined in
-.Aq Pa netdb.h ,
+.In netdb.h ,
 and as follows:
 .Pp
 .Bl -tag -width EAI_ADDRFAMILY -compact
diff --git a/lib/libc/net/getifaddrs.3 b/lib/libc/net/getifaddrs.3
index 92d354749fe6..3d7ea4283498 100644
--- a/lib/libc/net/getifaddrs.3
+++ b/lib/libc/net/getifaddrs.3
@@ -45,7 +45,7 @@ on the local machine in the memory referenced by
 The list consists of
 .Nm ifaddrs
 structures, as defined in the include file
-.Aq Pa ifaddrs.h .
+.In ifaddrs.h .
 The
 .Nm ifaddrs
 structure contains at least the following entries:
@@ -115,12 +115,12 @@ field references address family specific data.  For
 addresses it contains a pointer to the
 .Fa struct if_data
 (as defined in include file
-.Aq Pa net/if.h )
+.In net/if.h )
 which contains various interface attributes and statistics.
 For all other address families, it contains a pointer to the
 .Fa struct ifa_data
 (as defined in include file
-.Aq Pa net/if.h )
+.In net/if.h )
 which contains per-address interface statistics.
 .Pp
 The data returned by
@@ -143,14 +143,14 @@ or
 .Xr sysctl 3 .
 .Sh BUGS
 If both
-.Aq Pa net/if.h
+.In net/if.h
 and
-.Aq Pa ifaddrs.h
+.In ifaddrs.h
 are being included,
-.Aq Pa net/if.h
+.In net/if.h
 .Em must
 be included before
-.Aq Pa ifaddrs.h .
+.In ifaddrs.h .
 .Sh SEE ALSO
 .Xr ioctl 2 ,
 .Xr socket 2 ,
diff --git a/lib/libc/net/getnameinfo.3 b/lib/libc/net/getnameinfo.3
index f0496e74ffb5..3267f43a1bb8 100644
--- a/lib/libc/net/getnameinfo.3
+++ b/lib/libc/net/getnameinfo.3
@@ -111,7 +111,7 @@ Unfortunately most systems do not provide constants that specify the
 maximum size of either a fully-qualified domain name or a service name.
 Therefore to aid the application in allocating buffers for these two
 returned strings the following constants are defined in
-.Aq Pa netdb.h :
+.In netdb.h :
 .Bd -literal -offset
 #define NI_MAXHOST  1025
 #define NI_MAXSERV    32
@@ -120,7 +120,7 @@ returned strings the following constants are defined in
 The first value is actually defined as the constant
 .Dv MAXDNAME
 in recent versions of BIND's
-.Aq Pa arpa/nameser.h
+.In arpa/nameser.h
 header
 (older versions of BIND define this constant to be 256)
 and the second is a guess based on the services listed in the current
@@ -176,7 +176,7 @@ that have different services for UDP and TCP.
 These
 .Dv NI_xxx
 flags are defined in
-.Aq Pa netdb.h .
+.In netdb.h .
 .\"
 .Sh EXTENSION
 The implementation allows experimental numeric IPv6 address notation with
diff --git a/lib/libc/net/if_indextoname.3 b/lib/libc/net/if_indextoname.3
index 7c7737edd59f..b1d1688081e5 100644
--- a/lib/libc/net/if_indextoname.3
+++ b/lib/libc/net/if_indextoname.3
@@ -73,7 +73,7 @@ function returns an array of
 .Vt if_nameindex
 structures, one structure per interface, as
 defined in the include file
-.Aq Pa net/if.h .
+.In net/if.h .
 The
 .Vt if_nameindex
 structure contains at least the following entries:
diff --git a/lib/libc/net/resolver.3 b/lib/libc/net/resolver.3
index 2a895002dafc..4b98ef251617 100644
--- a/lib/libc/net/resolver.3
+++ b/lib/libc/net/resolver.3
@@ -289,7 +289,7 @@ The query type
 is usually
 .Dv QUERY ,
 but can be any of the query types defined in
-.Aq Pa arpa/nameser.h .
+.In arpa/nameser.h .
 The domain name for the query is given by
 .Fa dname .
 The
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index af7f57509cfc..68edd7f99513 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -86,7 +86,7 @@ frees any dynamically-allocated storage used by the internal form
 of an RE.
 .Pp
 The header
-.Aq Pa regex.h
+.In regex.h
 declares two structure types,
 .Ft regex_t
 and
diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
index d1c19a40a48c..e19ac411ca80 100644
--- a/lib/libc/rpc/rpc.3
+++ b/lib/libc/rpc/rpc.3
@@ -23,11 +23,11 @@ to perform the requested service, and then sends back a reply.
 .Pp
 All
 RPC routines require the header
-.Aq Pa rpc/rpc.h .
+.In rpc/rpc.h .
 Routines that take a
 .Vt "struct netconfig"
 also require that
-.Aq Pa netconfig.h
+.In netconfig.h
 be included.
 .Sh Nettype
 Some of the high-level
diff --git a/lib/libc/rpc/rpc_svc_calls.3 b/lib/libc/rpc/rpc_svc_calls.3
index 11185769c404..c3265d818248 100644
--- a/lib/libc/rpc/rpc_svc_calls.3
+++ b/lib/libc/rpc/rpc_svc_calls.3
@@ -204,7 +204,7 @@ and thus not portable.
 This macro returns a pointer to a
 .Vt cmsgcred
 structure, defined in
-.Aq Pa sys/socket.h ,
+.In sys/socket.h ,
 identifying the calling client.
 This only works if the client is
 calling the server over an
diff --git a/lib/libc/rpc/rpc_svc_create.3 b/lib/libc/rpc/rpc_svc_create.3
index b1efa3ad94ba..4016a6c36b03 100644
--- a/lib/libc/rpc/rpc_svc_create.3
+++ b/lib/libc/rpc/rpc_svc_create.3
@@ -260,7 +260,7 @@ structure comes from the TLI/XTI SysV interface, which
 .Nx
 does not use.
 The structure is defined in
-.Aq Pa rpc/types.h
+.In rpc/types.h
 for compatibility as:
 .Bd -literal
 struct t_bind {
diff --git a/lib/libc/stdio/funopen.3 b/lib/libc/stdio/funopen.3
index bf2c15f5fc78..8c2b3e65bc2b 100644
--- a/lib/libc/stdio/funopen.3
+++ b/lib/libc/stdio/funopen.3
@@ -117,7 +117,7 @@ An error on
 does not keep the stream open.
 .Pp
 As a convenience, the include file
-.Aq Pa stdio.h
+.In stdio.h
 defines the macros
 .Fn fropen
 and
diff --git a/lib/libc/stdio/tmpnam.3 b/lib/libc/stdio/tmpnam.3
index fd22beac06aa..19e7ba82193c 100644
--- a/lib/libc/stdio/tmpnam.3
+++ b/lib/libc/stdio/tmpnam.3
@@ -85,7 +85,7 @@ did not reference an existing file at some indeterminate point in the
 past.
 .Dv P_tmpdir
 is defined in the include file
-.Aq Pa stdio.h .
+.In stdio.h .
 If the argument
 .Fa str
 is
@@ -103,7 +103,7 @@ is expected to be at least
 bytes in length.
 .Dv L_tmpnam
 is defined in the include file
-.Aq Pa stdio.h .
+.In stdio.h .
 .Pp
 The
 .Fn tempnam
diff --git a/lib/libc/stdlib/hcreate.3 b/lib/libc/stdlib/hcreate.3
index df46b2dbb0db..88943c117607 100644
--- a/lib/libc/stdlib/hcreate.3
+++ b/lib/libc/stdlib/hcreate.3
@@ -61,7 +61,7 @@ The
 argument is a structure of type
 .Vt ENTRY
 (defined in the
-.Aq Pa search.h
+.In search.h
 header) containing two pointers:
 .Fa item.key
 points to the comparison key (a
diff --git a/lib/libc/stdlib/rand.3 b/lib/libc/stdlib/rand.3
index 513a9f6a2ee0..c0500ba7970c 100644
--- a/lib/libc/stdlib/rand.3
+++ b/lib/libc/stdlib/rand.3
@@ -69,7 +69,7 @@ function computes a sequence of pseudo-random integers in the range
 of 0 to
 .Dv RAND_MAX
 (as defined by the header file
-.Aq Pa stdlib.h ) .
+.In stdlib.h ) .
 .Pp
 The
 .Fn srand
diff --git a/lib/libc/stdtime/ctime.3 b/lib/libc/stdtime/ctime.3
index 3557471838f8..68aa10b8bb55 100644
--- a/lib/libc/stdtime/ctime.3
+++ b/lib/libc/stdtime/ctime.3
@@ -266,7 +266,7 @@ returns the difference between two calendar times,
 expressed in seconds.
 .Pp
 External declarations as well as the tm structure definition are in the
-.Aq Pa time.h
+.In time.h
 include file.
 The tm structure includes at least the following fields:
 .Bd -literal -offset indent
diff --git a/lib/libc/string/bcmp.3 b/lib/libc/string/bcmp.3
index aa7c2cd49cdb..cc75ac17964f 100644
--- a/lib/libc/string/bcmp.3
+++ b/lib/libc/string/bcmp.3
@@ -73,9 +73,9 @@ A
 function first appeared in
 .Bx 4.2 .
 Its prototype existed previously in
-.Aq Pa string.h
+.In string.h
 before it was moved to
-.Aq Pa strings.h
+.In strings.h
 for
 .St -p1003.1-2001
 compliance.
diff --git a/lib/libc/string/bcopy.3 b/lib/libc/string/bcopy.3
index 48b3d5385aea..c7e9706f0d7b 100644
--- a/lib/libc/string/bcopy.3
+++ b/lib/libc/string/bcopy.3
@@ -73,9 +73,9 @@ A
 function appeared in
 .Bx 4.2 .
 Its prototype existed previously in
-.Aq Pa string.h
+.In string.h
 before it was moved to
-.Aq Pa strings.h
+.In strings.h
 for
 .St -p1003.1-2001
 compliance.
diff --git a/lib/libc/string/bzero.3 b/lib/libc/string/bzero.3
index 71b8520fd3fd..a8c4a2752955 100644
--- a/lib/libc/string/bzero.3
+++ b/lib/libc/string/bzero.3
@@ -70,9 +70,9 @@ function
 appeared in
 .Bx 4.3 .
 Its prototype existed previously in
-.Aq Pa string.h
+.In string.h
 before it was moved to
-.Aq Pa strings.h
+.In strings.h
 for
 .St -p1003.1-2001
 compliance.
diff --git a/lib/libc/string/ffs.3 b/lib/libc/string/ffs.3
index fd4de44b1953..5b5fb6f00e21 100644
--- a/lib/libc/string/ffs.3
+++ b/lib/libc/string/ffs.3
@@ -63,9 +63,9 @@ The
 function appeared in
 .Bx 4.3 .
 Its prototype existed previously in
-.Aq Pa string.h
+.In string.h
 before it was moved to
-.Aq Pa strings.h
+.In strings.h
 for
 .St -p1003.1-2001
 compliance.
diff --git a/lib/libc/string/index.3 b/lib/libc/string/index.3
index 5fd6977a5396..124597002a99 100644
--- a/lib/libc/string/index.3
+++ b/lib/libc/string/index.3
@@ -98,9 +98,9 @@ and
 functions appeared in
 .At v6 .
 Their prototypes existed previously in
-.Aq Pa string.h
+.In string.h
 before they were moved to
-.Aq Pa strings.h
+.In strings.h
 for
 .St -p1003.1-2001
 compliance.
diff --git a/lib/libc/string/strcasecmp.3 b/lib/libc/string/strcasecmp.3
index 05b3a48025ee..346b9e3414d6 100644
--- a/lib/libc/string/strcasecmp.3
+++ b/lib/libc/string/strcasecmp.3
@@ -96,9 +96,9 @@ and
 functions first appeared in
 .Bx 4.4 .
 Their prototypes existed previously in
-.Aq Pa string.h
+.In string.h
 before they were moved to
-.Aq Pa strings.h
+.In strings.h
 for
 .St -p1003.1-2001
 compliance.
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index e703df122c62..66b4d568303e 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -81,7 +81,7 @@ A mode is created from
 .Em or'd
 permission bit masks
 defined in
-.Aq Pa sys/stat.h :
+.In sys/stat.h :
 .Pp
 .Bd -literal -offset indent -compact
 #define S_IRWXU 0000700    /* RWX mask for owner */
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index a3ce3599df7e..c7d03c7e0993 100644
--- a/lib/libc/sys/getlogin.2
+++ b/lib/libc/sys/getlogin.2
@@ -162,7 +162,7 @@ pointed to a string that was too long.
 Login names are limited to
 .Dv MAXLOGNAME
 (from
-.Aq Pa sys/param.h )
+.In sys/param.h )
 characters, currently 17 including null.
 .It Bq Er EPERM
 The caller tried to set the login name and was not the super-user.
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index 10f1730a45a0..6be0ac0c568a 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -53,7 +53,7 @@ their error returns, and other common definitions and concepts.
 Nearly all of the system calls provide an error number referenced via
 the external identifier errno.
 This identifier is defined in
-.Aq Pa sys/errno.h
+.In sys/errno.h
 as
 .Pp
 .Dl extern    int *       __error();
@@ -88,7 +88,7 @@ to the type and circumstances of the call.
 .Pp
 The following is a complete list of the errors and their
 names as given in
-.Aq Pa sys/errno.h .
+.In sys/errno.h .
 .Bl -hang -width Ds
 .It Er 0 Em "Undefined error: 0" .
 Not used.
@@ -128,7 +128,7 @@ list of the new process exceeded the current limit
 of 65536 bytes
 .Dv ( NCARGS
 in
-.Aq Pa sys/param.h ) .
+.In sys/param.h ) .
 .It Er 8 ENOEXEC Em "Exec format error" .
 A request was made to execute a file
 that, although it has the appropriate permissions,
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index 468cfca894c3..d0abe5552e9a 100644
--- a/lib/libc/sys/kqueue.2
+++ b/lib/libc/sys/kqueue.2
@@ -95,7 +95,7 @@ argument
 is a pointer to an array of
 .Va kevent
 structures, as defined in
-.Aq Pa sys/event.h .
+.In sys/event.h .
 All changes contained in the
 .Fa changelist
 are applied before any pending events are read from the queue.
diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2
index b51558c6f5aa..6dabfd5503c4 100644
--- a/lib/libc/sys/ktrace.2
+++ b/lib/libc/sys/ktrace.2
@@ -133,7 +133,7 @@ bytes of a
 .Va ktr_type
 record.
 The type specific records are defined in the
-.Aq Pa sys/ktrace.h
+.In sys/ktrace.h
 include file.
 .Sh RETURN VALUES
 .Rv -std ktrace
diff --git a/lib/libc/sys/mincore.2 b/lib/libc/sys/mincore.2
index 836f846f3039..25ad07628fdf 100644
--- a/lib/libc/sys/mincore.2
+++ b/lib/libc/sys/mincore.2
@@ -64,7 +64,7 @@ The status is returned in the
 array, one character per page.
 Each character is either 0 if the page is not resident, or a combination of
 the following flags (defined in
-.Aq Pa sys/mman.h ) :
+.In sys/mman.h ) :
 .Bl -tag -width ".Dv MINCORE_REFERENCED_OTHER"
 .It Dv MINCORE_INCORE
 Page is in core (resident).
diff --git a/lib/libc/sys/poll.2 b/lib/libc/sys/poll.2
index dbbbcefe12ce..32566673ec7b 100644
--- a/lib/libc/sys/poll.2
+++ b/lib/libc/sys/poll.2
@@ -49,7 +49,7 @@ I/O.
 The
 .Fa fds
 argument is a pointer to an array of pollfd structures as defined in
-.Aq Pa poll.h
+.In poll.h
 (shown below).  The
 .Fa nfds
 argument determines the size of the
diff --git a/lib/libc/sys/ptrace.2 b/lib/libc/sys/ptrace.2
index be4482265080..807f907fa737 100644
--- a/lib/libc/sys/ptrace.2
+++ b/lib/libc/sys/ptrace.2
@@ -197,7 +197,7 @@ This request reads the traced process's machine registers into the
 .Vt "struct reg"
 .Dc
 (defined in
-.Aq Pa machine/reg.h )
+.In machine/reg.h )
 pointed to by
 .Fa addr .
 .It Dv PT_SETREGS
@@ -208,7 +208,7 @@ it loads the traced process's machine registers from the
 .Vt "struct reg"
 .Dc
 (defined in
-.Aq Pa machine/reg.h )
+.In machine/reg.h )
 pointed to by
 .Fa addr .
 .It Dv PT_GETFPREGS
@@ -218,7 +218,7 @@ the
 .Vt "struct fpreg"
 .Dc
 (defined in
-.Aq Pa machine/reg.h )
+.In machine/reg.h )
 pointed to by
 .Fa addr .
 .It Dv PT_SETFPREGS
@@ -229,7 +229,7 @@ it loads the traced process's floating-point registers from the
 .Vt "struct fpreg"
 .Dc
 (defined in
-.Aq Pa machine/reg.h )
+.In machine/reg.h )
 pointed to by
 .Fa addr .
 .It Dv PT_GETDBREGS
@@ -239,7 +239,7 @@ the
 .Vt "struct dbreg"
 .Dc
 (defined in
-.Aq Pa machine/reg.h )
+.In machine/reg.h )
 pointed to by
 .Fa addr .
 .It Dv PT_SETDBREGS
@@ -250,7 +250,7 @@ it loads the traced process's debug registers from the
 .Vt "struct dbreg"
 .Dc
 (defined in
-.Aq Pa machine/reg.h )
+.In machine/reg.h )
 pointed to by
 .Fa addr .
 .El
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index 619c2fd3bbe3..54c04da0fd69 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -59,7 +59,7 @@ The
 argument
 is a mask of options; the system call interface allows the following
 options, defined in the include file
-.Aq Pa sys/reboot.h ,
+.In sys/reboot.h ,
 to be passed
 to the new kernel or the new bootstrap and init programs.
 .Bl -tag -width RB_INITNAMEA
diff --git a/lib/libc/sys/select.2 b/lib/libc/sys/select.2
index 849d6aa36df5..7e9434f91151 100644
--- a/lib/libc/sys/select.2
+++ b/lib/libc/sys/select.2
@@ -181,7 +181,7 @@ it is possible
 to increase this size by having the program define
 .Dv FD_SETSIZE
 before the inclusion of any header which includes
-.Aq Pa sys/types.h .
+.In sys/types.h .
 .Pp
 If
 .Fa nfds
diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2
index 1c38751db9c7..a93cceaffb8f 100644
--- a/lib/libc/sys/sigaction.2
+++ b/lib/libc/sys/sigaction.2
@@ -275,7 +275,7 @@ signals that restart pending system calls continue to do so.
 .Pp
 The following is a list of all signals
 with names as in the include file
-.Aq Pa signal.h :
+.In signal.h :
 .Bl -column SIGVTALARMXX "create core imagexxx"
 .It Sy "NAME	Default Action	Description"
 .It Dv SIGHUP No "	terminate process" "	terminal line hangup"
diff --git a/lib/libc/sys/sigprocmask.2 b/lib/libc/sys/sigprocmask.2
index 1d8c59a6f97c..8f3a58631cb4 100644
--- a/lib/libc/sys/sigprocmask.2
+++ b/lib/libc/sys/sigprocmask.2
@@ -68,7 +68,7 @@ and the current mask.
 The function is specified by
 .Fa how
 using one of the following values from
-.Aq Pa signal.h :
+.In signal.h :
 .Bl -tag -width SIG_UNBLOCK
 .It Dv SIG_BLOCK
 The new mask is the union of the current mask and the specified
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index 98b2367ddb71..d5ec69ef8a2a 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -84,7 +84,7 @@ argument is a pointer to a
 .Vt stat
 structure
 as defined by
-.Aq Pa sys/stat.h
+.In sys/stat.h
 and into which information is placed concerning the file.
 .Pp
 The time-related fields of
@@ -169,7 +169,7 @@ has the following bits:
 .Ed
 .Pp
 For a list of access modes, see
-.Aq Pa sys/stat.h ,
+.In sys/stat.h ,
 .Xr access 2
 and
 .Xr chmod 2 .
diff --git a/lib/libc_r/man/pthread_once.3 b/lib/libc_r/man/pthread_once.3
index aed9698b4404..902f497888c1 100644
--- a/lib/libc_r/man/pthread_once.3
+++ b/lib/libc_r/man/pthread_once.3
@@ -83,7 +83,7 @@ was never called.
 The constant
 .Fa PTHREAD_ONCE_INIT
 is defined by header
-.Aq Pa pthread.h .
+.In pthread.h .
 .Pp
 The behavior of
 .Fn pthread_once
diff --git a/lib/libcalendar/calendar.3 b/lib/libcalendar/calendar.3
index 616399ca47fd..4c4c4ec2fe1a 100644
--- a/lib/libcalendar/calendar.3
+++ b/lib/libcalendar/calendar.3
@@ -174,7 +174,7 @@ returns the weekday (Mo = 0 .. Su = 6) of the day numbered
 The structure
 .Fa date
 is defined in
-.Aq Pa calendar.h .
+.In calendar.h .
 It contains these fields:
 .Bd -literal -offset indent
 int y;          /\(** year (0000 - ????) \(**/
diff --git a/lib/libcam/cam_cdbparse.3 b/lib/libcam/cam_cdbparse.3
index c771175c72c2..e31a0fb6ad5f 100644
--- a/lib/libcam/cam_cdbparse.3
+++ b/lib/libcam/cam_cdbparse.3
@@ -204,7 +204,7 @@ long.
 .Pp
 .Fa flags
 are the flags defined in
-.Aq Pa cam/cam_ccb.h :
+.In cam/cam_ccb.h :
 .Bd -literal
 /* Common CCB header */
 /* CAM CCB flags */
diff --git a/lib/libcompat/4.1/ftime.3 b/lib/libcompat/4.1/ftime.3
index 4a80a8fbc89a..87ee1b00f3e1 100644
--- a/lib/libcompat/4.1/ftime.3
+++ b/lib/libcompat/4.1/ftime.3
@@ -55,7 +55,7 @@ The
 .Fn ftime
 routine fills in a structure pointed to by its argument,
 as defined by
-.Aq Pa sys/timeb.h :
+.In sys/timeb.h :
 .Bd -literal -offset indent
 /*
  * Structure returned by ftime system call
diff --git a/lib/libcompat/4.4/cuserid.3 b/lib/libcompat/4.4/cuserid.3
index 168fcdaa3c75..4b823b25bbed 100644
--- a/lib/libcompat/4.4/cuserid.3
+++ b/lib/libcompat/4.4/cuserid.3
@@ -62,7 +62,7 @@ for at least
 .Em L_cuserid
 characters.
 The L_cuserid constant is defined in
-.Aq Pa stdio.h .
+.In stdio.h .
 .Pp
 If
 .Fa s
diff --git a/lib/libdevinfo/devinfo.3 b/lib/libdevinfo/devinfo.3
index b99d345881f1..8a33971a96c8 100644
--- a/lib/libdevinfo/devinfo.3
+++ b/lib/libdevinfo/devinfo.3
@@ -93,7 +93,7 @@ the library does not attempt to impose any structure on the data.
 .Pp
 Device, resource, and resource manager information is returned in
 data structures defined in
-.Aq Pa devinfo.h :
+.In devinfo.h :
 .Bd -literal -offset indent
 struct devinfo_dev {
     devinfo_handle_t	dd_handle;	/* device handle */
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index 2d7010f465e6..bbd860c57b67 100644
--- a/lib/libdevstat/devstat.3
+++ b/lib/libdevstat/devstat.3
@@ -157,7 +157,7 @@ structure.
 The
 .Va statinfo
 structure can be found in
-.Aq Pa devstat.h :
+.In devstat.h :
 .Bd -literal -offset indent
 struct statinfo {
 	long            cp_time[CPUSTATES];
diff --git a/lib/libedit/editline.3 b/lib/libedit/editline.3
index 3b899a49f56a..373e5cd0d65a 100644
--- a/lib/libedit/editline.3
+++ b/lib/libedit/editline.3
@@ -604,7 +604,7 @@ and
 .Dv EL_RPROMPT .
 .Sh BUGS
 The tokenization functions are not publically defined in
-.Aq Pa histedit.h .
+.In histedit.h .
 .Pp
 At this time, it is the responsibility of the caller to
 check the result of the
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index 9a1b1fa71d51..48241ff41530 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -149,7 +149,7 @@ and
 return a pointer to a
 .Vt url
 structure, which is defined as follows in
-.Aq Pa fetch.h :
+.In fetch.h :
 .Bd -literal
 #define URL_SCHEMELEN 16
 #define URL_USERLEN 256
@@ -204,7 +204,7 @@ structure pointed to by its second argument.
 The
 .Vt url_stat
 structure is defined as follows in
-.Aq Pa fetch.h :
+.In fetch.h :
 .Bd -literal
 struct url_stat {
     off_t	 size;
@@ -232,7 +232,7 @@ structures.
 The
 .Vt url_ent
 structure is defined as follows in
-.Aq Pa fetch.h :
+.In fetch.h :
 .Bd -literal
 struct url_ent {
     char         name[MAXPATHLEN];
@@ -401,7 +401,7 @@ All other functions return a stream pointer which may be used to
 access the requested document, or NULL if an error occurred.
 .Pp
 The following error codes are defined in
-.Aq Pa fetch.h :
+.In fetch.h :
 .Bl -tag -width 18n
 .It Bq Er FETCH_ABORT
 Operation aborted
diff --git a/lib/libpthread/man/pthread_once.3 b/lib/libpthread/man/pthread_once.3
index bb8abc8cf467..6527822207a4 100644
--- a/lib/libpthread/man/pthread_once.3
+++ b/lib/libpthread/man/pthread_once.3
@@ -83,7 +83,7 @@ was never called.
 The constant
 .Fa PTHREAD_ONCE_INIT
 is defined by header
-.Aq Pa pthread.h .
+.In pthread.h .
 .Pp
 The behavior of
 .Fn pthread_once
diff --git a/lib/libradius/libradius.3 b/lib/libradius/libradius.3
index 2e675bc79aca..fe856b497e5c 100644
--- a/lib/libradius/libradius.3
+++ b/lib/libradius/libradius.3
@@ -221,7 +221,7 @@ or
 may be used to specify vendor specific attributes.
 Vendor specific
 definitions may be found in
-.Aq Pa radlib_vs.h
+.In radlib_vs.h
 .Pp
 The library also provides a function
 .Fn rad_put_attr
diff --git a/lib/libtacplus/libtacplus.3 b/lib/libtacplus/libtacplus.3
index 98561636a5c8..954760759232 100644
--- a/lib/libtacplus/libtacplus.3
+++ b/lib/libtacplus/libtacplus.3
@@ -168,7 +168,7 @@ and
 .Va service
 arguments must be set to appropriate values as defined in the
 TACACS+ protocol specification.  The
-.Aq Pa taclib.h
+.In taclib.h
 header file contains symbolic constants for these values.
 .Sh CREATING A TACACS+ AUTHORIZATION REQUEST
 To begin constructing a new authorization request, call
@@ -180,7 +180,7 @@ and
 .Va service
 arguments must be set to appropriate values as defined in the
 TACACS+ protocol specification.  The
-.Aq Pa taclib.h
+.In taclib.h
 header file contains symbolic constants for these values.
 .Sh SETTING OPTIONAL PARAMETERS ON A REQUEST
 After creating a request,
@@ -222,7 +222,7 @@ packed into an integer value.  The status can be extracted using the
 macro
 .Fn TAC_AUTHEN_STATUS .
 Possible status codes, defined in
-.Aq Pa taclib.h ,
+.In taclib.h ,
 include:
 .Pp
 .Bl -item -compact -offset indent
@@ -312,7 +312,7 @@ number of attribute value (AV) pairs received packed into an
 integer value.  The status can be extracted using the macro
 .Fn TAC_AUTHOR_STATUS .
 Possible status codes, defined in
-.Aq Pa taclib.h ,
+.In taclib.h ,
 include:
 .Pp
 .Bl -item -compact -offset indent
diff --git a/lib/libusbhid/usbhid.3 b/lib/libusbhid/usbhid.3
index 7fc58e5c34b7..40e13656c740 100644
--- a/lib/libusbhid/usbhid.3
+++ b/lib/libusbhid/usbhid.3
@@ -147,7 +147,7 @@ will be filled with the relevant data for the item.
 The definition of
 .Vt hid_item_t
 can be found in
-.Aq Pa usbhid.h
+.In usbhid.h
 and the meaning of the components in the USB HID documentation.
 .Pp
 Data should be read/written to the device in the size of
diff --git a/libexec/talkd/talkd.8 b/libexec/talkd/talkd.8
index 671a5e1389c4..b1944b7b5600 100644
--- a/libexec/talkd/talkd.8
+++ b/libexec/talkd/talkd.8
@@ -55,7 +55,7 @@ to the server of
 type
 .Tn LOOK_UP
 (see
-.Aq Pa protocols/talkd.h ) .
+.In protocols/talkd.h ) .
 This causes the server to search its invitation
 tables to check if an invitation currently exists for the caller
 (to speak to the callee specified in the message).
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index 17df6d00c79a..7ee0065a244c 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -314,7 +314,7 @@ none of which are in current use.
 (See the definitions starting with
 .Dv FS_UNUSED
 in
-.Aq Pa sys/disklabel.h
+.In sys/disklabel.h
 for more details.)
 .It Ar fsize
 For
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 580cb9fefe4a..00dc6d3c2c8f 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -695,7 +695,7 @@ none of which are in current use.
 (See the definitions starting with
 .Dv FS_UNUSED
 in
-.Aq Pa sys/disklabel.h
+.In sys/disklabel.h
 for more details.)
 .It Ar fsize
 For
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 44d6288dfd67..24cca4c7d308 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -156,7 +156,7 @@ The default value used is
 defined by
 .Dv MINFREE
 from
-.Aq Pa ufs/ffs/fs.h ,
+.In ufs/ffs/fs.h ,
 currently 8%.
 See
 .Xr tunefs 8
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index 41c72ce2d713..3c9a24abe7bc 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -486,7 +486,7 @@ heard from the specified
 a status of two if the transmission was successful but no responses
 were received; or another value
 (from
-.Aq Pa sysexits.h )
+.In sysexits.h )
 if an error occurred.
 .Sh SEE ALSO
 .Xr netstat 1 ,
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 2190301d1c2a..5f9f7dec6486 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -262,22 +262,22 @@ More variables than these exist, and the best and likely only place
 to search for their deeper meaning is undoubtedly the source where
 they are defined.
 .Sh FILES
-.Bl -tag -width ".Aq Pa netinet/icmp_var.h" -compact
-.It Aq Pa sys/sysctl.h
+.Bl -tag -width ".In netinet/icmp_var.h" -compact
+.It In sys/sysctl.h
 definitions for top level identifiers, second level kernel and hardware
 identifiers, and user level identifiers
-.It Aq Pa sys/socket.h
+.It In sys/socket.h
 definitions for second level network identifiers
-.It Aq Pa sys/gmon.h
+.It In sys/gmon.h
 definitions for third level profiling identifiers
-.It Aq Pa vm/vm_param.h
+.It In vm/vm_param.h
 definitions for second level virtual memory identifiers
-.It Aq Pa netinet/in.h
+.It In netinet/in.h
 definitions for third level Internet identifiers and
 fourth level IP identifiers
-.It Aq Pa netinet/icmp_var.h
+.It In netinet/icmp_var.h
 definitions for fourth level ICMP identifiers
-.It Aq Pa netinet/udp_var.h
+.It In netinet/udp_var.h
 definitions for fourth level UDP identifiers
 .El
 .Sh COMPATIBILITY
diff --git a/sbin/vinum/vinum.8 b/sbin/vinum/vinum.8
index 216cf2b01327..a53e352fcfd9 100644
--- a/sbin/vinum/vinum.8
+++ b/sbin/vinum/vinum.8
@@ -545,7 +545,7 @@ reboot in order to leave the debugger.
 .It Ic debug Ar flags
 Set a bit mask of internal debugging flags.  These will change without warning
 as the product matures; to be certain, read the header file
-.Aq Pa sys/dev/vinumvar.h .
+.In sys/dev/vinumvar.h .
 The bit mask is composed of the following values:
 .Bl -tag -width indent
 .It Dv DEBUG_ADDRESSES Pq No 1
@@ -1105,7 +1105,7 @@ have an existing configuration which you never want to see again.
 .Xc
 .Nm
 maintains a number of statistical counters for each object.  See the header file
-.Aq Pa sys/dev/vinumvar.h
+.In sys/dev/vinumvar.h
 for more information.
 .\" XXX put it in here when it's finalized
 Use the
diff --git a/share/examples/mdoc/example.3 b/share/examples/mdoc/example.3
index 2c5c22e385c9..35e20b5993bf 100644
--- a/share/examples/mdoc/example.3
+++ b/share/examples/mdoc/example.3
@@ -65,7 +65,7 @@ Second example.
 .El
 .Pp
 The above values are defined in
-.Aq Pa example.h
+.In example.h
 as follows:
 .Bd -literal
 #define EXAMPLE_ONE  1
diff --git a/share/man/man3/pthread_once.3 b/share/man/man3/pthread_once.3
index aed9698b4404..902f497888c1 100644
--- a/share/man/man3/pthread_once.3
+++ b/share/man/man3/pthread_once.3
@@ -83,7 +83,7 @@ was never called.
 The constant
 .Fa PTHREAD_ONCE_INIT
 is defined by header
-.Aq Pa pthread.h .
+.In pthread.h .
 .Pp
 The behavior of
 .Fn pthread_once
diff --git a/share/man/man3/stdarg.3 b/share/man/man3/stdarg.3
index a91566a31ae7..8dcd18099c13 100644
--- a/share/man/man3/stdarg.3
+++ b/share/man/man3/stdarg.3
@@ -56,7 +56,7 @@
 A function may be called with a varying number of arguments of varying
 types.
 The include file
-.Aq Pa stdarg.h
+.In stdarg.h
 declares a type
 .Pq Em va_list
 and defines three macros for stepping
@@ -211,7 +211,7 @@ These macros are
 compatible with the historic macros they replace.
 A backward compatible version can be found in the include
 file
-.Aq Pa varargs.h .
+.In varargs.h .
 .Sh BUGS
 Unlike the
 .Em varargs
diff --git a/share/man/man3/timeradd.3 b/share/man/man3/timeradd.3
index 6d5de8bd73ea..7b6293f0dbfb 100644
--- a/share/man/man3/timeradd.3
+++ b/share/man/man3/timeradd.3
@@ -58,7 +58,7 @@ and
 .Xr settimeofday 2
 calls.
 The structure is defined in
-.Aq Pa sys/time.h
+.In sys/time.h
 as:
 .Bd -literal
 struct timeval {
diff --git a/share/man/man4/agp.4 b/share/man/man4/agp.4
index cfdf9085151c..a0f1ef8cd6df 100644
--- a/share/man/man4/agp.4
+++ b/share/man/man4/agp.4
@@ -64,7 +64,7 @@ The following
 operations can be performed on
 .Pa /dev/agpgart ,
 which are defined in
-.Aq Pa sys/agpio.h :
+.In sys/agpio.h :
 .Bl -tag -width indent
 .It Dv AGPIOC_INFO
 Returns state of the
@@ -104,7 +104,7 @@ typedef struct _agp_setup {
 .Ed
 .Pp
 The mode bits are defined in
-.Aq Pa sys/agpio.h .
+.In sys/agpio.h .
 .It Dv AGPIOC_ALLOCATE
 Allocate physical memory suitable for mapping into the AGP aperture.
 This
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index 0dfc8c30ff34..1d11710da4a2 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -98,7 +98,7 @@ links are supported.
 The
 .Xr ioctl 2
 command codes below are defined in
-.Aq Pa net/bpf.h .
+.In net/bpf.h .
 All commands require
 these includes:
 .Bd -literal
@@ -113,9 +113,9 @@ Additionally,
 and
 .Dv BIOCSETIF
 require
-.Aq Pa sys/socket.h
+.In sys/socket.h
 and
-.Aq Pa net/if.h .
+.In net/if.h .
 .Pp
 In addition to
 .Dv FIONREAD
@@ -154,7 +154,7 @@ is returned if no interface has been specified.
 The device types, prefixed with
 .Dq Li DLT_ ,
 are defined in
-.Aq Pa net/bpf.h .
+.In net/bpf.h .
 .It Dv BIOCPROMISC
 Forces the interface into promiscuous mode.
 All packets, not just those destined for the local host, are processed.
@@ -275,7 +275,7 @@ The current version numbers are given by
 and
 .Dv BPF_MINOR_VERSION
 from
-.Aq Pa net/bpf.h .
+.In net/bpf.h .
 An incompatible filter
 may result in undefined behavior (most likely, an error returned by
 .Fn ioctl
@@ -359,7 +359,7 @@ has some knowledge of how to get from packet to packet.
 The macro
 .Dv BPF_WORDALIGN
 is defined in
-.Aq Pa net/bpf.h
+.In net/bpf.h
 to facilitate
 this process.
 It rounds up its argument to the nearest word aligned value (where a word is
@@ -422,7 +422,7 @@ and
 Various other mode and
 operator bits are or'd into the class to give the actual instructions.
 The classes and modes are defined in
-.Aq Pa net/bpf.h .
+.In net/bpf.h .
 .Pp
 Below are the semantics for each defined
 .Nm
diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index 7c491f5bd87a..87f78abb754d 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -99,9 +99,9 @@ calls which apply to
 .Tn CD-ROM
 drives are defined
 in the header files
-.Aq Pa sys/cdio.h
+.In sys/cdio.h
 and
-.Aq Pa sys/disklabel.h .
+.In sys/disklabel.h .
 .Pp
 .Bl -tag -width CDIOCREADSUBCHANNEL
 .It Dv DIOCGDINFO
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index 9bad5b2315a0..48dbbf6ba175 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -97,7 +97,7 @@ The following
 calls apply to the changer.
 They are defined
 in the header file
-.Aq Pa sys/chio.h .
+.In sys/chio.h .
 .Pp
 .Bl -tag -width CHIOEXCHANGE
 .It Dv CHIOMOVE
diff --git a/share/man/man4/da.4 b/share/man/man4/da.4
index c35b59f4726a..b7685895d07c 100644
--- a/share/man/man4/da.4
+++ b/share/man/man4/da.4
@@ -165,7 +165,7 @@ calls apply to
 .Tn SCSI
 disks as well as to other disks.
 They are defined in the header file
-.Aq Pa sys/disklabel.h .
+.In sys/disklabel.h .
 .Pp
 .Bl -tag -width DIOCSDINFO
 .It Dv DIOCSBAD
diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4
index 1fe6c4bfe6f4..2293cf1f18ea 100644
--- a/share/man/man4/fdc.4
+++ b/share/man/man4/fdc.4
@@ -178,7 +178,7 @@ driver offers a number of configurable options using
 .Xr ioctl 2 .
 In order to access any of this functionality, programmers need to
 include the header file
-.Aq Pa sys/fdcio.h
+.In sys/fdcio.h
 into their programs.
 The call to
 .Xr open 2
diff --git a/share/man/man4/ifmib.4 b/share/man/man4/ifmib.4
index f4a106ccff49..6c0a02740741 100644
--- a/share/man/man4/ifmib.4
+++ b/share/man/man4/ifmib.4
@@ -78,7 +78,7 @@ The manifest constants for each level in the
 .Xr sysctl 3
 .Ar name
 are defined in
-.Aq Pa net/if_mib.h .
+.In net/if_mib.h .
 The index of the last row in the table is given by
 .Dq Li net.link.generic.system.ifcount
 (or, using the manifest constants,
@@ -132,7 +132,7 @@ the number of promiscuous listeners
 .It Li ifmd_flags
 .Pq Li int
 the interface's flags (defined in
-.Aq Pa net/if.h )
+.In net/if.h )
 .It Li ifmd_snd_len
 .Pq Li int
 the current instantaneous length of the send queue
@@ -143,7 +143,7 @@ was full
 .It Li ifmd_data
 .Pq Li struct if_data
 more information from a structure defined in
-.Aq Pa net/if.h
+.In net/if.h
 (see
 .Xr if_data 9 )
 .El
@@ -161,7 +161,7 @@ and
 interfaces, the structure is called
 .Dq Li struct ifmib_iso_8802_3
 (defined in
-.Aq Pa net/if_mib.h ) ,
+.In net/if_mib.h ) ,
 and implements a superset of the
 .Tn "RFC 1650"
 MIB for Ethernet-like networks.
@@ -170,7 +170,7 @@ For
 .Dv IFT_SLIP ,
 the structure is a
 .Dq Li struct sl_softc
-.Pq Aq Pa net/if_slvar.h .
+.Pq In net/if_slvar.h .
 .Sh SEE ALSO
 .Xr sysctl 3 ,
 .Xr intro 4 ,
diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4
index 3296a392057f..9dfbed3256f9 100644
--- a/share/man/man4/inet.4
+++ b/share/man/man4/inet.4
@@ -63,7 +63,7 @@ network standard format (on the
 these are word and byte
 reversed).
 The include file
-.Aq Pa netinet/in.h
+.In netinet/in.h
 defines this address
 as a discriminated union.
 .Pp
diff --git a/share/man/man4/inet6.4 b/share/man/man4/inet6.4
index 0fc15a420a8a..18d7451f2d44 100644
--- a/share/man/man4/inet6.4
+++ b/share/man/man4/inet6.4
@@ -68,7 +68,7 @@ protocol.
 .Sh ADDRESSING
 IPv6 addresses are 16 byte quantities, stored in network standard byteorder.
 The include file
-.Aq Pa netinet/in.h
+.In netinet/in.h
 defines this address
 as a discriminated union.
 .Pp
diff --git a/share/man/man4/ktr.4 b/share/man/man4/ktr.4
index fd21d5ef13f9..3b381e991539 100644
--- a/share/man/man4/ktr.4
+++ b/share/man/man4/ktr.4
@@ -81,7 +81,7 @@ By default the run time mask is set to log only
 .Dv KTR_GEN
 events.
 The definitions of the event mask bits can be found in
-.Aq Pa sys/ktr.h .
+.In sys/ktr.h .
 .Pp
 Furthermore, there is a CPU event mask whose default value can be changed via
 the
diff --git a/share/man/man4/man4.i386/perfmon.4 b/share/man/man4/man4.i386/perfmon.4
index d4f15f94e2c1..27913825f7d3 100644
--- a/share/man/man4/man4.i386/perfmon.4
+++ b/share/man/man4/man4.i386/perfmon.4
@@ -59,7 +59,7 @@ the special device file
 This device supports a number of
 .Xr ioctl 2
 requests, defined in
-.Aq Pa machine/perfmon.h
+.In machine/perfmon.h
 along with the definitions of the various counters for both
 .Tn Pentium
 and
@@ -87,7 +87,7 @@ the number of the counter in question; must be less than
 (currently 2).
 .It Li "u_char pmc_event"
 the particular event number to be monitored, as defined in
-.Aq Pa machine/perfmon.h .
+.In machine/perfmon.h .
 .It Li "u_char pmc_unit"
 the unit mask value, specific to the event type (see the
 .Tn Intel
diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4
index 4387a7d8fd18..61540feffecc 100644
--- a/share/man/man4/mem.4
+++ b/share/man/man4/mem.4
@@ -78,7 +78,7 @@ These attributes can be manipulated via
 calls performed on
 .Pa /dev/mem .
 Declarations and data types are to be found in
-.Aq Pa sys/memrange.h .
+.In sys/memrange.h .
 .Pp
 The specific attributes, and number of programmable ranges may vary between
 architectures.
diff --git a/share/man/man4/mtio.4 b/share/man/man4/mtio.4
index 46022a65d55b..504e8cd4ec57 100644
--- a/share/man/man4/mtio.4
+++ b/share/man/man4/mtio.4
@@ -80,7 +80,7 @@ A number of
 operations are available
 on raw magnetic tape.
 The following definitions are from
-.Aq Pa sys/mtio.h :
+.In sys/mtio.h :
 .Bd  -literal
 #ifndef	_SYS_MTIO_H_
 #define	_SYS_MTIO_H_
diff --git a/share/man/man4/ng_source.4 b/share/man/man4/ng_source.4
index d56b684d1810..bdae89bec2f1 100644
--- a/share/man/man4/ng_source.4
+++ b/share/man/man4/ng_source.4
@@ -322,7 +322,7 @@ starving the NIC.
 For clarity and simplicity, debugging messages and instrumentation code
 has been removed.
 On i386 one can include
-.Aq Pa machine/cpufunc.h
+.In machine/cpufunc.h
 to have access to the
 .Fn rdtsc
 function to read the instruction counter at the
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index 86e463efa873..34759c01e203 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -68,7 +68,7 @@ calls are supported by the
 .Nm
 driver.
 They are defined in the header file
-.Aq Pa sys/pciio.h .
+.In sys/pciio.h .
 .Bl -tag -width 012345678901234
 .Pp
 .It PCIOCGETCONF
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index b6e167c5ef99..3dd4fb8dd514 100644
--- a/share/man/man4/pcm.4
+++ b/share/man/man4/pcm.4
@@ -85,7 +85,7 @@ memory-mapped access to the audio buffers). As a consequence, some
 applications may need to be recompiled with a slightly modified
 audio module.
 See
-.Aq Pa sys/soundcard.h
+.In sys/soundcard.h
 for a complete list of the supported ioctls.
 .Sh SUPPORTED CARDS
 Below we include a list of supported codecs/cards.
diff --git a/share/man/man4/pt.4 b/share/man/man4/pt.4
index 112b56184fd5..1589f58d6f3d 100644
--- a/share/man/man4/pt.4
+++ b/share/man/man4/pt.4
@@ -63,7 +63,7 @@ The following
 calls are supported by the
 .Nm
 driver.  They are defined in the header file
-.Aq Pa sys/ptio.h .
+.In sys/ptio.h .
 .Pp
 .It PTIOCGETTIMEOUT
 This ioctl allows userland applications to fetch the current
diff --git a/share/man/man4/ses.4 b/share/man/man4/ses.4
index 816c6ad2f055..4070c89d753e 100644
--- a/share/man/man4/ses.4
+++ b/share/man/man4/ses.4
@@ -77,7 +77,7 @@ calls apply to
 .Nm
 devices.
 They are defined in the header file
-.Aq Pa cam/scsi/scsi_ses.h
+.In cam/scsi/scsi_ses.h
 (\fIq.v.\fR).
 .Pp
 .Bl -tag -width SESIOC_GETENCSTAT
@@ -108,7 +108,7 @@ Initialize the enclosure.
 .El
 .Sh EXAMPLE USAGE
 The files contained in
-.Aq Pa usr/share/examples/ses
+.In usr/share/examples/ses
 show simple mechanisms for how to use these interfaces, as well as a
 very stupid simple monitoring daemon.
 .Sh FILES
diff --git a/share/man/man4/tap.4 b/share/man/man4/tap.4
index fc818ef203b5..c05bff6bb5f0 100644
--- a/share/man/man4/tap.4
+++ b/share/man/man4/tap.4
@@ -123,7 +123,7 @@ The following
 .Xr ioctl 2
 calls are supported
 (defined in
-.Aq Pa net/if_tap.h ) :
+.In net/if_tap.h ) :
 .Bl -tag -width VMIO_SIOCSETMACADDR
 .It Dv TAPSDEBUG
 The argument should be a pointer to an
diff --git a/share/man/man4/targ.4 b/share/man/man4/targ.4
index 5e8a727a068e..f3618c038fdd 100644
--- a/share/man/man4/targ.4
+++ b/share/man/man4/targ.4
@@ -72,7 +72,7 @@ Any data transfers requested by the user CCBs are done via zero-copy IO.
 The following
 .Xr ioctl 2
 calls are defined in the header file
-.Aq Pa cam/scsi/scsi_targetio.h .
+.In cam/scsi/scsi_targetio.h .
 .Bl -tag -width ".Dv TARGIOCDISABLE"
 .It Dv TARGIOCENABLE
 .Pq Vt "struct ioc_enable_lun"
@@ -114,7 +114,7 @@ it.
 .El
 .Sh FILES
 .Bl -tag -width ".Pa /sys/cam/scsi/scsi_target.c" -compact
-.It Aq Pa cam/scsi/scsi_targetio.h
+.It In cam/scsi/scsi_targetio.h
 describes the usermode interface.
 .It Pa /sys/cam/scsi/scsi_target.c
 is the driver source file.
diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4
index d03c84304aa7..fc1a7bb83b6f 100644
--- a/share/man/man4/tcp.4
+++ b/share/man/man4/tcp.4
@@ -186,7 +186,7 @@ available from
 or
 .Dv IPPROTO_TCP .
 All options are declared in
-.Aq Pa netinet/tcp.h .
+.In netinet/tcp.h .
 .Pp
 Options at the
 .Tn IP
diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4
index 440b66a9c162..5c9de56bb5be 100644
--- a/share/man/man4/termios.4
+++ b/share/man/man4/termios.4
@@ -823,7 +823,7 @@ Routines that need to control certain terminal
 .Tn I/O
 characteristics
 do so by using the termios structure as defined in the header
-.Aq Pa termios.h .
+.In termios.h .
 This structure contains minimally four scalar elements of bit flags
 and one array of special characters.
 The scalar flag elements are named:
@@ -1494,7 +1494,7 @@ This table lists the array index, the corresponding special character,
 and the system default value.
 For an accurate list of
 the system defaults, consult the header file
-.Aq Pa ttydefaults.h .
+.In ttydefaults.h .
 .Pp
 .Bl -column "Index Name" "Special Character" -offset indent -compact
 .It Em "Index Name	Special Character	Default Value"
@@ -1543,4 +1543,4 @@ after
 .Fn open
 is set according to
 the values in the header
-.Aq Pa sys/ttydefaults.h .
+.In sys/ttydefaults.h .
diff --git a/share/man/man4/ti.4 b/share/man/man4/ti.4
index 239f722d3328..8fab9b6c4013 100644
--- a/share/man/man4/ti.4
+++ b/share/man/man4/ti.4
@@ -203,7 +203,7 @@ the user can
 debug firmware running on the Tigon board.
 .Pp
 These ioctls and their arguments are defined in the
-.Aq Pa sys/tiio.h
+.In sys/tiio.h
 header file.
 .Bl -tag -width ".Dv ALT_WRITE_TG_MEM"
 .It Dv TIIOCGETSTATS
diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4
index 43dc28a49073..a7029a4988d1 100644
--- a/share/man/man4/tty.4
+++ b/share/man/man4/tty.4
@@ -168,7 +168,7 @@ file descriptor zero by the following code fragment:
 Change to the new line discipline pointed to by
 .Fa ldisc .
 The available line disciplines are listed in
-.Aq Pa sys/ttycom.h
+.In sys/ttycom.h
 and currently are:
 .Pp
 .Bl -tag -width NETGRAPHDISC -compact
@@ -313,7 +313,7 @@ If the value of the int pointed to by
 contains the
 .Dv FREAD
 bit as defined in
-.Aq Pa sys/file.h ,
+.In sys/file.h ,
 then all characters in the input queue are cleared.
 If it contains the
 .Dv FWRITE
@@ -336,7 +336,7 @@ screen size.
 The
 .Va winsize
 structure is defined in
-.Aq Pa sys/ioctl.h .
+.In sys/ioctl.h .
 .It Dv TIOCSWINSZ Fa struct winsize *ws
 Set the window size associated with the terminal to be the value in
 the
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index fdf509639f42..dfdad16e830a 100644
--- a/share/man/man4/tun.4
+++ b/share/man/man4/tun.4
@@ -155,7 +155,7 @@ The following
 .Xr ioctl 2
 calls are supported
 (defined in
-.Aq Pa net/if_tun.h ) :
+.In net/if_tun.h ) :
 .Bl -tag -width ".Dv TUNSIFMODE"
 .It Dv TUNSDEBUG
 The argument should be a pointer to an
@@ -175,7 +175,7 @@ device.
 The
 .Vt struct tuninfo
 is declared in
-.Aq Pa net/if_tun.h .
+.In net/if_tun.h .
 .Pp
 The use of this ioctl is restricted to the super-user.
 .It Dv TUNGIFINFO
diff --git a/share/man/man4/unix.4 b/share/man/man4/unix.4
index a2e9356ef56e..8b84a7df62e8 100644
--- a/share/man/man4/unix.4
+++ b/share/man/man4/unix.4
@@ -62,7 +62,7 @@ file system pathnames for addressing.
 addresses are variable-length file system pathnames of
 at most 104 characters.
 The include file
-.Aq Pa sys/un.h
+.In sys/un.h
 defines this address:
 .Bd -literal -offset indent
 struct sockaddr_un {
@@ -125,7 +125,7 @@ Any valid descriptor may be sent in a message.
 The file descriptor(s) to be passed are described using a
 .Vt "struct cmsghdr"
 that is defined in the include file
-.Aq Pa sys/socket.h .
+.In sys/socket.h .
 The type of the message is
 .Dv SCM_RIGHTS ,
 and the data portion of the messages is an array of integers
@@ -160,7 +160,7 @@ of the server.
 These will arrive in the form of a filled in
 .Vt "struct xucred"
 (defined in
-.Aq Pa sys/ucred.h ) .
+.In sys/ucred.h ) .
 The credentials presented to the server (the
 .Xr listen 2
 caller) are those of the client when it called
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 57b2b77b35c3..337a8b47d93a 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -154,8 +154,6 @@ Use the following to get access to the
 .Tn USB
 specific structures and defines.
 .Pp
-.In dev/usb/usb.h
-.Pp
 The
 .Pa /dev/usb Ns Ar N
 can be opened and a few operations can be performed on it.
@@ -281,7 +279,7 @@ can destroy the bus integrity.
 .El
 .Pp
 The include file
-.Aq Pa dev/usb/usb.h
+.In dev/usb/usb.h
 contains definitions for the types used by the various
 .Xr ioctl 2
 calls.
@@ -298,7 +296,7 @@ and
 macros to handle byte order and alignment properly.
 .Pp
 The include file
-.Aq Pa dev/usb/usbhid.h
+.In dev/usb/usbhid.h
 similarly contains the definitions for
 Human Interface Devices
 .Pq Tn HID .
diff --git a/share/man/man5/a.out.5 b/share/man/man5/a.out.5
index c6b4784857b7..ad874776bf75 100644
--- a/share/man/man5/a.out.5
+++ b/share/man/man5/a.out.5
@@ -45,7 +45,7 @@
 .In a.out.h
 .Sh DESCRIPTION
 The include file
-.Aq Pa a.out.h
+.In a.out.h
 declares three structures and several macros.
 The structures describe the format of
 executable machine code files
@@ -405,7 +405,7 @@ field hold one of two values:
 and
 .Dv AUX_OBJECT
 (see
-.Aq Pa link.h
+.In link.h
 for their definitions).
 .Dv AUX_FUNC
 associates the symbol with a callable function, while
diff --git a/share/man/man5/core.5 b/share/man/man5/core.5
index 27df5dd20607..437d676a4700 100644
--- a/share/man/man5/core.5
+++ b/share/man/man5/core.5
@@ -96,14 +96,14 @@ area, whose size (in pages) is
 defined by the
 .Dv UPAGES
 manifest in the
-.Aq Pa sys/param.h
+.In sys/param.h
 file.
 The
 .Fa u.
 area starts with a
 .Fa user
 structure as given in
-.Aq Pa sys/user.h .
+.In sys/user.h .
 The remainder of the core
 file consists of the data pages followed by
 the stack pages of the process image.
@@ -123,7 +123,7 @@ area.
 The size of a ``page'' is given by the constant
 .Dv PAGE_SIZE
 (also from
-.Aq Pa sys/param.h ) .
+.In sys/param.h ) .
 .Sh EXAMPLES
 In order to store all core images in per-user private areas under
 .Pa /var/coredumps ,
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index 0dd496908061..2be201fb7e60 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -34,7 +34,7 @@
 .In elf.h
 .Sh DESCRIPTION
 The header file
-.Aq Pa elf.h
+.In elf.h
 defines the format of ELF executable binary files.
 Amongst these files are
 normal executable files, relocatable object files, core files and shared
diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5
index fac8515f87c0..48b4c1b56e73 100644
--- a/share/man/man5/fs.5
+++ b/share/man/man5/fs.5
@@ -49,9 +49,9 @@
 .In ufs/ufs/inode.h
 .Sh DESCRIPTION
 The files
-.Aq Pa fs.h
+.In fs.h
 and
-.Aq Pa inode.h
+.In inode.h
 declare several structures, defined variables and macros
 which are used to create and manage the underlying format of
 file system objects on random access devices (disks).
@@ -74,7 +74,7 @@ that is of size
 .Dv SBLOCKSIZE .
 The following structure describes the super-block and is
 from the file
-.Aq Pa ufs/ffs/fs.h :
+.In ufs/ffs/fs.h :
 .Bd -literal
 /*
  * Super block for an FFS filesystem.
@@ -377,7 +377,7 @@ each current directory, each mounted-on file,
 text file, and the root.
 An inode is `named' by its device/i-number pair.
 For further information, see the include file
-.Aq Pa ufs/ufs/inode.h .
+.In ufs/ufs/inode.h .
 .Sh HISTORY
 A super-block structure named filsys appeared in
 .At v6 .
diff --git a/share/man/man5/group.5 b/share/man/man5/group.5
index 0f22a1830a09..7dc1fc643082 100644
--- a/share/man/man5/group.5
+++ b/share/man/man5/group.5
@@ -107,7 +107,7 @@ file.
 .\" the fields are read into the structure
 .\" .Fa group
 .\" declared in
-.\" .Aq Pa grp.h :
+.\" .In grp.h :
 .\" .Bd -literal -offset indent
 .\" struct group {
 .\"	char    *gr_name;        /* group name */
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index 167163ef3711..bbf019a4cd48 100644
--- a/share/man/man5/link.5
+++ b/share/man/man5/link.5
@@ -40,7 +40,7 @@
 .In link.h
 .Sh DESCRIPTION
 The include file
-.Aq Pa link.h
+.In link.h
 declares several structures that are present in dynamically linked
 programs and libraries.
 The structures define the interface between several components of the
diff --git a/share/man/man5/stab.5 b/share/man/man5/stab.5
index b2d670eb11cd..14eeef521e25 100644
--- a/share/man/man5/stab.5
+++ b/share/man/man5/stab.5
@@ -42,7 +42,7 @@
 .In stab.h
 .Sh DESCRIPTION
 The file
-.Aq Pa stab.h
+.In stab.h
 defines some of the symbol table
 .Fa n_type
 field values for a.out files.
@@ -94,7 +94,7 @@ The low bits of the
 field are used to place a symbol into
 at most one segment, according to
 the following masks, defined in
-.Aq Pa a.out.h .
+.In a.out.h .
 A symbol can be in none of these segments by having none of these segment
 bits set.
 .Bd -literal
diff --git a/share/man/man5/style.Makefile.5 b/share/man/man5/style.Makefile.5
index d48bcadda25d..ce91319cfd24 100644
--- a/share/man/man5/style.Makefile.5
+++ b/share/man/man5/style.Makefile.5
@@ -99,14 +99,14 @@ order is:
 Omit
 .Va SRCS
 when using
-.Aq Pa bsd.prog.mk
+.In bsd.prog.mk
 and there is a single source file named the same as the
 .Va PROG .
 .It
 Omit
 .Va MAN
 when using
-.Aq Pa bsd.prog.mk
+.In bsd.prog.mk
 and the manual page is named the same as the
 .Va PROG ,
 and is in section 1.
@@ -196,7 +196,7 @@ An
 space is allowed for variable names that extend beyond column 9.
 A lack of whitespace is also allowed for very long variable names.
 .It
-.Ic .include Aq Pa bsd.*.mk
+.Ic .include In bsd.*.mk
 goes last.
 .It
 Do not use anachronisms like
diff --git a/share/man/man5/utmp.5 b/share/man/man5/utmp.5
index 543c1359ae73..c34204187415 100644
--- a/share/man/man5/utmp.5
+++ b/share/man/man5/utmp.5
@@ -45,7 +45,7 @@
 .In utmp.h
 .Sh DESCRIPTION
 The file
-.Aq Pa utmp.h
+.In utmp.h
 declares the structures used to record information about current
 users in the file
 .Nm ,
diff --git a/share/man/man7/stdint.7 b/share/man/man7/stdint.7
index d05090a7daf6..2f36953d9a16 100644
--- a/share/man/man7/stdint.7
+++ b/share/man/man7/stdint.7
@@ -34,7 +34,7 @@
 .In stdint.h
 .Sh DESCRIPTION
 The
-.Aq Pa stdint.h
+.In stdint.h
 header provides source-portable integer types of a specific
 size, smallest memory footprint with a minimum size, fastest
 access speed with a minimum size, largest integer size, and
@@ -120,17 +120,17 @@ that can later be converted back to a pointer to
 .Vt void .
 .Pp
 Additionally, the
-.Aq Pa stdint.h
+.In stdint.h
 header defines some macros, but none of them are documented here.
 .Sh STANDARDS
 The
-.Aq Pa stdint.h
+.In stdint.h
 header conforms to
 .St -isoC-99
 and
 .St -p1003.1-2001 .
 .Sh HISTORY
 The
-.Aq Pa stdint.h
+.In stdint.h
 header was first introduced in
 .Fx 5.0 .
diff --git a/share/man/man9/BUS_SETUP_INTR.9 b/share/man/man9/BUS_SETUP_INTR.9
index 2b39ade6670c..36cf9bb2fc70 100644
--- a/share/man/man9/BUS_SETUP_INTR.9
+++ b/share/man/man9/BUS_SETUP_INTR.9
@@ -54,7 +54,7 @@ method.
 The
 .Fa flags
 are found in
-.Aq Pa sys/bus.h ,
+.In sys/bus.h ,
 and give the broad category of interrupt.
 The
 .Fa flags
diff --git a/share/man/man9/SYSCALL_MODULE.9 b/share/man/man9/SYSCALL_MODULE.9
index b5c87a06dd38..434ea477c507 100644
--- a/share/man/man9/SYSCALL_MODULE.9
+++ b/share/man/man9/SYSCALL_MODULE.9
@@ -60,7 +60,7 @@ syscall is allocated.
 .Fa new_sysent
 specifies the function implementing the syscall and the number of
 arguments this function needs (see
-.Aq Pa sys/sysent.h ) .
+.In sys/sysent.h ) .
 .Pp
 .Fa evh
 is a pointer to the kernel module event handler function with the argument
diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index e05ead432be2..e68e99ad519c 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -129,14 +129,14 @@ in the
 and
 .Vt ifmultiaddr
 structures in
-.Aq Pa net/if.h
+.In net/if.h
 and
-.Aq Pa net/if_var.h
+.In net/if_var.h
 and the functions named above and defined in
 .Pa /sys/net/if.c .
 Those interfaces which are intended to be used by user programs
 are defined in
-.Aq Pa net/if.h ;
+.In net/if.h ;
 these include the interface flags, the
 .Vt if_data
 structure, and the structures defining the appearance of
@@ -145,18 +145,18 @@ interface-related messages on the
 routing socket and in
 .Xr sysctl 3 .
 The header file
-.Aq Pa net/if_var.h
+.In net/if_var.h
 defines the kernel-internal interfaces, including the
 .Vt ifnet , ifaddr ,
 and
 .Vt ifmultiaddr
 structures and the functions which manipulate them.
 (A few user programs will need
-.Aq Pa net/if_var.h
+.In net/if_var.h
 because it is the prerequisite of some other header file like
-.Aq Pa netinet/if_ether.h .
+.In netinet/if_ether.h .
 Most references to those two files in particular can be replaced by
-.Aq Pa net/ethernet.h . )
+.In net/ethernet.h . )
 .Pp
 The system keeps a linked list of interfaces using the
 .Li TAILQ
@@ -352,7 +352,7 @@ Process interface-related
 .Xr ioctl 2
 requests
 (defined in
-.Aq Pa sys/sockio.h ) .
+.In sys/sockio.h ) .
 Preliminary processing is done by the generic routine
 .Fn ifioctl
 to check for appropriate privileges, locate the interface being
@@ -496,7 +496,7 @@ significantly over the course of normal operation:
 .It Va ifi_type
 .Pq Vt u_char
 The type of the interface, as defined in
-.Aq Pa net/if_types.h
+.In net/if_types.h
 and described below in the
 .Sx "Interface Types"
 section.
@@ -603,7 +603,7 @@ for
 .El
 .Ss Interface Types
 The header file
-.Aq Pa net/if_types.h
+.In net/if_types.h
 defines symbolic constants for a number of different types of
 interfaces.
 The most common are:
diff --git a/share/man/man9/ithread.9 b/share/man/man9/ithread.9
index 01c5d813be20..3388453c36d3 100644
--- a/share/man/man9/ithread.9
+++ b/share/man/man9/ithread.9
@@ -142,7 +142,7 @@ priority of the backing kernel thread.
 The
 .Fa flags
 argument can be used to specify properties of this handler as defined in
-.Aq Pa sys/bus.h .
+.In sys/bus.h .
 If
 .Fa cookiep
 is not
diff --git a/share/man/man9/ktr.9 b/share/man/man9/ktr.9
index ecbd35089d1b..c7f8a68191bd 100644
--- a/share/man/man9/ktr.9
+++ b/share/man/man9/ktr.9
@@ -67,7 +67,7 @@ macros.
 The first parameter is a mask of event types
 .Pq Dv KTR_*
 defined in
-.Aq Pa sys/ktr.h .
+.In sys/ktr.h .
 The event will be logged only if any of the event types specified in
 .Fa mask
 are enabled in the global event mask stored in
diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9
index ebaa5dc672d2..d02a7e266a7a 100644
--- a/share/man/man9/lock.9
+++ b/share/man/man9/lock.9
@@ -151,7 +151,7 @@ Wait for all activity on the lock to end, then mark it decommissioned.
 This is used before freeing a lock that is part of a piece of memory that is
 about to be freed.
 (As documented in
-.Aq Pa sys/lockmgr.h . )
+.In sys/lockmgr.h . )
 .It Dv LK_SLEEPFAIL
 Fail if operation has slept.
 .It Dv LK_NOWAIT
diff --git a/share/man/man9/make_dev.9 b/share/man/man9/make_dev.9
index d819fcd24e63..94edfdf12134 100644
--- a/share/man/man9/make_dev.9
+++ b/share/man/man9/make_dev.9
@@ -61,7 +61,7 @@ and with the name as specified in
 The permissions of the file specified in
 .Va perms
 are defined in
-.Aq Pa sys/stat.h :
+.In sys/stat.h :
 .Pp
 .Bd -literal -offset indent -compact
 #define S_IRWXU 0000700    /* RWX mask for owner */
diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index 0cb271abc24e..fea6396dd0d9 100644
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.9
@@ -226,11 +226,11 @@ MALLOC(buf, struct foo_buf *, sizeof *buf, M_FOOBUF, M_NOWAIT);
 In order to use
 .Fn MALLOC_DEFINE ,
 one must include
-.Aq Pa sys/param.h
+.In sys/param.h
 (instead of
-.Aq Pa sys/types.h )
+.In sys/types.h )
 and
-.Aq Pa sys/kernel.h .
+.In sys/kernel.h .
 .Sh RETURN VALUES
 The
 .Fn malloc ,
diff --git a/share/man/man9/pfil.9 b/share/man/man9/pfil.9
index 3273d5f4393e..fc1a8dfe5022 100644
--- a/share/man/man9/pfil.9
+++ b/share/man/man9/pfil.9
@@ -132,7 +132,7 @@ interface first appeared in
 The
 .Nm
 input and output lists were originally implemented as
-.Aq Pa sys/queue.h
+.In sys/queue.h
 .Dv LIST
 structures;
 however this was changed in
diff --git a/share/man/man9/rtentry.9 b/share/man/man9/rtentry.9
index 2dc21f98c287..655a28c84eee 100644
--- a/share/man/man9/rtentry.9
+++ b/share/man/man9/rtentry.9
@@ -45,7 +45,7 @@ of a socket in the
 .Xr route 4
 pseudo-protocol family.
 The
-.Aq Pa net/route.h
+.In net/route.h
 header file defines the structures and manifest constants used in this
 facility.
 .Pp
diff --git a/share/man/man9/sbuf.9 b/share/man/man9/sbuf.9
index 1aa53240cadb..84e0d46be732 100644
--- a/share/man/man9/sbuf.9
+++ b/share/man/man9/sbuf.9
@@ -99,7 +99,7 @@ Instead of arrays of characters, these functions operate on structures
 called
 .Fa sbufs ,
 defined in
-.Aq Pa sys/sbuf.h .
+.In sys/sbuf.h .
 .Pp
 The
 .Fn sbuf_new
diff --git a/share/man/man9/style.9 b/share/man/man9/style.9
index 2ce2d2c32516..8791c203d407 100644
--- a/share/man/man9/style.9
+++ b/share/man/man9/style.9
@@ -94,13 +94,13 @@ Leave another blank line before the header files.
 Kernel include files (i.e.\&
 .Pa sys/*.h )
 come first; normally, include
-.Aq Pa sys/types.h
+.In sys/types.h
 OR
-.Aq Pa sys/param.h ,
+.In sys/param.h ,
 but not both.
-.Aq Pa sys/types.h
+.In sys/types.h
 includes
-.Aq Pa sys/cdefs.h ,
+.In sys/cdefs.h ,
 and it is okay to depend on that.
 .Bd -literal
 #include <sys/types.h>	/* Non-local includes in angle brackets. */
@@ -128,7 +128,7 @@ which should be sorted alphabetically by name.
 .Ed
 .Pp
 Global pathnames are defined in
-.Aq Pa paths.h .
+.In paths.h .
 Pathnames local
 to the program go in
 .Qq Pa pathnames.h
diff --git a/share/man/man9/swi.9 b/share/man/man9/swi.9
index 2944a401f1be..df016af4f066 100644
--- a/share/man/man9/swi.9
+++ b/share/man/man9/swi.9
@@ -225,4 +225,4 @@ functions which date back to at least
 .Sh BUGS
 Most of the global variables described in this manual page should not be
 global, or at the very least should not be declared in
-.Aq Pa sys/interrupt.h .
+.In sys/interrupt.h .
diff --git a/sys/netinet/libalias/libalias.3 b/sys/netinet/libalias/libalias.3
index d9fff6a73b1b..a75cd2b02947 100644
--- a/sys/netinet/libalias/libalias.3
+++ b/sys/netinet/libalias/libalias.3
@@ -162,7 +162,7 @@ Only bits marked in
 .Fa mask
 are affected.
 The following mode bits are defined in
-.Aq Pa alias.h :
+.In alias.h :
 .Bl -tag -width indent
 .It Dv PKT_ALIAS_LOG
 Enables logging into
@@ -378,7 +378,7 @@ can be either
 or
 .Dv IPPROTO_UDP ,
 as defined in
-.Aq Pa netinet/in.h .
+.In netinet/in.h .
 .Pp
 If
 .Fa local_addr
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index e9f6895ae249..cc9c0416c25c 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -74,16 +74,16 @@ Any known file types appropriate to the system you are running on
 implement them)
 are intuited if they are defined in
 the system header file
-.Aq Pa sys/stat.h .
+.In sys/stat.h .
 .Pp
 The magic number tests are used to check for files with data in
 particular fixed formats.
 The canonical example of this is a binary executable (compiled program)
 .Pa a.out
 file, whose format is defined in
-.Aq Pa a.out.h
+.In a.out.h
 and possibly
-.Aq Pa exec.h
+.In exec.h
 in the standard include directory.
 These files have a
 .Sq "magic number"
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index 4fb7cefc7d31..e0a9e869abe5 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -65,7 +65,7 @@ and
 .Xr sysconf 3 ,
 depending on the type of variable.
 As an extension, the second form can also be used to query static limits from
-.Aq Pa limits.h .
+.In limits.h .
 .Pp
 All
 .Xr sysconf 3
diff --git a/usr.sbin/pw/pw.conf.5 b/usr.sbin/pw/pw.conf.5
index ec3e64aa643d..729d45a72003 100644
--- a/usr.sbin/pw/pw.conf.5
+++ b/usr.sbin/pw/pw.conf.5
@@ -32,7 +32,7 @@
 .Nd format of the pw.conf configuration file
 .Sh DESCRIPTION
 The file
-.Aq Pa /etc/pw.conf
+.In /etc/pw.conf
 contains configuration data for the
 .Xr pw 8
 utility.
diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index 0f658e2b6f55..80782d6609a1 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -264,7 +264,7 @@ decimal number in angle braces, for example,
 .Sq Aq 5 .
 This priority code should map into the priorities defined in the
 include file
-.Aq Pa sys/syslog.h .
+.In sys/syslog.h .
 .Pp
 For security reasons,
 .Nm