diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h
index 6d27c071a6f6..3ea66103938f 100644
--- a/include/rpcsvc/yp_prot.h
+++ b/include/rpcsvc/yp_prot.h
@@ -26,11 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: yp_prot.h,v 1.2 1995/05/30 04:55:47 rgrimes Exp $
+ *	$Id: yp_prot.h,v 1.3 1996/01/30 23:33:04 mpp Exp $
  */
 
-#ifndef _YP_PROT_H_
-#define _YP_PROT_H_
+#ifndef _RPCSVC_YP_PROT_H_
+#define _RPCSVC_YP_PROT_H_
 
 /*
  * YPSERV PROTOCOL:
@@ -72,25 +72,6 @@ typedef u_int bool;
 #define BOOL_DEFINED
 #endif
 
-bool_t	xdr_datum();
-bool_t	xdr_ypdomain_wrap_string();
-bool_t	xdr_ypmap_wrap_string();
-bool_t	xdr_ypreq_key();
-bool_t	xdr_ypreq_nokey();
-bool_t	xdr_ypreq_xfr();
-bool_t	xdr_ypresp_val();
-bool_t	xdr_ypresp_key_val();
-bool_t	xdr_ypbind_resp();
-bool_t	xdr_ypbind_setdom();
-bool_t	xdr_yp_inaddr();
-bool_t	xdr_ypmap_parms();
-bool_t	xdr_ypowner_wrap_string();
-bool_t	xdr_yppushresp_xfr();
-bool_t	xdr_ypresp_order();
-bool_t	xdr_ypresp_master();
-bool_t	xdr_ypall();
-bool_t	xdr_ypresp_maplist();
-
 /* Program and version symbols, magic numbers */
 
 #define YPPROG		((u_long)100004)
@@ -327,4 +308,22 @@ struct yppushresp_xfr {
 #define YPPUSH_XFRERR	((long)-13)	/* ypxfr error */
 #define YPPUSH_REFUSED	((long)-14)	/* Transfer request refused by ypserv */
 
-#endif /* _YP_PROT_H_ */
+struct inaddr;
+__BEGIN_DECLS
+bool_t	xdr_datum __P((XDR *, datum *));
+bool_t	xdr_ypreq_key __P((XDR *, struct ypreq_key *));
+bool_t	xdr_ypreq_nokey __P((XDR *, struct ypreq_nokey *));
+bool_t	xdr_ypreq_xfr __P((XDR *, struct ypreq_xfr *));
+bool_t	xdr_ypresp_val __P((XDR *, struct ypresp_val *));
+bool_t	xdr_ypresp_key_val __P((XDR *, struct ypresp_key_val *));
+bool_t	xdr_ypbind_resp __P((XDR *, struct ypbind_resp *));
+bool_t	xdr_ypbind_setdom __P((XDR *, struct ypbind_setdom *));
+bool_t	xdr_yp_inaddr __P((XDR *, struct inaddr *));
+bool_t	xdr_ypmap_parms __P((XDR *, struct ypmap_parms *));
+bool_t	xdr_yppushresp_xfr __P((XDR *, struct yppushresp_xfr *));
+bool_t	xdr_ypresp_order __P((XDR *, struct ypresp_order *));
+bool_t	xdr_ypresp_master __P((XDR *, struct ypresp_master *));
+bool_t	xdr_ypresp_maplist __P((XDR *, struct ypresp_maplist *));
+__END_DECLS
+
+#endif /* _RPCSVC_YP_PROT_H_ */
diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h
index 816801255125..45d0a2e10102 100644
--- a/include/rpcsvc/ypclnt.h
+++ b/include/rpcsvc/ypclnt.h
@@ -26,11 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ypclnt.h,v 1.2 1995/04/21 18:07:34 wpaul Exp $
+ *	$Id: ypclnt.h,v 1.3 1995/05/30 04:55:49 rgrimes Exp $
  */
 
-#ifndef _YPCLNT_H_
-#define _YPCLNT_H_
+#ifndef _RPCSVC_YPCLNT_H_
+#define _RPCSVC_YPCLNT_H_
 
 #define YPERR_BADARGS	1		/* args to function are bad */
 #define YPERR_RPC	2		/* RPC failure */
@@ -58,10 +58,12 @@
 #define YPOP_STORE 	4		/* add, or change */
 
 struct ypall_callback {
-	int (*foreach)();	/* return non-0 to stop getting called */
+	/* return non-0 to stop getting called */
+	int (*foreach) __P((u_long, char *, int, char *, int, void *));
 	char *data;		/* opaque pointer for use of callback fn */
 };
 
+__BEGIN_DECLS
 int	yp_bind		__P((char *dom));
 int	_yp_dobind	__P((char *dom, struct dom_binding **ypdb));
 void	yp_unbind	__P((char *dom));
@@ -82,6 +84,7 @@ int	yp_all		__P((char *indomain, char *inmap,
 char *	yperr_string	__P((int incode));
 char *	ypbinderr_string __P((int incode));
 int	ypprot_err	__P((unsigned int incode));
+__END_DECLS
 
-#endif /* _YPCLNT_H_ */
+#endif /* _RPCSVC_YPCLNT_H_ */