diff --git a/sys/rpc/authunix_prot.c b/sys/rpc/authunix_prot.c
index 0274a713ff2..ff4c12c3f52 100644
--- a/sys/rpc/authunix_prot.c
+++ b/sys/rpc/authunix_prot.c
@@ -30,7 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 /*
  * authunix_prot.c
  * XDR for UNIX style authentication parameters for RPC
@@ -40,8 +39,7 @@
 
 #include <sys/param.h>
 #include <sys/jail.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
+#include <sys/libkern.h>
 #include <sys/ucred.h>
 
 #include <rpc/types.h>
@@ -70,12 +68,10 @@ xdr_authunix_parms(XDR *xdrs, uint32_t *time, struct xucred *cred)
 		namelen = strlen(hostbuf);
 		if (namelen > AUTH_SYS_MAX_HOSTNAME)
 			namelen = AUTH_SYS_MAX_HOSTNAME;
-	} else {
+	} else
 		namelen = 0;
-	}
 
-	if (!xdr_uint32_t(xdrs, time)
-	    || !xdr_uint32_t(xdrs, &namelen))
+	if (!xdr_uint32_t(xdrs, time) || !xdr_uint32_t(xdrs, &namelen))
 		return (FALSE);
 
 	/*
diff --git a/sys/rpc/svc_auth_unix.c b/sys/rpc/svc_auth_unix.c
index 4d5535a4fee..9e4b0b8483b 100644
--- a/sys/rpc/svc_auth_unix.c
+++ b/sys/rpc/svc_auth_unix.c
@@ -41,8 +41,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
 #include <sys/systm.h>
 #include <sys/ucred.h>
 
@@ -131,7 +129,7 @@ _svcauth_unix(struct svc_req *rqst, struct rpc_msg *msg)
 				buf++;
 		}
 		xcr->cr_ngroups = MIN(supp_ngroups + 1, XU_NGROUPS);
-	} else if (! xdr_authunix_parms(&xdrs, &time, xcr))
+	} else if (!xdr_authunix_parms(&xdrs, &time, xcr))
 		goto badcred;
 
 	rqst->rq_verf = _null_auth;