diff --git a/lib/libc/rpc/rpc_clnt_calls.3 b/lib/libc/rpc/rpc_clnt_calls.3
index 34d7698e2f61..126efce400a8 100644
--- a/lib/libc/rpc/rpc_clnt_calls.3
+++ b/lib/libc/rpc/rpc_clnt_calls.3
@@ -32,11 +32,11 @@
 .Ft void
 .Fn clnt_perrno "const enum clnt_stat stat"
 .Ft void
-.Fn clnt_perror "const CLIENT * clnt" "const char *s"
+.Fn clnt_perror "CLIENT *clnt" "const char *s"
 .Ft "char *"
 .Fn clnt_sperrno "const enum clnt_stat stat"
 .Ft "char *"
-.Fn clnt_sperror "const CLIENT *clnt" "const char * s"
+.Fn clnt_sperror "CLIENT *clnt" "const char * s"
 .Ft "enum clnt_stat"
 .Fo rpc_broadcast
 .Fa "const rpcprog_t prognum" "const rpcvers_t versnum"
@@ -46,11 +46,12 @@
 .Fc
 .Ft "enum clnt_stat"
 .Fo rpc_broadcast_exp
-.Fa "rpcprog_t prognum" "const rpcvers_t versnum"
+.Fa "const rpcprog_t prognum" "const rpcvers_t versnum"
 .Fa "const rpcproc_t procnum" "const xdrproc_t xargs"
 .Fa "caddr_t argsp" "const xdrproc_t xresults"
-.Fa "caddr_t resultsp" "const int inittime" "const int waittime"
-.Fa "const resultproc_t eachresult" "const char * nettype"
+.Fa "caddr_t resultsp" "const resultproc_t eachresult"
+.Fa "const int inittime" "const int waittime"
+.Fa "const char * nettype"
 .Fc
 .Ft "enum clnt_stat"
 .Fo rpc_call
diff --git a/lib/libc/rpc/rpc_clnt_create.3 b/lib/libc/rpc/rpc_clnt_create.3
index 7266c026f839..4f6e90c2e392 100644
--- a/lib/libc/rpc/rpc_clnt_create.3
+++ b/lib/libc/rpc/rpc_clnt_create.3
@@ -33,7 +33,7 @@ handles
 .Ft "CLIENT *"
 .Fn clnt_create "const char * host" "const rpcprog_t prognum" "const rpcvers_t versnum" "const char *nettype"
 .Ft "CLIENT *"
-.Fn clnt_create_vers "const char * host" "const rpcprog_t prognum" "rpcvers_t *vers_outp" "const rpcvers_t vers_low" "const rpcvers_t vers_high" "char *nettype"
+.Fn clnt_create_vers "const char * host" "const rpcprog_t prognum" "rpcvers_t *vers_outp" "const rpcvers_t vers_low" "const rpcvers_t vers_high" "const char *nettype"
 .Ft void
 .Fn clnt_destroy "CLIENT *clnt"
 .Ft "CLIENT *"
diff --git a/lib/libc/rpc/rpc_secure.3 b/lib/libc/rpc/rpc_secure.3
index 03d5e4a163cb..e90f7e411795 100644
--- a/lib/libc/rpc/rpc_secure.3
+++ b/lib/libc/rpc/rpc_secure.3
@@ -21,7 +21,7 @@
 .Ft int
 .Fn getnetname "char *name"
 .Ft int
-.Fn host2netname "char *name" "char *host" "char *domain"
+.Fn host2netname "char *name" "const char *host" "const char *domain"
 .Ft int
 .Fn key_decryptsession "const char *remotename" "des_block *deskey"
 .Ft int
@@ -35,7 +35,7 @@
 .Ft int
 .Fn netname2user "char *name" "uid_t *uidp" "gid_t *gidp" "int *gidlenp" "gid_t *gidlist"
 .Ft int
-.Fn user2netname "char *name" "uid_t uid" "char *domain"
+.Fn user2netname "char *name" "const uid_t uid" "const char *domain"
 .Sh DESCRIPTION
 These routines are part of the
 .Tn RPC
diff --git a/lib/libc/rpc/rpc_soc.3 b/lib/libc/rpc/rpc_soc.3
index ba531cebc1fe..f7a8653b767a 100644
--- a/lib/libc/rpc/rpc_soc.3
+++ b/lib/libc/rpc/rpc_soc.3
@@ -179,6 +179,7 @@ Calls
 with the appropriate parameters.
 .Pp
 .It Xo
+.Ft int
 .Fo callrpc
 .Fa "char *host"
 .Fa "u_long prognum"
diff --git a/lib/libc/rpc/rpc_svc_calls.3 b/lib/libc/rpc/rpc_svc_calls.3
index 8ee7225c69fe..78d98ec2eff9 100644
--- a/lib/libc/rpc/rpc_svc_calls.3
+++ b/lib/libc/rpc/rpc_svc_calls.3
@@ -47,7 +47,7 @@
 .Ft void
 .Fn svc_run "void"
 .Ft bool_t
-.Fn svc_sendreply "const SVCXPRT *xprt" "const xdrproc_t outproc" "const caddr_t *out"
+.Fn svc_sendreply "SVCXPRT *xprt" "xdrproc_t outproc" "char *out"
 .Sh DESCRIPTION
 These routines are part of the
 RPC
diff --git a/lib/libc/rpc/rpc_svc_create.3 b/lib/libc/rpc/rpc_svc_create.3
index f557f7ad1b1f..ccc6544a5370 100644
--- a/lib/libc/rpc/rpc_svc_create.3
+++ b/lib/libc/rpc/rpc_svc_create.3
@@ -25,8 +25,8 @@
 .Ft bool_t
 .Fn svc_control "SVCXPRT *svc" "const u_int req" "void *info"
 .Ft int
-.Fn svc_create "const void (*dispatch)(struct svc_req *, SVCXPRT *)" "const rpcprog_t prognum" "const rpcvers_t versnum" "const char *nettype"
-.Ft SVCXPRT *"
+.Fn svc_create "void (*dispatch)(struct svc_req *, SVCXPRT *)" "const rpcprog_t prognum" "const rpcvers_t versnum" "const char *nettype"
+.Ft SVCXPRT *
 .Fn svc_dg_create "const int fildes" "const u_int sendsz" "const u_int recvsz"
 .Ft void
 .Fn svc_destroy "SVCXPRT *xprt"
@@ -37,7 +37,7 @@
 .Ft "SVCXPRT *"
 .Fn svc_tli_create "const int fildes" "const struct netconfig *netconf" "const struct t_bind *bindaddr" "const u_int sendsz" "const u_int recvsz"
 .Ft "SVCXPRT *"
-.Fn svc_tp_create "const void (*dispatch)(const struct svc_reg *, const SVCXPRT *)" "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf"
+.Fn svc_tp_create "void (*dispatch)(struct svc_req *, SVCXPRT *)" "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf"
 .Ft "SVCXPRT *"
 .Fn svc_vc_create "const int fildes" "const u_int sendsz" "const u_int recvsz"
 .Sh DESCRIPTION
diff --git a/lib/libc/rpc/rpc_svc_err.3 b/lib/libc/rpc/rpc_svc_err.3
index fd862181d088..039501f34d25 100644
--- a/lib/libc/rpc/rpc_svc_err.3
+++ b/lib/libc/rpc/rpc_svc_err.3
@@ -22,19 +22,19 @@
 .Sh SYNOPSIS
 .In rpc/rpc.h
 .Ft void
-.Fn svcerr_auth "const SVCXPRT1 *xprt" "const enum auth_stat why"
+.Fn svcerr_auth "SVCXPRT *xprt" "enum auth_stat why"
 .Ft void
-.Fn svcerr_decode "const SVCXPRT *xprt"
+.Fn svcerr_decode "SVCXPRT *xprt"
 .Ft void
-.Fn svcerr_noproc "const SVCXPRT *xprt"
+.Fn svcerr_noproc "SVCXPRT *xprt"
 .Ft void
-.Fn svcerr_noprog "const SVCXPRT *xprt"
+.Fn svcerr_noprog "SVCXPRT *xprt"
 .Ft void
-.Fn svcerr_progvers "const SVCXPRT *xprt" "rpcvers_t low_vers" "rpcvers_t high_vers"
+.Fn svcerr_progvers "SVCXPRT *xprt" "rpcvers_t low_vers" "rpcvers_t high_vers"
 .Ft void
-.Fn svcerr_systemerr "const SVCXPRT *xprt"
+.Fn svcerr_systemerr "SVCXPRT *xprt"
 .Ft void
-.Fn svcerr_weakauth "const SVCXPRT *xprt"
+.Fn svcerr_weakauth "SVCXPRT *xprt"
 .Sh DESCRIPTION
 These routines are part of the RPC
 library which allows C language programs to make procedure
diff --git a/lib/libc/rpc/rpc_svc_reg.3 b/lib/libc/rpc/rpc_svc_reg.3
index a65d3ade0aa8..2804bf07c25b 100644
--- a/lib/libc/rpc/rpc_svc_reg.3
+++ b/lib/libc/rpc/rpc_svc_reg.3
@@ -20,18 +20,18 @@
 .Lb libc
 .Sh SYNOPSIS
 .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
-.Fn svc_reg "const SVCXPRT *xprt" "const rpcprog_t prognum" "const rpcvers_t versnum" "const void (*dispatch(struct svc_req *, SVCXPRT *)" "const struct netconfig *netconf"
+.Fn rpc_reg "rpcprog_t prognum" "rpcvers_t versnum" "rpcproc_t procnum" "char *(*procname)()" "xdrproc_t inproc" "xdrproc_t outproc" "char *nettype"
+.Ft bool_t
+.Fn svc_reg "SVCXPRT *xprt" "const rpcprog_t prognum" "const rpcvers_t versnum" "void (*dispatch)(struct svc_req *, SVCXPRT *)" "const struct netconfig *netconf"
 .Ft void
 .Fn svc_unreg "const rpcprog_t prognum" "const rpcvers_t versnum"
 .Ft int
-.Fn svc_auth_reg "const int cred_flavor" "const enum auth_stat (*handler(struct svc_req *, truct rpc_msg *))"
+.Fn svc_auth_reg "int cred_flavor" "enum auth_stat (*handler)(struct svc_req *, struct rpc_msg *)"
 .Ft void
-.Fn xprt_register "const SVCXPRT *xprt"
+.Fn xprt_register "SVCXPRT *xprt"
 .Ft void
-.Fn xprt_unregister "const SVCXPRT *xprt"
+.Fn xprt_unregister "SVCXPRT *xprt"
 .Sh DESCRIPTION
 These routines are a part of the RPC
 library which allows the RPC
diff --git a/lib/libc/rpc/rpc_xdr.3 b/lib/libc/rpc/rpc_xdr.3
index 6eb7c7230b92..0ae7d73a12c0 100644
--- a/lib/libc/rpc/rpc_xdr.3
+++ b/lib/libc/rpc/rpc_xdr.3
@@ -20,19 +20,19 @@
 .Sh SYNOPSIS
 .In rpc/rpc.h
 .Ft bool_t
-.Fn xdr_accepted_reply "XDR *xdrs" "const struct accepted_reply *ar"
+.Fn xdr_accepted_reply "XDR *xdrs" "struct accepted_reply *ar"
 .Ft bool_t
 .Fn xdr_authsys_parms "XDR *xdrs" "struct authsys_parms *aupp"
-.Ft void
+.Ft bool_t
 .Fn xdr_callhdr "XDR *xdrs" "struct rpc_msg *chdr"
 .Ft bool_t
 .Fn xdr_callmsg "XDR *xdrs" "struct rpc_msg *cmsg"
 .Ft bool_t
 .Fn xdr_opaque_auth "XDR *xdrs" "struct opaque_auth *ap"
 .Ft bool_t
-.Fn xdr_rejected_reply "XDR *xdrs" "const struct rejected_reply *rr"
+.Fn xdr_rejected_reply "XDR *xdrs" "struct rejected_reply *rr"
 .Ft bool_t
-.Fn xdr_replymsg "XDR *xdrs" "const struct rpc_msg *rmsg"
+.Fn xdr_replymsg "XDR *xdrs" "struct rpc_msg *rmsg"
 .Sh DESCRIPTION
 These routines are used for describing the
 RPC messages in XDR language.
diff --git a/lib/libc/rpc/rpcbind.3 b/lib/libc/rpc/rpcbind.3
index df6890195a0d..eec41b747a62 100644
--- a/lib/libc/rpc/rpcbind.3
+++ b/lib/libc/rpc/rpcbind.3
@@ -18,14 +18,14 @@
 .Lb libc
 .Sh SYNOPSIS
 .In rpc/rpc.h
-.Ft "struct rpcblist *"
+.Ft "rpcblist *"
 .Fn rpcb_getmaps "const struct netconfig *netconf" "const char *host"
 .Ft bool_t
 .Fn rpcb_getaddr "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf" "struct netbuf *svcaddr" "const char *host"
 .Ft bool_t
 .Fn rpcb_gettime "const char *host" "time_t * timep"
 .Ft "enum clnt_stat"
-.Fn rpcb_rmtcall "const struct netconfig *netconf" "const char *host" "const rpcprog_t prognum, const rpcvers_t versnum" "const rpcproc_t procnum, const xdrproc_t inproc" "const caddr_t in" "const xdrproc_t outproc" "caddr_t out" "const struct timeval tout, struct netbuf *svcaddr"
+.Fn rpcb_rmtcall "const struct netconfig *netconf" "const char *host" "const rpcprog_t prognum, const rpcvers_t versnum" "const rpcproc_t procnum, const xdrproc_t inproc" "const caddr_t in" "const xdrproc_t outproc" "const caddr_t out" "const struct timeval tout, const struct netbuf *svcaddr"
 .Ft bool_t
 .Fn rpcb_set "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf" "const struct netbuf *svcaddr"
 .Ft bool_t