Make self-contained.

11 files changed, 28 insertions, 0 deletions

diff --git a/cpukit/librpc/include/rpc/auth.h b/cpukit/librpc/include/rpc/auth.h
index 036089938c..1b4367c1da 100644
--- a/cpukit/librpc/include/rpc/auth.h
+++ b/cpukit/librpc/include/rpc/auth.h
@@ -45,6 +45,7 @@
 #define _RPC_AUTH_H
 #include <sys/cdefs.h>
 #include <sys/socket.h>
+#include <rpc/xdr.h>
 
 #define MAX_AUTH_BYTES	400
 #define MAXNETNAMELEN	255	/* maximum length of network user's name */
diff --git a/cpukit/librpc/include/rpc/auth_unix.h b/cpukit/librpc/include/rpc/auth_unix.h
index e28f478f67..f822f3dd60 100644
--- a/cpukit/librpc/include/rpc/auth_unix.h
+++ b/cpukit/librpc/include/rpc/auth_unix.h
@@ -47,6 +47,7 @@
 #ifndef _RPC_AUTH_UNIX_H
 #define _RPC_AUTH_UNIX_H
 #include <sys/cdefs.h>
+#include <rpc/auth.h> /* opaque_auth */
 
 /* The machine name is part of a credential; it may not exceed 255 bytes */
 #define MAX_MACHINE_NAME 255
diff --git a/cpukit/librpc/include/rpc/clnt.h b/cpukit/librpc/include/rpc/clnt.h
index 59f5c5d46e..0a769391ca 100644
--- a/cpukit/librpc/include/rpc/clnt.h
+++ b/cpukit/librpc/include/rpc/clnt.h
@@ -66,6 +66,7 @@
 #include <rpc/clnt_stat.h>
 #include <sys/cdefs.h>
 #include <sys/un.h>
+#include <rpc/auth.h> /* auth_stat */
 
 /*
  * Error info.
diff --git a/cpukit/librpc/include/rpc/clnt_soc.h b/cpukit/librpc/include/rpc/clnt_soc.h
index f98c1b9b78..9aa99b88ba 100644
--- a/cpukit/librpc/include/rpc/clnt_soc.h
+++ b/cpukit/librpc/include/rpc/clnt_soc.h
@@ -40,6 +40,8 @@
 #ifndef _RPC_CLNT_SOC_H
 #define _RPC_CLNT_SOC_H
 
+#include <time.h>
+
 /* derived from clnt_soc.h 1.3 88/12/17 SMI     */
 
 /*
@@ -48,6 +50,7 @@
  */
 
 #include <sys/cdefs.h>
+#include <rpc/clnt.h>
 
 #define UDPMSGSIZE      8800    /* rpc imposed limit on udp msg size */  
 
diff --git a/cpukit/librpc/include/rpc/pmap_clnt.h b/cpukit/librpc/include/rpc/pmap_clnt.h
index c538bcf53e..86fff6be4f 100644
--- a/cpukit/librpc/include/rpc/pmap_clnt.h
+++ b/cpukit/librpc/include/rpc/pmap_clnt.h
@@ -62,7 +62,11 @@
 
 #ifndef _RPC_PMAPCLNT_H
 #define _RPC_PMAPCLNT_H
+
 #include <sys/cdefs.h>
+#include <netinet/in.h> /* struct sockaddr_in */
+#include <rpc/types.h>
+#include <rpc/xdr.h> /* xdrproc_t */
 
 __BEGIN_DECLS
 extern bool_t		pmap_set	(u_long, u_long, int, int);
diff --git a/cpukit/librpc/include/rpc/pmap_prot.h b/cpukit/librpc/include/rpc/pmap_prot.h
index 3065dc1974..14720e8cbd 100644
--- a/cpukit/librpc/include/rpc/pmap_prot.h
+++ b/cpukit/librpc/include/rpc/pmap_prot.h
@@ -71,6 +71,7 @@
 #ifndef _RPC_PMAPPROT_H
 #define _RPC_PMAPPROT_H
 #include <sys/cdefs.h>
+#include <rpc/xdr.h>
 
 #define PMAPPORT		((u_short)111)
 #define PMAPPROG		((u_long)100000)
diff --git a/cpukit/librpc/include/rpc/pmap_rmt.h b/cpukit/librpc/include/rpc/pmap_rmt.h
index 752141494f..a5ea404f45 100644
--- a/cpukit/librpc/include/rpc/pmap_rmt.h
+++ b/cpukit/librpc/include/rpc/pmap_rmt.h
@@ -41,6 +41,7 @@
 #ifndef _RPC_PMAPRMT_H
 #define _RPC_PMAPRMT_H
 #include <sys/cdefs.h>
+#include <rpc/xdr.h>
 
 struct rmtcallargs {
 	u_long prog, vers, proc, arglen;
diff --git a/cpukit/librpc/include/rpc/rpc_msg.h b/cpukit/librpc/include/rpc/rpc_msg.h
index 21fcb841a1..85d2c704b8 100644
--- a/cpukit/librpc/include/rpc/rpc_msg.h
+++ b/cpukit/librpc/include/rpc/rpc_msg.h
@@ -45,6 +45,12 @@
 #ifndef _RPC_RPC_MSG_H
 #define _RPC_RPC_MSG_H
 
+#include <rpc/types.h>
+#include <rpc/xdr.h> /* xdrproc_t */
+#include <rpc/auth.h> /* opaque_auth */
+
+struct rpc_err; /* forward */
+
 #define RPC_MSG_VERSION		((u_int32_t) 2)
 #define RPC_SERVICE_PORT	((u_short) 2048)
 
diff --git a/cpukit/librpc/include/rpc/svc.h b/cpukit/librpc/include/rpc/svc.h
index 7b2633f9f1..969d2c5dd6 100644
--- a/cpukit/librpc/include/rpc/svc.h
+++ b/cpukit/librpc/include/rpc/svc.h
@@ -39,7 +39,13 @@
 
 #ifndef _RPC_SVC_H
 #define _RPC_SVC_H
+
 #include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/xdr.h> /* xdrproc_t */
+#include <sys/socket.h> /* socklen_t */
+#include <netinet/in.h> /* struct sockaddr_in */
+#include <rpc/auth.h> /* auth_stat */
 
 /*
  * This interface must manage two items concerning remote procedure calling:
diff --git a/cpukit/librpc/include/rpc/svc_auth.h b/cpukit/librpc/include/rpc/svc_auth.h
index 49533803cc..846752c294 100644
--- a/cpukit/librpc/include/rpc/svc_auth.h
+++ b/cpukit/librpc/include/rpc/svc_auth.h
@@ -40,6 +40,8 @@
 #ifndef _RPC_SVCAUTH_H
 #define _RPC_SVCAUTH_H
 
+#include <sys/cdefs.h>
+
 struct rpc_msg;
 struct svc_req;
 
diff --git a/cpukit/librpc/include/rpc/svc_soc.h b/cpukit/librpc/include/rpc/svc_soc.h
index 359d11e8ba..5b36fb46ef 100644
--- a/cpukit/librpc/include/rpc/svc_soc.h
+++ b/cpukit/librpc/include/rpc/svc_soc.h
@@ -40,6 +40,8 @@
 #ifndef _RPC_SVC_SOC_H
 #define _RPC_SVC_SOC_H
 #include <sys/cdefs.h>
+#include <rpc/types.h>
+#include <rpc/svc.h> /* SVCXPRT */
 
 /* #pragma ident   "@(#)svc_soc.h  1.11    94/04/25 SMI" */
 /*      svc_soc.h 1.8 89/05/01 SMI      */