diff -ru rpc.broken/auth.h rpc/auth.h
--- rpc.broken/auth.h	Mon Jan 15 07:44:37 2001
+++ rpc/auth.h	Fri Jun  2 19:45:15 2000
@@ -84,8 +84,8 @@
  */
 struct opaque_auth {
 	enum_t	oa_flavor;		/* flavor of auth */
-	caddr_t	oa_base;		/* address of more auth stuff */
-	u_int	oa_length;		/* not to exceed MAX_AUTH_BYTES */
+	__caddr_t	oa_base;		/* address of more auth stuff */
+	__u_int	oa_length;		/* not to exceed MAX_AUTH_BYTES */
 };
 
 /*
@@ -104,7 +104,7 @@
     int  (*ah_refresh) __PMT ((AUTH *));	/* refresh credentials */
     void (*ah_destroy) __PMT ((AUTH *));     	/* destroy this structure */
   } *ah_ops;
-  caddr_t ah_private;
+  __caddr_t ah_private;
 };
 
 
@@ -163,10 +163,10 @@
 				   __gid_t *__aup_gids));
 extern AUTH *authunix_create_default __P ((void));
 extern AUTH *authnone_create __P ((void));
-extern AUTH *authdes_create __P ((const char *__servername, u_int __window,
+extern AUTH *authdes_create __P ((const char *__servername, __u_int __window,
 				  struct sockaddr *__syncaddr,
 				  des_block *__ckey));
-extern AUTH *authdes_pk_create __P ((const char *, netobj *, u_int,
+extern AUTH *authdes_pk_create __P ((const char *, netobj *, __u_int,
 				     struct sockaddr *, des_block *));
 
 
diff -ru rpc.broken/auth_unix.h rpc/auth_unix.h
--- rpc.broken/auth_unix.h	Mon Jan 15 07:44:37 2001
+++ rpc/auth_unix.h	Fri Jun  2 19:45:15 2000
@@ -64,11 +64,11 @@
  */
 struct authunix_parms
   {
-    u_long aup_time;
+    __u_long aup_time;
     char *aup_machname;
     __uid_t aup_uid;
     __gid_t aup_gid;
-    u_int aup_len;
+    __u_int aup_len;
     __gid_t *aup_gids;
   };
 
diff -ru rpc.broken/clnt.h rpc/clnt.h
--- rpc.broken/clnt.h	Mon Jan 15 07:44:37 2001
+++ rpc/clnt.h	Fri Jun  2 19:45:15 2000
@@ -109,8 +109,8 @@
     int RE_errno;		/* related system error */
     enum auth_stat RE_why;	/* why the auth error occurred */
     struct {
-      u_long low;		/* lowest verion supported */
-      u_long high;		/* highest verion supported */
+      __u_long low;		/* lowest verion supported */
+      __u_long high;		/* highest verion supported */
     } RE_vers;
     struct {			/* maybe meaningful if RPC_FAILED */
       long s1;
@@ -133,20 +133,20 @@
 struct CLIENT {
   AUTH	*cl_auth;		 /* authenticator */
   struct clnt_ops {
-    enum clnt_stat (*cl_call) __PMT ((CLIENT *, u_long, xdrproc_t,
-				      caddr_t, xdrproc_t,
-				      caddr_t, struct timeval));
+    enum clnt_stat (*cl_call) __PMT ((CLIENT *, __u_long, xdrproc_t,
+				      __caddr_t, xdrproc_t,
+				      __caddr_t, struct timeval));
 			       	/* call remote procedure */
     void (*cl_abort) __PMT ((void));  /* abort a call */
     void (*cl_geterr) __PMT ((CLIENT *, struct rpc_err *));
 				/* get specific error code */
-    bool_t (*cl_freeres) __PMT ((CLIENT *, xdrproc_t, caddr_t));
+    bool_t (*cl_freeres) __PMT ((CLIENT *, xdrproc_t, __caddr_t));
 				/* frees results */
     void (*cl_destroy) __PMT ((CLIENT *)); /* destroy this structure */
     bool_t (*cl_control) __PMT ((CLIENT *, int, char *));
 				/* the ioctl() of rpc */
   } *cl_ops;
-  caddr_t cl_private;		/* private stuff */
+  __caddr_t cl_private;		/* private stuff */
 };
 
 
@@ -161,7 +161,7 @@
  * enum clnt_stat
  * CLNT_CALL(rh, proc, xargs, argsp, xres, resp, timeout)
  * 	CLIENT *rh;
- *	u_long proc;
+ *	__u_long proc;
  *	xdrproc_t xargs;
  *	caddr_t argsp;
  *	xdrproc_t xres;
@@ -204,7 +204,7 @@
  * bool_t
  * CLNT_CONTROL(cl, request, info)
  *      CLIENT *cl;
- *      u_int request;
+ *      __u_int request;
  *      char *info;
  */
 #define	CLNT_CONTROL(cl,rq,in) ((*(cl)->cl_ops->cl_control)(cl,rq,in))
@@ -254,16 +254,16 @@
  * and network administration.
  */
 
-#define RPCTEST_PROGRAM		((u_long)1)
-#define RPCTEST_VERSION		((u_long)1)
-#define RPCTEST_NULL_PROC	((u_long)2)
-#define RPCTEST_NULL_BATCH_PROC	((u_long)3)
+#define RPCTEST_PROGRAM		((__u_long)1)
+#define RPCTEST_VERSION		((__u_long)1)
+#define RPCTEST_NULL_PROC	((__u_long)2)
+#define RPCTEST_NULL_BATCH_PROC	((__u_long)3)
 
 /*
  * By convention, procedure 0 takes null arguments and returns them
  */
 
-#define NULLPROC ((u_long)0)
+#define NULLPROC ((__u_long)0)
 
 /*
  * Below are the client handle creation routines for the various
@@ -275,11 +275,11 @@
  * Memory based rpc (for speed check and testing)
  * CLIENT *
  * clntraw_create(prog, vers)
- *	u_long prog;
- *	u_long vers;
+ *	__u_long prog;
+ *	__u_long vers;
  */
-extern CLIENT *clntraw_create __P ((__const u_long __prog,
-				    __const u_long __vers));
+extern CLIENT *clntraw_create __P ((__const __u_long __prog,
+				    __const __u_long __vers));
 
 
 /*
@@ -288,12 +288,12 @@
  * CLIENT *
  * clnt_create(host, prog, vers, prot)
  *	char *host; 	-- hostname
- *	u_long prog;	-- program number
- *	u_ong vers;	-- version number
+ *	__u_long prog;	-- program number
+ *	__u_ong vers;	-- version number
  *	char *prot;	-- protocol
  */
-extern CLIENT *clnt_create __P ((__const char *__host, __const u_long __prog,
-				 __const u_long __vers, __const char *__prot));
+extern CLIENT *clnt_create __P ((__const char *__host, __const __u_long __prog,
+				 __const __u_long __vers, __const char *__prot));
 
 
 /*
@@ -301,24 +301,24 @@
  * CLIENT *
  * clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
  *	struct sockaddr_in *raddr;
- *	u_long prog;
- *	u_long version;
+ *	__u_long prog;
+ *	__u_long version;
  *	register int *sockp;
- *	u_int sendsz;
- *	u_int recvsz;
+ *	__u_int sendsz;
+ *	__u_int recvsz;
  */
 extern CLIENT *clnttcp_create __P ((struct sockaddr_in *__raddr,
-				    u_long __prog, u_long __version,
-				    int *__sockp, u_int __sendsz,
-				    u_int __recvsz));
+				    __u_long __prog, __u_long __version,
+				    int *__sockp, __u_int __sendsz,
+				    __u_int __recvsz));
 
 /*
  * UDP based rpc.
  * CLIENT *
  * clntudp_create(raddr, program, version, wait, sockp)
  *	struct sockaddr_in *raddr;
- *	u_long program;
- *	u_long version;
+ *	__u_long program;
+ *	__u_long version;
  *	struct timeval wait_resend;
  *	int *sockp;
  *
@@ -326,22 +326,22 @@
  * CLIENT *
  * clntudp_bufcreate(raddr, program, version, wait, sockp, sendsz, recvsz)
  *	struct sockaddr_in *raddr;
- *	u_long program;
- *	u_long version;
+ *	__u_long program;
+ *	__u_long version;
  *	struct timeval wait_resend;
  *	int *sockp;
- *	u_int sendsz;
- *	u_int recvsz;
+ *	__u_int sendsz;
+ *	__u_int recvsz;
  */
 extern CLIENT *clntudp_create __P ((struct sockaddr_in *__raddr,
-				    u_long __program, u_long __version,
+				    __u_long __program, __u_long __version,
 				    struct timeval __wait_resend,
 				    int *__sockp));
 extern CLIENT *clntudp_bufcreate __P ((struct sockaddr_in *__raddr,
-				       u_long __program, u_long __version,
+				       __u_long __program, __u_long __version,
 				       struct timeval __wait_resend,
-				       int *__sockp, u_int __sendsz,
-				       u_int __recvsz));
+				       int *__sockp, __u_int __sendsz,
+				       __u_int __recvsz));
 
 
 /*
@@ -349,20 +349,20 @@
  * CLIENT *
  * clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz)
  *      struct sockaddr_un *raddr;
- *      u_long prog;
- *      u_long version;
+ *      __u_long prog;
+ *      __u_long version;
  *      register int *sockp;
- *      u_int sendsz;
- *      u_int recvsz;
+ *      __u_int sendsz;
+ *      __u_int recvsz;
  */
 extern CLIENT *clntunix_create  __P ((struct sockaddr_un *__raddr,
-				      u_long __program, u_long __version,
-				      int *__sockp, u_int __sendsz,
-				      u_int __recvsz));
+				      __u_long __program, __u_long __version,
+				      int *__sockp, __u_int __sendsz,
+				      __u_int __recvsz));
 
 
-extern int callrpc __P ((__const char *__host, __const u_long __prognum,
-			 __const u_long __versnum, __const u_long __procnum,
+extern int callrpc __P ((__const char *__host, __const __u_long __prognum,
+			 __const __u_long __versnum, __const __u_long __procnum,
 			 __const xdrproc_t __inproc, __const char *__in,
 			 __const xdrproc_t __outproc, char *__out));
 extern int _rpc_dtablesize __P ((void));
@@ -406,8 +406,8 @@
 /*
  * get the port number on the host for the rpc program,version and proto
  */
-extern int getrpcport __P ((__const char * __host, u_long __prognum,
-			   u_long __versnum, u_int proto));
+extern int getrpcport __P ((__const char * __host, __u_long __prognum,
+			   __u_long __versnum, __u_int proto));
 
 /*
  * get the local host's IP address without consulting
diff -ru rpc.broken/rpc_des.h rpc/rpc_des.h
--- rpc.broken/rpc_des.h	Mon Jan 15 07:44:37 2001
+++ rpc/rpc_des.h	Fri Jun  2 19:45:15 2000
@@ -1,3 +1,4 @@
+/*  @(#)des.h   2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI  */
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -68,5 +69,15 @@
 #define des_data UDES.UDES_data	/* direct data here if quick */
 #define des_buf	UDES.UDES_buf	/* otherwise, pointer to data */
   };
+
+/*
+ * Encrypt an arbitrary sized buffer
+ */
+#define	DESIOCBLOCK	_IOWR(d, 6, struct desparams)
+
+/* 
+ * Encrypt of small amount of data, quickly
+ */
+#define DESIOCQUICK	_IOWR(d, 7, struct desparams)
 
 #endif
diff -ru rpc.broken/rpc_msg.h rpc/rpc_msg.h
--- rpc.broken/rpc_msg.h	Mon Jan 15 07:44:37 2001
+++ rpc/rpc_msg.h	Fri Jun  2 19:45:15 2000
@@ -93,11 +93,11 @@
 	enum accept_stat	ar_stat;
 	union {
 		struct {
-			u_long	low;
-			u_long	high;
+			__u_long	low;
+			__u_long	high;
 		} AR_versions;
 		struct {
-			caddr_t	where;
+			__caddr_t	where;
 			xdrproc_t proc;
 		} AR_results;
 		/* and many other null cases */
@@ -113,8 +113,8 @@
 	enum reject_stat rj_stat;
 	union {
 		struct {
-			u_long low;
-			u_long high;
+			__u_long low;
+			__u_long high;
 		} RJ_versions;
 		enum auth_stat RJ_why;  /* why authentication did not work */
 	} ru;
@@ -139,10 +139,10 @@
  * Body of an rpc request call.
  */
 struct call_body {
-	u_long cb_rpcvers;	/* must be equal to two */
-	u_long cb_prog;
-	u_long cb_vers;
-	u_long cb_proc;
+	__u_long cb_rpcvers;	/* must be equal to two */
+	__u_long cb_prog;
+	__u_long cb_vers;
+	__u_long cb_proc;
 	struct opaque_auth cb_cred;
 	struct opaque_auth cb_verf; /* protocol specific - provided by client */
 };
@@ -151,7 +151,7 @@
  * The rpc message
  */
 struct rpc_msg {
-	u_long			rm_xid;
+	__u_long			rm_xid;
 	enum msg_type		rm_direction;
 	union {
 		struct call_body RM_cmb;
diff -ru rpc.broken/svc.h rpc/svc.h
--- rpc.broken/svc.h	Mon Jan 15 07:44:37 2001
+++ rpc/svc.h	Fri Jun  2 19:45:15 2000
@@ -76,18 +76,18 @@
 typedef struct SVCXPRT SVCXPRT;
 struct SVCXPRT {
   int xp_sock;
-  u_short xp_port;		/* associated port number */
+  __u_short xp_port;		/* associated port number */
   const struct xp_ops {
     bool_t	(*xp_recv) __PMT ((SVCXPRT *__xprt, struct rpc_msg *__msg));
 				/* receive incoming requests */
     enum xprt_stat (*xp_stat) __PMT ((SVCXPRT *__xprt));
 				/* get transport status */
     bool_t	(*xp_getargs) __PMT ((SVCXPRT *__xprt, xdrproc_t __xdr_args,
-				      caddr_t args_ptr)); /* get arguments */
+				      __caddr_t args_ptr)); /* get arguments */
     bool_t	(*xp_reply) __PMT ((SVCXPRT *__xprt, struct rpc_msg *__msg));
 				/* send reply */
     bool_t	(*xp_freeargs) __PMT ((SVCXPRT *__xprt, xdrproc_t __xdr_args,
-				       caddr_t args_ptr));
+				       __caddr_t args_ptr));
 				/* free mem allocated for args */
     void	(*xp_destroy) __PMT ((SVCXPRT *__xprt));
 				/* destroy this struct */
@@ -95,8 +95,8 @@
   int		xp_addrlen;	 /* length of remote address */
   struct sockaddr_in xp_raddr;	 /* remote address */
   struct opaque_auth xp_verf;	 /* raw response verifier */
-  caddr_t		xp_p1;		 /* private */
-  caddr_t		xp_p2;		 /* private */
+  __caddr_t		xp_p1;		 /* private */
+  __caddr_t		xp_p2;		 /* private */
 };
 
 /*
@@ -147,11 +147,11 @@
  * Service request
  */
 struct svc_req {
-	u_long		rq_prog;	/* service program number */
-	u_long		rq_vers;	/* service protocol version */
-	u_long		rq_proc;	/* the desired procedure */
+	__u_long		rq_prog;	/* service program number */
+	__u_long		rq_vers;	/* service protocol version */
+	__u_long		rq_proc;	/* the desired procedure */
 	struct opaque_auth rq_cred;	/* raw creds from the wire */
-	caddr_t		rq_clntcred;	/* read only cooked cred */
+	__caddr_t		rq_clntcred;	/* read only cooked cred */
 	SVCXPRT	*rq_xprt;		/* associated transport */
 };
 
@@ -170,9 +170,9 @@
  *	void (*dispatch)();
  *	u_long protocol;  like TCP or UDP, zero means do not register
  */
-extern bool_t	svc_register __P ((SVCXPRT *__xprt, u_long __prog,
-				   u_long __vers, __dispatch_fn_t __dispatch,
-				   u_long __protocol));
+extern bool_t	svc_register __P ((SVCXPRT *__xprt, __u_long __prog,
+				   __u_long __vers, __dispatch_fn_t __dispatch,
+				   __u_long __protocol));
 
 /*
  * Service un-registration
@@ -181,7 +181,7 @@
  *	u_long prog;
  *	u_long vers;
  */
-extern void	svc_unregister __P ((u_long __prog, u_long __vers));
+extern void	svc_unregister __P ((__u_long __prog, __u_long __vers));
 
 /*
  * Transport registration.
@@ -229,7 +229,7 @@
  */
 
 extern bool_t	svc_sendreply __P ((SVCXPRT *xprt, xdrproc_t __xdr_results,
-				    caddr_t __xdr_location));
+				    __caddr_t __xdr_location));
 
 extern void	svcerr_decode __P ((SVCXPRT *__xprt));
 
@@ -237,8 +237,8 @@
 
 extern void	svcerr_noproc __P ((SVCXPRT *__xprt));
 
-extern void	svcerr_progvers __P ((SVCXPRT *__xprt, u_long __low_vers,
-				      u_long __high_vers));
+extern void	svcerr_progvers __P ((SVCXPRT *__xprt, __u_long __low_vers,
+				      __u_long __high_vers));
 
 extern void	svcerr_auth __P ((SVCXPRT *__xprt, enum auth_stat __why));
 
@@ -295,21 +295,21 @@
  * Udp based rpc.
  */
 extern SVCXPRT *svcudp_create __P ((int __sock));
-extern SVCXPRT *svcudp_bufcreate __P ((int __sock, u_int __sendsz,
-				       u_int __recvsz));
+extern SVCXPRT *svcudp_bufcreate __P ((int __sock, __u_int __sendsz,
+				       __u_int __recvsz));
 
 /*
  * Tcp based rpc.
  */
-extern SVCXPRT *svctcp_create __P ((int __sock, u_int __sendsize,
-				    u_int __recvsize));
+extern SVCXPRT *svctcp_create __P ((int __sock, __u_int __sendsize,
+				    __u_int __recvsize));
 
 
 /*
  * Unix based rpc.
  */
-extern SVCXPRT *svcunix_create __P ((int __sock, u_int __sendsize,
-				     u_int __recvsize, char *__path));
+extern SVCXPRT *svcunix_create __P ((int __sock, __u_int __sendsize,
+				     __u_int __recvsize, char *__path));
 
 
 __END_DECLS
diff -ru rpc.broken/xdr.h rpc/xdr.h
--- rpc.broken/xdr.h	Mon Jan 15 07:44:37 2001
+++ rpc/xdr.h	Fri Jun  2 19:45:16 2000
@@ -118,15 +118,15 @@
 	/* get a long from underlying stream */
 	bool_t (*x_putlong) __PMT ((XDR *__xdrs, __const long *__lp));
 	/* put a long to " */
-	bool_t (*x_getbytes) __PMT ((XDR *__xdrs, caddr_t __addr,
-				     u_int __len));
+	bool_t (*x_getbytes) __PMT ((XDR *__xdrs, __caddr_t __addr,
+				     __u_int __len));
 	/* get some bytes from " */
 	bool_t (*x_putbytes) __PMT ((XDR *__xdrs, __const char *__addr,
-				     u_int __len));
+				     __u_int __len));
 	/* put some bytes to " */
-	u_int (*x_getpostn) __PMT ((__const XDR *__xdrs));
+	__u_int (*x_getpostn) __PMT ((__const XDR *__xdrs));
 	/* returns bytes off from beginning */
-	bool_t (*x_setpostn) __PMT ((XDR *__xdrs, u_int pos));
+	bool_t (*x_setpostn) __PMT ((XDR *__xdrs, __u_int pos));
 	/* lets you reposition the stream */
 	int32_t *(*x_inline) __PMT ((XDR *__xdrs, int len));
 	/* buf quick ptr to buffered data */
@@ -138,9 +138,9 @@
 	/* put a int to " */
       }
      *x_ops;
-    caddr_t x_public;		/* users' data */
-    caddr_t x_private;		/* pointer to private data */
-    caddr_t x_base;		/* private used for position info */
+    __caddr_t x_public;		/* users' data */
+    __caddr_t x_private;		/* pointer to private data */
+    __caddr_t x_base;		/* private used for position info */
     int x_handy;		/* extra private word */
   };
 
@@ -290,47 +290,47 @@
  */
 extern bool_t xdr_void __P ((void));
 extern bool_t xdr_short __P ((XDR *__xdrs, short *__sp));
-extern bool_t xdr_u_short __P ((XDR *__xdrs, u_short *__usp));
+extern bool_t xdr_u_short __P ((XDR *__xdrs, __u_short *__usp));
 extern bool_t xdr_int __P ((XDR *__xdrs, int *__ip));
-extern bool_t xdr_u_int __P ((XDR *__xdrs, u_int *__up));
+extern bool_t xdr_u_int __P ((XDR *__xdrs, __u_int *__up));
 extern bool_t xdr_long __P ((XDR *__xdrs, long *__lp));
-extern bool_t xdr_u_long __P ((XDR *__xdrs, u_long *__ulp));
-extern bool_t xdr_hyper __P ((XDR *__xdrs, quad_t *__llp));
-extern bool_t xdr_u_hyper __P ((XDR *__xdrs, u_quad_t *__ullp));
-extern bool_t xdr_longlong_t __P ((XDR *__xdrs, quad_t *__llp));
-extern bool_t xdr_u_longlong_t __P ((XDR *__xdrs, u_quad_t *__ullp));
-extern bool_t xdr_int8_t __P ((XDR *__xdrs, int8_t *__ip));
-extern bool_t xdr_uint8_t __P ((XDR *__xdrs, uint8_t *__up));
-extern bool_t xdr_int16_t __P ((XDR *__xdrs, int16_t *__ip));
-extern bool_t xdr_uint16_t __P ((XDR *__xdrs, uint16_t *__up));
-extern bool_t xdr_int32_t __P ((XDR *__xdrs, int32_t *__ip));
-extern bool_t xdr_uint32_t __P ((XDR *__xdrs, uint32_t *__up));
-extern bool_t xdr_int64_t __P ((XDR *__xdrs, int64_t *__ip));
-extern bool_t xdr_uint64_t __P ((XDR *__xdrs, uint64_t *__up));
+extern bool_t xdr_u_long __P ((XDR *__xdrs, __u_long *__ulp));
+extern bool_t xdr_hyper __P ((XDR *__xdrs, __quad_t *__llp));
+extern bool_t xdr_u_hyper __P ((XDR *__xdrs, __u_quad_t *__ullp));
+extern bool_t xdr_longlong_t __P ((XDR *__xdrs, __quad_t *__llp));
+extern bool_t xdr_u_longlong_t __P ((XDR *__xdrs, __u_quad_t *__ullp));
+extern bool_t xdr_int8_t __P ((XDR *__xdrs, __int8_t *__ip));
+extern bool_t xdr_uint8_t __P ((XDR *__xdrs, __uint8_t *__up));
+extern bool_t xdr_int16_t __P ((XDR *__xdrs, __int16_t *__ip));
+extern bool_t xdr_uint16_t __P ((XDR *__xdrs, __uint16_t *__up));
+extern bool_t xdr_int32_t __P ((XDR *__xdrs, __int32_t *__ip));
+extern bool_t xdr_uint32_t __P ((XDR *__xdrs, __uint32_t *__up));
+extern bool_t xdr_int64_t __P ((XDR *__xdrs, __int64_t *__ip));
+extern bool_t xdr_uint64_t __P ((XDR *__xdrs, __uint64_t *__up));
 extern bool_t xdr_bool __P ((XDR *__xdrs, bool_t *__bp));
 extern bool_t xdr_enum __P ((XDR *__xdrs, enum_t *__ep));
-extern bool_t xdr_array __P ((XDR * _xdrs, caddr_t *__addrp, u_int *__sizep,
-			      u_int __maxsize, u_int __elsize,
+extern bool_t xdr_array __P ((XDR * _xdrs, __caddr_t *__addrp, __u_int *__sizep,
+			      __u_int __maxsize, __u_int __elsize,
 			      xdrproc_t __elproc));
-extern bool_t xdr_bytes __P ((XDR *__xdrs, char **__cpp, u_int *__sizep,
-			      u_int __maxsize));
-extern bool_t xdr_opaque __P ((XDR *__xdrs, caddr_t __cp, u_int __cnt));
-extern bool_t xdr_string __P ((XDR *__xdrs, char **__cpp, u_int __maxsize));
+extern bool_t xdr_bytes __P ((XDR *__xdrs, char **__cpp, __u_int *__sizep,
+			      __u_int __maxsize));
+extern bool_t xdr_opaque __P ((XDR *__xdrs, __caddr_t __cp, __u_int __cnt));
+extern bool_t xdr_string __P ((XDR *__xdrs, char **__cpp, __u_int __maxsize));
 extern bool_t xdr_union __P ((XDR *__xdrs, enum_t *__dscmp, char *__unp,
 			      __const struct xdr_discrim *__choices,
 			      xdrproc_t dfault));
 extern bool_t xdr_char __P ((XDR *__xdrs, char *__cp));
-extern bool_t xdr_u_char __P ((XDR *__xdrs, u_char *__cp));
-extern bool_t xdr_vector __P ((XDR *__xdrs, char *__basep, u_int __nelem,
-			       u_int __elemsize, xdrproc_t __xdr_elem));
+extern bool_t xdr_u_char __P ((XDR *__xdrs, __u_char *__cp));
+extern bool_t xdr_vector __P ((XDR *__xdrs, char *__basep, __u_int __nelem,
+			       __u_int __elemsize, xdrproc_t __xdr_elem));
 extern bool_t xdr_float __P ((XDR *__xdrs, float *__fp));
 extern bool_t xdr_double __P ((XDR *__xdrs, double *__dp));
-extern bool_t xdr_reference __P ((XDR *__xdrs, caddr_t *__xpp, u_int __size,
+extern bool_t xdr_reference __P ((XDR *__xdrs, __caddr_t *__xpp, __u_int __size,
 				  xdrproc_t __proc));
 extern bool_t xdr_pointer __P ((XDR *__xdrs, char **__objpp,
-				u_int __obj_size, xdrproc_t __xdr_obj));
+				__u_int __obj_size, xdrproc_t __xdr_obj));
 extern bool_t xdr_wrapstring __P ((XDR *__xdrs, char **__cpp));
-extern u_long xdr_sizeof __P ((xdrproc_t, void *));
+extern __u_long xdr_sizeof __P ((xdrproc_t, void *));
 
 /*
  * Common opaque bytes objects used by many rpc protocols;
@@ -339,7 +339,7 @@
 #define MAX_NETOBJ_SZ 1024
 struct netobj
 {
-  u_int n_len;
+  __u_int n_len;
   char *n_bytes;
 };
 typedef struct netobj netobj;
@@ -351,16 +351,16 @@
  */
 
 /* XDR using memory buffers */
-extern void xdrmem_create __P ((XDR *__xdrs, __const caddr_t __addr,
-				u_int __size, enum xdr_op __xop));
+extern void xdrmem_create __P ((XDR *__xdrs, __const __caddr_t __addr,
+				__u_int __size, enum xdr_op __xop));
 
 /* XDR using stdio library */
 extern void xdrstdio_create __P ((XDR *__xdrs, FILE *__file,
 				  enum xdr_op __xop));
 
 /* XDR pseudo records for tcp */
-extern void xdrrec_create __P ((XDR *__xdrs, u_int __sendsize,
-				u_int __recvsize, caddr_t __tcp_handle,
+extern void xdrrec_create __P ((XDR *__xdrs, __u_int __sendsize,
+				__u_int __recvsize, __caddr_t __tcp_handle,
 				int (*__readit) (char *, char *, int),
 				int (*__writeit) (char *, char *, int)));
 
