diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c
index 433291c82ff7..737e3c706fe2 100644
--- a/lib/libc/rpc/clnt_vc.c
+++ b/lib/libc/rpc/clnt_vc.c
@@ -81,6 +81,11 @@ static char sccsid[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
 
 #define MCALL_MSG_SIZE 24
 
+struct cmessage {
+        struct cmsghdr cmsg;
+        struct cmsgcred cmcred;
+};
+
 static enum clnt_stat clnt_vc_call __P((CLIENT *, rpcproc_t, xdrproc_t, caddr_t,
     xdrproc_t, caddr_t, struct timeval));
 static void clnt_vc_geterr __P((CLIENT *, struct rpc_err *));
diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c
index 0e84d6fdb4c5..e867bf1501d7 100644
--- a/lib/libc/rpc/svc_vc.c
+++ b/lib/libc/rpc/svc_vc.c
@@ -68,8 +68,10 @@ static char *sccsid = "@(#)svc_tcp.c	2.2 88/08/01 4.0 RPCSRC";
 #include "rpc_com.h"
 #include "un-namespace.h"
 
-#define SOCKCREDSIZE(ngrps) \
-	(sizeof(struct cmsgcred) + (sizeof(gid_t) * ((ngrps) - 1)))
+struct cmessage {
+        struct cmsghdr cmsg;
+        struct cmsgcred cmcred;
+};
 
 static SVCXPRT *makefd_xprt __P((int, u_int, u_int));
 static bool_t rendezvous_request __P((SVCXPRT *, struct rpc_msg *));
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index d7d264509e37..cf0ee9cf45bf 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -364,11 +364,6 @@ struct cmsgcred {
 	gid_t	cmcred_groups[CMGROUP_MAX];	/* groups */
 };
 
-struct cmessage {
-        struct cmsghdr cmsg;
-        struct cmsgcred cmcred;
-};
-
 /* given pointer to struct cmsghdr, return pointer to data */
 #define	CMSG_DATA(cmsg)		((u_char *)(cmsg) + \
 				 _ALIGN(sizeof(struct cmsghdr)))
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
index 438a7b6e15d1..1487863051d5 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
@@ -62,6 +62,11 @@ struct dom_binding {};
 #include "yppasswd.h"
 #include "yppasswd_private.h"
 
+struct cmessage {
+        struct cmsghdr cmsg;
+        struct cmsgcred cmcred;
+};
+
 char *tempname;
 
 void reaper(sig)