5 files changed, 2 insertions, 30 deletions
diff --git a/sunrpc/rpc/auth.h b/sunrpc/rpc/auth.h
index 0e7e2a1e9e..a40bddd4c3 100644
--- a/sunrpc/rpc/auth.h
+++ b/sunrpc/rpc/auth.h
@@ -87,11 +87,6 @@ struct opaque_auth {
 	u_int	oa_length;		/* not to exceed MAX_AUTH_BYTES */
 };
 
-#ifndef _RPC_AUTH_H
-
-#define _RPC_AUTH_H	1
-#include <features.h>
-
 /*
  * Auth handle, interface to client side authenticators.
  */
diff --git a/sunrpc/rpc/auth_unix.h b/sunrpc/rpc/auth_unix.h
index 19b891cc29..3fb711894e 100644
--- a/sunrpc/rpc/auth_unix.h
+++ b/sunrpc/rpc/auth_unix.h
@@ -49,12 +49,6 @@
 
 __BEGIN_DECLS
 
-#ifndef _RPC_AUTH_UNIX_H
-
-#define _RPC_AUTH_UNIX_H	1
-#include <features.h>
-
-
 /* The machine name is part of a credential; it may not exceed 255 bytes */
 #define MAX_MACHINE_NAME 255
 
diff --git a/sunrpc/rpc/pmap_clnt.h b/sunrpc/rpc/pmap_clnt.h
index 95f0749f87..3acfa5974d 100644
--- a/sunrpc/rpc/pmap_clnt.h
+++ b/sunrpc/rpc/pmap_clnt.h
@@ -40,11 +40,6 @@
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
-#ifndef _RPC_PMAP_CLNT_H
-
-#define _RPC_PMAP_CLNT_H	1
-#include <features.h>
-
 __BEGIN_DECLS
 
 typedef bool_t (*resultproc_t)();
diff --git a/sunrpc/rpc/pmap_rmt.h b/sunrpc/rpc/pmap_rmt.h
index 15822ef642..f5d4af110b 100644
--- a/sunrpc/rpc/pmap_rmt.h
+++ b/sunrpc/rpc/pmap_rmt.h
@@ -47,10 +47,7 @@ struct rmtcallargs {
 	xdrproc_t xdr_args;
 };
 
-bool_t xdr_rmtcallres __P ((XDR *__xdrs, struct rmtcallres *__crp));
-
-
-#endif /* rpc/pmap_rmt.h */
+bool_t xdr_rmtcall_args __P ((XDR *__xdrs, struct rmtcallargs *__crp));
 
 struct rmtcallres {
 	u_long *port_ptr;
diff --git a/sunrpc/rpc/rpc_msg.h b/sunrpc/rpc/rpc_msg.h
index 533ec92068..9c37a4e3f9 100644
--- a/sunrpc/rpc/rpc_msg.h
+++ b/sunrpc/rpc/rpc_msg.h
@@ -42,12 +42,6 @@
 #include <features.h>
 
 
-#ifndef _RPC_RPC_MSG_H
-
-#define _RPC_RPC_MSG_H	1
-#include <features.h>
-
-
 #define RPC_MSG_VERSION		((u_long) 2)
 #define RPC_SERVICE_PORT	((u_short) 2048)
 
@@ -55,7 +49,7 @@ __BEGIN_DECLS
 
 /*
  * Bottom up definition of an rpc message.
- * NOTE: call and reply use the same overall stuct but
+ * NOTE: call and reply use the same overall struct but
  * different parts of unions within it.
  */
 
@@ -201,9 +195,6 @@ extern bool_t	xdr_replymsg __P ((XDR *__xdrs, struct rpc_msg *__rmsg));
 extern void	_seterr_reply __P ((struct rpc_msg *__msg,
 				    struct rpc_err *__error));
 
-#endif /* rpc/rpc_msg.h */
-				    struct rpc_err *__error));
-
 __END_DECLS
 
 #endif /* rpc/rpc_msg.h */