5 files changed, 5 insertions, 20 deletions
diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c
index 308ecee28..1d55c02a1 100644
--- a/libc/inet/rpc/clnt_tcp.c
+++ b/libc/inet/rpc/clnt_tcp.c
@@ -54,7 +54,7 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <rpc/rpc.h>
+#include "rpc_private.h"
 #include <sys/poll.h>
 #include <sys/socket.h>
 #include <rpc/pmap_clnt.h>
@@ -62,8 +62,6 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
 # include <wchar.h>
 #endif
 
-extern u_long _create_xid (void) attribute_hidden;
-
 #define MCALL_MSG_SIZE 24
 
 struct ct_data
diff --git a/libc/inet/rpc/clnt_udp.c b/libc/inet/rpc/clnt_udp.c
index f0c8ce8ec..af5e0d2d8 100644
--- a/libc/inet/rpc/clnt_udp.c
+++ b/libc/inet/rpc/clnt_udp.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 
 #include <stdio.h>
 #include <unistd.h>
-#include <rpc/rpc.h>
+#include "rpc_private.h"
 #include <rpc/xdr.h>
 #include <rpc/clnt.h>
 #include <sys/poll.h>
@@ -58,11 +58,6 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 #include <sys/uio.h>
 #endif
 
-/* CMSG_NXTHDR is using it */
-
-
-extern u_long _create_xid (void) attribute_hidden;
-
 /*
  * UDP bases client side rpc operations
  */
diff --git a/libc/inet/rpc/clnt_unix.c b/libc/inet/rpc/clnt_unix.c
index d79dbd7c9..677758c88 100644
--- a/libc/inet/rpc/clnt_unix.c
+++ b/libc/inet/rpc/clnt_unix.c
@@ -50,7 +50,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <rpc/rpc.h>
+#include "rpc_private.h"
 #include <sys/uio.h>
 #include <sys/poll.h>
 #include <sys/socket.h>
@@ -59,9 +59,6 @@
 # include <wchar.h>
 #endif
 
-
-extern u_long _create_xid (void) attribute_hidden;
-
 #define MCALL_MSG_SIZE 24
 
 struct ct_data
diff --git a/libc/inet/rpc/create_xid.c b/libc/inet/rpc/create_xid.c
index de7f7cfe1..fd673598f 100644
--- a/libc/inet/rpc/create_xid.c
+++ b/libc/inet/rpc/create_xid.c
@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/time.h>
-#include <rpc/rpc.h>
+#include "rpc_private.h"
 
 
 /* The RPC code is not threadsafe, but new code should be threadsafe. */
@@ -31,7 +31,6 @@ __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
 static smallint is_initialized;
 static struct drand48_data __rpc_lrand48_data;
 
-u_long _create_xid (void) attribute_hidden;
 u_long _create_xid (void)
 {
   long res;
diff --git a/libc/inet/rpc/pmap_rmt.c b/libc/inet/rpc/pmap_rmt.c
index 0c4994087..d1000ad53 100644
--- a/libc/inet/rpc/pmap_rmt.c
+++ b/libc/inet/rpc/pmap_rmt.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 
 #include <unistd.h>
 #include <string.h>
-#include <rpc/rpc.h>
+#include "rpc_private.h"
 #include <rpc/pmap_prot.h>
 #include <rpc/pmap_clnt.h>
 #include <rpc/pmap_rmt.h>
@@ -56,10 +56,6 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 #include <arpa/inet.h>
 #define MAX_BROADCAST_SIZE 1400
 
-
-
-extern u_long _create_xid (void) attribute_hidden;
-
 static const struct timeval timeout = {3, 0};
 
 /*