4 files changed, 33 insertions, 8 deletions
diff --git a/lib/libc/yp/Makefile.inc b/lib/libc/yp/Makefile.inc
index b19baeeb8f0e..7aeac84090e7 100644
--- a/lib/libc/yp/Makefile.inc
+++ b/lib/libc/yp/Makefile.inc
@@ -1,5 +1,3 @@
-#	from: @(#)Makefile.inc	5.3 (Berkeley) 2/20/91
-
 # yp sources
 .PATH: ${LIBC_SRCTOP}/yp
 
diff --git a/lib/libc/yp/Symbol.map b/lib/libc/yp/Symbol.map
index ecd17af4a29a..f50beed7be31 100644
--- a/lib/libc/yp/Symbol.map
+++ b/lib/libc/yp/Symbol.map
@@ -1,6 +1,3 @@
-/*
- */
-
 FBSD_1.0 {
 	xdr_datum;
 	xdr_ypresp_all_seq;
@@ -21,4 +18,36 @@ FBSD_1.0 {
 	yperr_string;
 	ypprot_err;
 	_yp_check;
+
+	/* From yp_xdr.c (generated by rpcgen - include/rpcsvc/yp.x) */
+	xdr_domainname;
+	xdr_keydat;
+	xdr_mapname;
+	xdr_peername;
+	xdr_valdat;
+	xdr_ypbind_binding;
+	xdr_ypbind_resp;
+	xdr_ypbind_resptype;
+	xdr_ypbind_setdom;
+	xdr_ypmap_parms;
+	xdr_ypmaplist;
+	xdr_yppush_status;
+	xdr_yppushresp_xfr;
+	xdr_ypreq_key;
+	xdr_ypreq_nokey;
+	xdr_ypreq_xfr;
+	xdr_ypreqtype;
+	xdr_yprequest;
+	xdr_ypresp_all;
+	xdr_ypresp_key_val;
+	xdr_ypresp_maplist;
+	xdr_ypresp_master;
+	xdr_ypresp_order;
+	xdr_ypresp_val;
+	xdr_ypresp_xfr;
+	xdr_ypresponse;
+	xdr_ypresptype;
+	xdr_ypstat;
+	xdr_ypxfrstat;
+
 };
diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c
index ebd76cb48050..eae57e7e8347 100644
--- a/lib/libc/yp/xdryp.c
+++ b/lib/libc/yp/xdryp.c
@@ -29,7 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <rpc/rpc.h>
 #include <rpcsvc/yp.h>
 #include <stdlib.h>
diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c
index cddaaa697ab6..95ed526b2e75 100644
--- a/lib/libc/yp/yplib.c
+++ b/lib/libc/yp/yplib.c
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include "namespace.h"
 #include "reentrant.h"
 #include <sys/param.h>
@@ -92,7 +91,7 @@ struct dom_binding {
 
 bool_t xdr_ypresp_all_seq(XDR *xdrs, u_long *objp);
 
-int (*ypresp_allfn)();
+int (*ypresp_allfn)(unsigned long, char *, int, char *, int, void *);
 void *ypresp_data;
 
 static void _yp_unbind(struct dom_binding *);