diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h
index d8b31e4b8d78..42431a1ca45b 100644
--- a/include/rpcsvc/yp_prot.h
+++ b/include/rpcsvc/yp_prot.h
@@ -100,7 +100,7 @@ typedef struct {
 struct ypmap_parms {
 	char *domain;
 	char *map;
-	u_long ordernum;
+	u_int ordernum;
 	char *owner;
 };
 
@@ -117,9 +117,9 @@ struct ypreq_nokey {
 
 struct ypreq_xfr {
 	struct ypmap_parms map_parms;
-	u_long transid;
-	u_long proto;
-	u_short port;
+	u_int transid;
+	u_int proto;
+	u_int port;
 };
 #define ypxfr_domain	map_parms.domain
 #define ypxfr_map	map_parms.map
@@ -127,24 +127,24 @@ struct ypreq_xfr {
 #define ypxfr_owner	map_parms.owner
 
 struct ypresp_val {
-	u_long status;
+	u_int status;
 	datum valdat;
 };
 
 struct ypresp_key_val {
-	u_long status;
+	u_int status;
 	datum keydat;
 	datum valdat;
 };
 
 struct ypresp_master {
-	u_long status;
+	u_int status;
 	char *master;
 };
 
 struct ypresp_order {
-	u_long status;
-	u_long ordernum;
+	u_int status;
+	u_int ordernum;
 };
 
 struct ypmaplist {
@@ -153,7 +153,7 @@ struct ypmaplist {
 };
 
 struct ypresp_maplist {
-	u_long status;
+	u_int status;
 	struct ypmaplist *list;
 };
 
@@ -245,7 +245,7 @@ struct ypbind_binding {
 struct ypbind_resp {
 	enum ypbind_resptype	ypbind_status;
 	union {
-		u_long			ypbind_error;
+		u_int			ypbind_error;
 		struct ypbind_binding	ypbind_bindinfo;
 	} ypbind_respbody;
 };
@@ -261,7 +261,7 @@ struct ypbind_resp {
 struct ypbind_setdom {
 	char ypsetdom_domain[YPMAXDOMAIN + 1];
 	struct ypbind_binding ypsetdom_binding;
-	u_short ypsetdom_vers;
+	u_int ypsetdom_vers;
 };
 #define ypsetdom_addr ypsetdom_binding.ypbind_binding_addr
 #define ypsetdom_port ypsetdom_binding.ypbind_binding_port
@@ -286,8 +286,8 @@ struct ypbind_setdom {
 #define YPPUSHPROC_XFRRESP	((u_long)1)
 
 struct yppushresp_xfr {
-	u_long	transid;
-	u_long	status;
+	u_int	transid;
+	u_int	status;
 };
 
 /* yppush status value in yppushresp_xfr.status */