diff --git a/cpukit/libfs/src/nfsclient/src/rpcio.c b/cpukit/libfs/src/nfsclient/src/rpcio.c
index 881eeda4c9..cddcb3260b 100644
--- a/cpukit/libfs/src/nfsclient/src/rpcio.c
+++ b/cpukit/libfs/src/nfsclient/src/rpcio.c
@@ -1052,7 +1052,7 @@ enum clnt_stat	err;
 	return RPC_SUCCESS;
 }
 
-void
+static void
 rpcUdpClntDestroy(RpcUdpClnt xact)
 {
 	rpcUdpServerDestroy(xact->server);
diff --git a/cpukit/libfs/src/nfsclient/src/rpcio.h b/cpukit/libfs/src/nfsclient/src/rpcio.h
index 02cd34ffe7..bc88e768c0 100644
--- a/cpukit/libfs/src/nfsclient/src/rpcio.h
+++ b/cpukit/libfs/src/nfsclient/src/rpcio.h
@@ -63,16 +63,14 @@
  * @{
  */
 
-#ifdef __rtems
-#include <rtems.h>
-#endif
-
 #include <rpc/rpc.h>
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <stdarg.h>
 
+#include "librtemsNfs.h"
+
 typedef struct RpcUdpServerRec_ 	*RpcUdpServer;
 typedef struct RpcUdpXactRec_		*RpcUdpXact;
 
@@ -80,9 +78,6 @@ typedef RpcUdpXact					RpcUdpClnt;
 
 #define RPCIOD_DEFAULT_ID	0xdef10000
 
-int
-rpcUdpInit(void);
-
 enum clnt_stat
 rpcUdpServerCreate(
 	struct sockaddr_in	*paddr,