diff -urNp libtirpc-1.0.3-orig/src/auth_des.c libtirpc-1.0.3-dwok/src/auth_des.c
--- libtirpc-1.0.3-orig/src/auth_des.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/auth_des.c	2018-07-04 21:36:38.279595463 +0200
@@ -38,13 +38,13 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <rpc/des_crypt.h>
+#include <tirpc/rpc/des_crypt.h>
 #include <syslog.h>
-#include <rpc/types.h>
-#include <rpc/auth.h>
-#include <rpc/auth_des.h>
-#include <rpc/clnt.h>
-#include <rpc/xdr.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/auth.h>
+#include <tirpc/rpc/auth_des.h>
+#include <tirpc/rpc/clnt.h>
+#include <tirpc/rpc/xdr.h>
 #include <sys/socket.h>
 
 #include "nis.h"
diff -urNp libtirpc-1.0.3-orig/src/authdes_prot.c libtirpc-1.0.3-dwok/src/authdes_prot.c
--- libtirpc-1.0.3-orig/src/authdes_prot.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/authdes_prot.c	2018-07-04 21:38:15.337806558 +0200
@@ -33,11 +33,11 @@
  * authdes_prot.c, XDR routines for DES authentication
  */
 
-#include <rpc/types.h>
+#include <tirpc/rpc/types.h>
 
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_des.h>
+#include <tirpc/rpc/xdr.h>
+#include <tirpc/rpc/auth.h>
+#include <tirpc/rpc/auth_des.h>
 
 #define ATTEMPT(xdr_op) if (!(xdr_op)) return (FALSE)
 
diff -urNp libtirpc-1.0.3-orig/src/auth_gss.c libtirpc-1.0.3-dwok/src/auth_gss.c
--- libtirpc-1.0.3-orig/src/auth_gss.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/auth_gss.c	2018-07-04 21:37:13.646943598 +0200
@@ -41,12 +41,12 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_gss.h>
-#include <rpc/rpcsec_gss.h>
-#include <rpc/clnt.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
+#include <tirpc/rpc/auth.h>
+#include <tirpc/rpc/auth_gss.h>
+#include <tirpc/rpc/rpcsec_gss.h>
+#include <tirpc/rpc/clnt.h>
 #include <netinet/in.h>
 #include <reentrant.h>
 
diff -urNp libtirpc-1.0.3-orig/src/authgss_prot.c libtirpc-1.0.3-dwok/src/authgss_prot.c
--- libtirpc-1.0.3-orig/src/authgss_prot.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/authgss_prot.c	2018-07-04 21:38:22.761669727 +0200
@@ -38,11 +38,11 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_gss.h>
-#include <rpc/rpc.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
+#include <tirpc/rpc/auth.h>
+#include <tirpc/rpc/auth_gss.h>
+#include <tirpc/rpc/rpc.h>
 #include <ctype.h>
 #include <gssapi/gssapi.h>
 
diff -urNp libtirpc-1.0.3-orig/src/auth_none.c libtirpc-1.0.3-dwok/src/auth_none.c
--- libtirpc-1.0.3-orig/src/auth_none.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/auth_none.c	2018-07-04 21:37:42.982402908 +0200
@@ -46,9 +46,9 @@ __FBSDID("$FreeBSD: src/lib/libc/rpc/aut
 #include <reentrant.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
+#include <tirpc/rpc/auth.h>
 
 #define MAX_MARSHAL_SIZE 20
 
diff -urNp libtirpc-1.0.3-orig/src/auth_time.c libtirpc-1.0.3-dwok/src/auth_time.c
--- libtirpc-1.0.3-orig/src/auth_time.c	2018-07-04 21:34:28.405989196 +0200
+++ libtirpc-1.0.3-dwok/src/auth_time.c	2018-07-04 21:37:53.030217715 +0200
@@ -39,9 +39,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <rpc/rpc.h>
-#include <rpc/rpc_com.h>
-#include <rpc/rpcb_prot.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/rpc_com.h>
+#include <tirpc/rpc/rpcb_prot.h>
 //#include <clnt_soc.h>
 #include <sys/select.h>
 
diff -urNp libtirpc-1.0.3-orig/src/auth_unix.c libtirpc-1.0.3-dwok/src/auth_unix.c
--- libtirpc-1.0.3-orig/src/auth_unix.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/auth_unix.c	2018-07-04 21:38:01.826055596 +0200
@@ -50,11 +50,11 @@
 #include <string.h>
 #include <errno.h>
 
-#include <rpc/clnt.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_unix.h>
+#include <tirpc/rpc/clnt.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
+#include <tirpc/rpc/auth.h>
+#include <tirpc/rpc/auth_unix.h>
 
 /* auth_unix.c */
 static void authunix_nextverf (AUTH *);
diff -urNp libtirpc-1.0.3-orig/src/authunix_prot.c libtirpc-1.0.3-dwok/src/authunix_prot.c
--- libtirpc-1.0.3-orig/src/authunix_prot.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/authunix_prot.c	2018-07-04 21:38:29.153551917 +0200
@@ -36,10 +36,10 @@
 
 #include <assert.h>
 
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_unix.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
+#include <tirpc/rpc/auth.h>
+#include <tirpc/rpc/auth_unix.h>
 
 /*
  * XDR for unix authentication parameters.
diff -urNp libtirpc-1.0.3-orig/src/binddynport.c libtirpc-1.0.3-dwok/src/binddynport.c
--- libtirpc-1.0.3-orig/src/binddynport.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/binddynport.c	2018-07-04 21:38:35.645432263 +0200
@@ -38,7 +38,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 
 #include "reentrant.h"
 #include "rpc_com.h"
diff -urNp libtirpc-1.0.3-orig/src/bindresvport.c libtirpc-1.0.3-dwok/src/bindresvport.c
--- libtirpc-1.0.3-orig/src/bindresvport.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/bindresvport.c	2018-07-04 21:38:42.165312094 +0200
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 
 #include <string.h>
 #include <reentrant.h>
diff -urNp libtirpc-1.0.3-orig/src/clnt_bcast.c libtirpc-1.0.3-dwok/src/clnt_bcast.c
--- libtirpc-1.0.3-orig/src/clnt_bcast.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/clnt_bcast.c	2018-07-04 21:38:50.781153293 +0200
@@ -46,13 +46,13 @@
 #include <netinet/in.h>
 #include <ifaddrs.h>
 #include <poll.h>
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #ifdef PORTMAP
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_rmt.h>
+#include <tirpc/rpc/pmap_prot.h>
+#include <tirpc/rpc/pmap_clnt.h>
+#include <tirpc/rpc/pmap_rmt.h>
 #endif				/* PORTMAP */
-#include <rpc/nettype.h>
+#include <tirpc/rpc/nettype.h>
 #include <arpa/inet.h>
 #include <stdio.h>
 #include <errno.h>
diff -urNp libtirpc-1.0.3-orig/src/clnt_dg.c libtirpc-1.0.3-dwok/src/clnt_dg.c
--- libtirpc-1.0.3-orig/src/clnt_dg.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/clnt_dg.c	2018-07-04 21:39:00.316977535 +0200
@@ -42,10 +42,10 @@
 #include <sys/time.h>
 
 #include <sys/ioctl.h>
-#include <rpc/clnt.h>
+#include <tirpc/rpc/clnt.h>
 #include <arpa/inet.h>
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/xdr.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
diff -urNp libtirpc-1.0.3-orig/src/clnt_generic.c libtirpc-1.0.3-dwok/src/clnt_generic.c
--- libtirpc-1.0.3-orig/src/clnt_generic.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/clnt_generic.c	2018-07-04 21:39:07.852838641 +0200
@@ -38,8 +38,8 @@
 #include <errno.h>
 #include <netdb.h>
 #include <syslog.h>
-#include <rpc/rpc.h>
-#include <rpc/nettype.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/nettype.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
diff -urNp libtirpc-1.0.3-orig/src/clnt_perror.c libtirpc-1.0.3-dwok/src/clnt_perror.c
--- libtirpc-1.0.3-orig/src/clnt_perror.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/clnt_perror.c	2018-07-04 21:39:14.728711909 +0200
@@ -36,10 +36,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <rpc/rpc.h>
-#include <rpc/types.h>
-#include <rpc/auth.h>
-#include <rpc/clnt.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/auth.h>
+#include <tirpc/rpc/clnt.h>
 
 static char *buf;
 
diff -urNp libtirpc-1.0.3-orig/src/clnt_raw.c libtirpc-1.0.3-dwok/src/clnt_raw.c
--- libtirpc-1.0.3-orig/src/clnt_raw.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/clnt_raw.c	2018-07-04 21:39:20.104612824 +0200
@@ -43,8 +43,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <rpc/rpc.h>
-#include <rpc/raw.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/raw.h>
 
 extern mutex_t clntraw_lock;
 
diff -urNp libtirpc-1.0.3-orig/src/clnt_simple.c libtirpc-1.0.3-dwok/src/clnt_simple.c
--- libtirpc-1.0.3-orig/src/clnt_simple.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/clnt_simple.c	2018-07-04 21:39:26.112502092 +0200
@@ -39,13 +39,13 @@
 #include <sys/param.h>
 #include <stdio.h>
 #include <errno.h>
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #include <string.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <rpc/clnt.h>
+#include <tirpc/rpc/clnt.h>
 
 #ifndef MAXHOSTNAMELEN
 #define	MAXHOSTNAMELEN 64
diff -urNp libtirpc-1.0.3-orig/src/clnt_vc.c libtirpc-1.0.3-dwok/src/clnt_vc.c
--- libtirpc-1.0.3-orig/src/clnt_vc.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/clnt_vc.c	2018-07-04 21:39:31.000412002 +0200
@@ -64,7 +64,7 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #include "rpc_com.h"
 
 #define MCALL_MSG_SIZE 24
diff -urNp libtirpc-1.0.3-orig/src/crypt_client.c libtirpc-1.0.3-dwok/src/crypt_client.c
--- libtirpc-1.0.3-orig/src/crypt_client.c	2018-07-04 21:34:28.409989123 +0200
+++ libtirpc-1.0.3-dwok/src/crypt_client.c	2018-07-04 21:55:44.794463753 +0200
@@ -33,12 +33,12 @@
 
 #include <err.h>
 #include <sys/types.h>
-#include <rpc/des_crypt.h>
-#include <rpc/des.h>
+#include <tirpc/rpc/des_crypt.h>
+#include <tirpc/rpc/des.h>
 #include <string.h>
-#include <rpcsvc/crypt.h>
+#include <tirpc/rpcsvc/crypt.h>
 
-#include <netconfig.h>
+#include <tirpc/netconfig.h>
 
 int
 _des_crypt_call(buf, len, dparms)
diff -urNp libtirpc-1.0.3-orig/src/des_crypt.c libtirpc-1.0.3-dwok/src/des_crypt.c
--- libtirpc-1.0.3-orig/src/des_crypt.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/des_crypt.c	2018-07-04 21:39:54.727974673 +0200
@@ -31,9 +31,9 @@
  */
 
 #include <sys/types.h>
-#include <rpc/types.h>
-#include <rpc/des_crypt.h>
-#include <rpc/des.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/des_crypt.h>
+#include <tirpc/rpc/des.h>
 #if 0
 #ifndef lint
 static char sccsid[] = "@(#)des_crypt.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
diff -urNp libtirpc-1.0.3-orig/src/des_impl.c libtirpc-1.0.3-dwok/src/des_impl.c
--- libtirpc-1.0.3-orig/src/des_impl.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/des_impl.c	2018-07-04 21:40:02.287835335 +0200
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <sys/types.h>
-#include <rpc/des.h>
+#include <tirpc/rpc/des.h>
 
 
 static const uint32_t des_SPtrans[8][64] =
diff -urNp libtirpc-1.0.3-orig/src/getnetconfig.c libtirpc-1.0.3-dwok/src/getnetconfig.c
--- libtirpc-1.0.3-orig/src/getnetconfig.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/getnetconfig.c	2018-07-04 21:49:43.281126899 +0200
@@ -34,11 +34,11 @@
 #include <reentrant.h>
 #include <stdio.h>
 #include <errno.h>
-#include <netconfig.h>
+#include <tirpc/netconfig.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #include <unistd.h>
 #include "rpc_com.h"
 
diff -urNp libtirpc-1.0.3-orig/src/getnetpath.c libtirpc-1.0.3-dwok/src/getnetpath.c
--- libtirpc-1.0.3-orig/src/getnetpath.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/getnetpath.c	2018-07-04 21:49:51.652972595 +0200
@@ -32,7 +32,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <netconfig.h>
+#include <tirpc/netconfig.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
diff -urNp libtirpc-1.0.3-orig/src/getpublickey.c libtirpc-1.0.3-dwok/src/getpublickey.c
--- libtirpc-1.0.3-orig/src/getpublickey.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/getpublickey.c	2018-07-04 21:55:07.623148868 +0200
@@ -36,8 +36,8 @@
  */
 #include <stdio.h>
 #include <pwd.h>
-#include <rpc/rpc.h>
-#include <rpc/key_prot.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/key_prot.h>
 #ifdef YP
 #include <rpcsvc/yp_prot.h>
 #include <rpcsvc/ypclnt.h>
diff -urNp libtirpc-1.0.3-orig/src/getrpcent.c libtirpc-1.0.3-dwok/src/getrpcent.c
--- libtirpc-1.0.3-orig/src/getrpcent.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/getrpcent.c	2018-07-04 21:54:44.171581109 +0200
@@ -45,7 +45,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #ifdef YP
 #include <rpcsvc/yp_prot.h>
 #include <rpcsvc/ypclnt.h>
diff -urNp libtirpc-1.0.3-orig/src/getrpcport.c libtirpc-1.0.3-dwok/src/getrpcport.c
--- libtirpc-1.0.3-orig/src/getrpcport.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/getrpcport.c	2018-07-04 21:40:38.235172780 +0200
@@ -39,8 +39,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <rpc/rpc.h>
-#include <rpc/pmap_clnt.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/pmap_clnt.h>
 
 int
 getrpcport(host, prognum, versnum, proto)
diff -urNp libtirpc-1.0.3-orig/src/key_call.c libtirpc-1.0.3-dwok/src/key_call.c
--- libtirpc-1.0.3-orig/src/key_call.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/key_call.c	2018-07-04 21:49:59.304831562 +0200
@@ -46,12 +46,12 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <rpc/rpc.h>
-#include <rpc/auth.h>
-#include <rpc/auth_unix.h>
-#include <rpc/key_prot.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/auth.h>
+#include <tirpc/rpc/auth_unix.h>
+#include <tirpc/rpc/key_prot.h>
 #include <string.h>
-#include <netconfig.h>
+#include <tirpc/netconfig.h>
 #include <sys/utsname.h>
 #include <stdlib.h>
 #include <signal.h>
diff -urNp libtirpc-1.0.3-orig/src/key_prot_xdr.c libtirpc-1.0.3-dwok/src/key_prot_xdr.c
--- libtirpc-1.0.3-orig/src/key_prot_xdr.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/key_prot_xdr.c	2018-07-04 21:40:51.154934652 +0200
@@ -3,7 +3,7 @@
  * It was generated using rpcgen.
  */
 
-#include <rpc/key_prot.h>
+#include <tirpc/rpc/key_prot.h>
 /*
  * Copyright (c) 2009, Sun Microsystems, Inc.
  * All rights reserved.
diff -urNp libtirpc-1.0.3-orig/src/mt_misc.c libtirpc-1.0.3-dwok/src/mt_misc.c
--- libtirpc-1.0.3-orig/src/mt_misc.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/mt_misc.c	2018-07-04 21:40:59.966772240 +0200
@@ -1,7 +1,7 @@
 
 #include <pthread.h>
 #include <reentrant.h>
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #include <sys/time.h>
 #include <stdlib.h>
 #include <string.h>
diff -urNp libtirpc-1.0.3-orig/src/netname.c libtirpc-1.0.3-dwok/src/netname.c
--- libtirpc-1.0.3-orig/src/netname.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/netname.c	2018-07-04 21:54:32.439797341 +0200
@@ -35,7 +35,7 @@
  */
 
 #include <sys/param.h>
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #include "rpc_com.h"
 #ifdef YP
 #include <rpcsvc/yp_prot.h>
diff -urNp libtirpc-1.0.3-orig/src/netnamer.c libtirpc-1.0.3-dwok/src/netnamer.c
--- libtirpc-1.0.3-orig/src/netnamer.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/netnamer.c	2018-07-04 21:54:12.136171563 +0200
@@ -33,7 +33,7 @@
  * architecture.
  */
 #include <sys/param.h>
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #include "rpc_com.h"
 #ifdef YP
 #include <rpcsvc/yp_prot.h>
diff -urNp libtirpc-1.0.3-orig/src/pmap_clnt.c libtirpc-1.0.3-dwok/src/pmap_clnt.c
--- libtirpc-1.0.3-orig/src/pmap_clnt.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/pmap_clnt.c	2018-07-04 21:41:22.318360272 +0200
@@ -38,10 +38,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/nettype.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/pmap_prot.h>
+#include <tirpc/rpc/pmap_clnt.h>
+#include <tirpc/rpc/nettype.h>
 #include <netinet/in.h>
 
 #include <stdio.h>
diff -urNp libtirpc-1.0.3-orig/src/pmap_getmaps.c libtirpc-1.0.3-dwok/src/pmap_getmaps.c
--- libtirpc-1.0.3-orig/src/pmap_getmaps.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/pmap_getmaps.c	2018-07-04 21:41:30.014218428 +0200
@@ -48,9 +48,9 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/pmap_prot.h>
+#include <tirpc/rpc/pmap_clnt.h>
 //#include <clnt_soc.h>
 #define NAMELEN 255
 #define MAX_BROADCAST_SIZE 1400
diff -urNp libtirpc-1.0.3-orig/src/pmap_getport.c libtirpc-1.0.3-dwok/src/pmap_getport.c
--- libtirpc-1.0.3-orig/src/pmap_getport.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/pmap_getport.c	2018-07-04 21:41:36.366101354 +0200
@@ -41,9 +41,9 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/pmap_prot.h>
+#include <tirpc/rpc/pmap_clnt.h>
 
 static const struct timeval timeout = { 5, 0 };
 static const struct timeval tottimeout = { 60, 0 };
diff -urNp libtirpc-1.0.3-orig/src/pmap_prot2.c libtirpc-1.0.3-dwok/src/pmap_prot2.c
--- libtirpc-1.0.3-orig/src/pmap_prot2.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/pmap_prot2.c	2018-07-04 21:41:48.597875907 +0200
@@ -35,9 +35,9 @@
 
 #include <assert.h>
 
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/pmap_prot.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
+#include <tirpc/rpc/pmap_prot.h>
 
 
 /*
diff -urNp libtirpc-1.0.3-orig/src/pmap_prot.c libtirpc-1.0.3-dwok/src/pmap_prot.c
--- libtirpc-1.0.3-orig/src/pmap_prot.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/pmap_prot.c	2018-07-04 21:41:42.161994529 +0200
@@ -35,9 +35,9 @@
 
 #include <assert.h>
 
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/pmap_prot.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
+#include <tirpc/rpc/pmap_prot.h>
 
 
 bool_t
diff -urNp libtirpc-1.0.3-orig/src/pmap_rmt.c libtirpc-1.0.3-dwok/src/pmap_rmt.c
--- libtirpc-1.0.3-orig/src/pmap_rmt.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/pmap_rmt.c	2018-07-04 21:41:54.533766501 +0200
@@ -50,10 +50,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_rmt.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/pmap_prot.h>
+#include <tirpc/rpc/pmap_clnt.h>
+#include <tirpc/rpc/pmap_rmt.h>
 
 // For the clnttcp_create function
 //#include <clnt_soc.h>
diff -urNp libtirpc-1.0.3-orig/src/rpcb_clnt.c libtirpc-1.0.3-dwok/src/rpcb_clnt.c
--- libtirpc-1.0.3-orig/src/rpcb_clnt.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/rpcb_clnt.c	2018-07-04 21:50:23.656382732 +0200
@@ -36,13 +36,13 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/utsname.h>
-#include <rpc/rpc.h>
-#include <rpc/rpcb_prot.h>
-#include <rpc/nettype.h>
-#include <netconfig.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/rpcb_prot.h>
+#include <tirpc/rpc/nettype.h>
+#include <tirpc/netconfig.h>
 #ifdef PORTMAP
 #include <netinet/in.h>		/* FOR IPPROTO_TCP/UDP definitions */
-#include <rpc/pmap_prot.h>
+#include <tirpc/rpc/pmap_prot.h>
 #endif				/* PORTMAP */
 #include <stdio.h>
 #include <errno.h>
diff -urNp libtirpc-1.0.3-orig/src/rpcb_prot.c libtirpc-1.0.3-dwok/src/rpcb_prot.c
--- libtirpc-1.0.3-orig/src/rpcb_prot.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/rpcb_prot.c	2018-07-04 21:43:29.292019988 +0200
@@ -37,10 +37,10 @@
  * Copyright (C) 1984, 1988, Sun Microsystems, Inc.
  */
 
-#include <rpc/rpc.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/rpcb_prot.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
+#include <tirpc/rpc/rpcb_prot.h>
 #include "rpc_com.h"
 
 bool_t
diff -urNp libtirpc-1.0.3-orig/src/rpcb_st_xdr.c libtirpc-1.0.3-dwok/src/rpcb_st_xdr.c
--- libtirpc-1.0.3-orig/src/rpcb_st_xdr.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/rpcb_st_xdr.c	2018-07-04 21:43:36.275891266 +0200
@@ -36,7 +36,7 @@
  */
 
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #include "rpc_com.h"
 
 /* Link list of all the stats about getport and getaddr */
diff -urNp libtirpc-1.0.3-orig/src/rpc_callmsg.c libtirpc-1.0.3-dwok/src/rpc_callmsg.c
--- libtirpc-1.0.3-orig/src/rpc_callmsg.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/rpc_callmsg.c	2018-07-04 21:42:00.829650460 +0200
@@ -37,8 +37,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/xdr.h>
 
 #include <sys/select.h>
 
diff -urNp libtirpc-1.0.3-orig/src/rpc_com.h libtirpc-1.0.3-dwok/src/rpc_com.h
--- libtirpc-1.0.3-orig/src/rpc_com.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/rpc_com.h	2018-07-04 21:42:11.577452365 +0200
@@ -33,14 +33,14 @@
  * rpc_com.h, Common definitions for both the server and client side.
  * All for the topmost layer of rpc
  *
- * In Sun's tirpc distribution, this was installed as <rpc/rpc_com.h>,
+ * In Sun's tirpc distribution, this was installed as <tirpc/rpc/rpc_com.h>,
  * but as it contains only non-exported interfaces, it was moved here.
  */
 
 #ifndef _TIRPC_RPCCOM_H
 #define	_TIRPC_RPCCOM_H
 
-#include <rpc/rpc_com.h>
+#include <tirpc/rpc/rpc_com.h>
 
 #ifdef __cplusplus
 extern "C" {
diff -urNp libtirpc-1.0.3-orig/src/rpc_commondata.c libtirpc-1.0.3-dwok/src/rpc_commondata.c
--- libtirpc-1.0.3-orig/src/rpc_commondata.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/rpc_commondata.c	2018-07-04 21:42:25.361198313 +0200
@@ -26,7 +26,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 
 
 /*
diff -urNp libtirpc-1.0.3-orig/src/rpc_dtablesize.c libtirpc-1.0.3-dwok/src/rpc_dtablesize.c
--- libtirpc-1.0.3-orig/src/rpc_dtablesize.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/rpc_dtablesize.c	2018-07-04 21:42:32.273070919 +0200
@@ -28,8 +28,8 @@
 
 #include <unistd.h>
 #include <sys/select.h>
-#include <rpc/clnt.h>
-#include <rpc/rpc_com.h>
+#include <tirpc/rpc/clnt.h>
+#include <tirpc/rpc/rpc_com.h>
 
 /*
  * Cache the result of getdtablesize(), so we don't have to do an
diff -urNp libtirpc-1.0.3-orig/src/rpc_generic.c libtirpc-1.0.3-dwok/src/rpc_generic.c
--- libtirpc-1.0.3-orig/src/rpc_generic.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/rpc_generic.c	2018-07-04 21:50:16.288518531 +0200
@@ -44,16 +44,16 @@
 #include <sys/resource.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #include <ctype.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <netdb.h>
-#include <netconfig.h>
+#include <tirpc/netconfig.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <rpc/nettype.h>
+#include <tirpc/rpc/nettype.h>
 #include "rpc_com.h"
 
 struct handle {
@@ -189,7 +189,7 @@ strlocase(p)
 #endif
 
 /*
- * Returns the type of the network as defined in <rpc/nettype.h>
+ * Returns the type of the network as defined in <tirpc/rpc/nettype.h>
  * If nettype is NULL, it defaults to NETPATH.
  */
 static int
diff -urNp libtirpc-1.0.3-orig/src/rpc_gss_utils.c libtirpc-1.0.3-dwok/src/rpc_gss_utils.c
--- libtirpc-1.0.3-orig/src/rpc_gss_utils.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/rpc_gss_utils.c	2018-07-04 21:42:53.440680773 +0200
@@ -30,8 +30,8 @@
 #include <errno.h>
 #include <reentrant.h>
 
-#include <rpc/auth_gss.h>
-#include <rpc/rpcsec_gss.h>
+#include <tirpc/rpc/auth_gss.h>
+#include <tirpc/rpc/rpcsec_gss.h>
 
 #include <gssapi/gssapi_krb5.h>
 
diff -urNp libtirpc-1.0.3-orig/src/rpc_prot.c libtirpc-1.0.3-dwok/src/rpc_prot.c
--- libtirpc-1.0.3-orig/src/rpc_prot.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/rpc_prot.c	2018-07-04 21:42:59.772564068 +0200
@@ -43,7 +43,7 @@
 
 #include <assert.h>
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 
 static void accepted(enum accept_stat, struct rpc_err *);
 static void rejected(enum reject_stat, struct rpc_err *);
diff -urNp libtirpc-1.0.3-orig/src/rpc_soc.c libtirpc-1.0.3-dwok/src/rpc_soc.c
--- libtirpc-1.0.3-orig/src/rpc_soc.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/rpc_soc.c	2018-07-04 21:43:08.432404457 +0200
@@ -48,10 +48,10 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdio.h>
-#include <rpc/rpc.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/nettype.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/pmap_clnt.h>
+#include <tirpc/rpc/pmap_prot.h>
+#include <tirpc/rpc/nettype.h>
 #include <syslog.h>
 #include <netinet/in.h>
 #include <netdb.h>
diff -urNp libtirpc-1.0.3-orig/src/svc_auth.c libtirpc-1.0.3-dwok/src/svc_auth.c
--- libtirpc-1.0.3-orig/src/svc_auth.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/svc_auth.c	2018-07-04 21:43:49.271651738 +0200
@@ -37,8 +37,8 @@
 #include <pthread.h>
 #include <reentrant.h>
 #include <sys/types.h>
-#include <rpc/rpc.h>
-#include <rpc/auth_des.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/auth_des.h>
 #include <stdlib.h>
 
 /*
diff -urNp libtirpc-1.0.3-orig/src/svc_auth_des.c libtirpc-1.0.3-dwok/src/svc_auth_des.c
--- libtirpc-1.0.3-orig/src/svc_auth_des.c	2018-07-04 21:34:28.409989123 +0200
+++ libtirpc-1.0.3-dwok/src/svc_auth_des.c	2018-07-04 21:44:02.415409482 +0200
@@ -50,16 +50,16 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <rpc/des_crypt.h>
+#include <tirpc/rpc/des_crypt.h>
 #include <sys/param.h>
 #include <netinet/in.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_des.h>
-#include <rpc/svc.h>
-#include <rpc/rpc_msg.h>
-#include <rpc/svc_auth.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
+#include <tirpc/rpc/auth.h>
+#include <tirpc/rpc/auth_des.h>
+#include <tirpc/rpc/svc.h>
+#include <tirpc/rpc/rpc_msg.h>
+#include <tirpc/rpc/svc_auth.h>
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include <libc_private.h>
 #endif
diff -urNp libtirpc-1.0.3-orig/src/svc_auth_gss.c libtirpc-1.0.3-dwok/src/svc_auth_gss.c
--- libtirpc-1.0.3-orig/src/svc_auth_gss.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/svc_auth_gss.c	2018-07-04 21:44:09.495278991 +0200
@@ -43,10 +43,10 @@
 #include <pwd.h>
 #include <grp.h>
 
-#include <rpc/rpc.h>
-#include <rpc/auth_gss.h>
-#include <rpc/svc_auth_gss.h>
-#include <rpc/rpcsec_gss.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/auth_gss.h>
+#include <tirpc/rpc/svc_auth_gss.h>
+#include <tirpc/rpc/rpcsec_gss.h>
 
 #ifdef HAVE_GSSAPI_GSSAPI_EXT_H
 /* MIT Kerberos */
diff -urNp libtirpc-1.0.3-orig/src/svc_auth_none.c libtirpc-1.0.3-dwok/src/svc_auth_none.c
--- libtirpc-1.0.3-orig/src/svc_auth_none.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/svc_auth_none.c	2018-07-04 21:44:15.087175925 +0200
@@ -35,7 +35,7 @@
   $Id: svc_auth_none.c,v 1.1 2004/10/22 17:24:30 bfields Exp $
  */
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 
 static bool_t	svcauth_none_destroy();
 static bool_t   svcauth_none_wrap();
diff -urNp libtirpc-1.0.3-orig/src/svc_auth_unix.c libtirpc-1.0.3-dwok/src/svc_auth_unix.c
--- libtirpc-1.0.3-orig/src/svc_auth_unix.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/svc_auth_unix.c	2018-07-04 21:44:20.927068288 +0200
@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 
 extern SVCAUTH svc_auth_none;
 
diff -urNp libtirpc-1.0.3-orig/src/svc.c libtirpc-1.0.3-dwok/src/svc.c
--- libtirpc-1.0.3-orig/src/svc.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/svc.c	2018-07-04 21:43:42.511776331 +0200
@@ -46,9 +46,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #ifdef PORTMAP
-#include <rpc/pmap_clnt.h>
+#include <tirpc/rpc/pmap_clnt.h>
 #endif /* PORTMAP */
 
 #include "rpc_com.h"
diff -urNp libtirpc-1.0.3-orig/src/svc_dg.c libtirpc-1.0.3-dwok/src/svc_dg.c
--- libtirpc-1.0.3-orig/src/svc_dg.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/svc_dg.c	2018-07-04 21:50:32.824213757 +0200
@@ -41,14 +41,14 @@
 #include <reentrant.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <rpc/rpc.h>
-#include <rpc/svc_dg.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/svc_dg.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <netconfig.h>
+#include <tirpc/netconfig.h>
 #include <err.h>
 
 #include "rpc_com.h"
diff -urNp libtirpc-1.0.3-orig/src/svc_generic.c libtirpc-1.0.3-dwok/src/svc_generic.c
--- libtirpc-1.0.3-orig/src/svc_generic.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/svc_generic.c	2018-07-04 21:44:33.458837313 +0200
@@ -40,8 +40,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <rpc/rpc.h>
-#include <rpc/nettype.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/nettype.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -50,7 +50,7 @@
 #include <err.h>
 
 #include "rpc_com.h"
-#include <rpc/svc.h>
+#include <tirpc/rpc/svc.h>
 
 extern int __svc_vc_setflag(SVCXPRT *, int);
 extern int __binddynport(int fd);
diff -urNp libtirpc-1.0.3-orig/src/svc_raw.c libtirpc-1.0.3-dwok/src/svc_raw.c
--- libtirpc-1.0.3-orig/src/svc_raw.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/svc_raw.c	2018-07-04 21:44:40.342710434 +0200
@@ -39,9 +39,9 @@
  */
 #include <pthread.h>
 #include <reentrant.h>
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #include <sys/types.h>
-#include <rpc/raw.h>
+#include <tirpc/rpc/raw.h>
 #include <stdlib.h>
 
 #ifndef UDPMSGSIZE
diff -urNp libtirpc-1.0.3-orig/src/svc_run.c libtirpc-1.0.3-dwok/src/svc_run.c
--- libtirpc-1.0.3-orig/src/svc_run.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/svc_run.c	2018-07-04 21:44:46.202602429 +0200
@@ -40,7 +40,7 @@
 #include <sys/poll.h>
 
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #include "rpc_com.h"
 #include <sys/select.h>
 
diff -urNp libtirpc-1.0.3-orig/src/svc_simple.c libtirpc-1.0.3-dwok/src/svc_simple.c
--- libtirpc-1.0.3-orig/src/svc_simple.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/svc_simple.c	2018-07-04 21:44:52.518486020 +0200
@@ -44,8 +44,8 @@
 #include <pthread.h>
 #include <reentrant.h>
 #include <sys/types.h>
-#include <rpc/rpc.h>
-#include <rpc/nettype.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/nettype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -urNp libtirpc-1.0.3-orig/src/svc_vc.c libtirpc-1.0.3-dwok/src/svc_vc.c
--- libtirpc-1.0.3-orig/src/svc_vc.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/svc_vc.c	2018-07-04 21:44:58.570374476 +0200
@@ -56,7 +56,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 
 #include "rpc_com.h"
 
diff -urNp libtirpc-1.0.3-orig/src/xdr_array.c libtirpc-1.0.3-dwok/src/xdr_array.c
--- libtirpc-1.0.3-orig/src/xdr_array.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/xdr_array.c	2018-07-04 21:45:10.774149544 +0200
@@ -43,8 +43,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <rpc/types.h>
-#include <rpc/xdr.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
 #include "un-namespace.h"
 
 /*
diff -urNp libtirpc-1.0.3-orig/src/xdr.c libtirpc-1.0.3-dwok/src/xdr.c
--- libtirpc-1.0.3-orig/src/xdr.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/xdr.c	2018-07-04 21:45:04.966256591 +0200
@@ -42,10 +42,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <rpc/rpc.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/rpc_com.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
+#include <tirpc/rpc/rpc_com.h>
 
 typedef quad_t          longlong_t;     /* ANSI long long type */
 typedef u_quad_t        u_longlong_t;   /* ANSI unsigned long long type */
diff -urNp libtirpc-1.0.3-orig/src/xdr_float.c libtirpc-1.0.3-dwok/src/xdr_float.c
--- libtirpc-1.0.3-orig/src/xdr_float.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/xdr_float.c	2018-07-04 21:45:16.382046184 +0200
@@ -43,8 +43,8 @@
 
 #include <stdio.h>
 
-#include <rpc/types.h>
-#include <rpc/xdr.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
 #include "un-namespace.h"
 
 /*
diff -urNp libtirpc-1.0.3-orig/src/xdr_mem.c libtirpc-1.0.3-dwok/src/xdr_mem.c
--- libtirpc-1.0.3-orig/src/xdr_mem.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/xdr_mem.c	2018-07-04 21:45:21.309955357 +0200
@@ -44,8 +44,8 @@
 
 #include <string.h>
 
-#include <rpc/types.h>
-#include <rpc/xdr.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
 #include "un-namespace.h"
 
 static void xdrmem_destroy(XDR *);
diff -urNp libtirpc-1.0.3-orig/src/xdr_rec.c libtirpc-1.0.3-dwok/src/xdr_rec.c
--- libtirpc-1.0.3-orig/src/xdr_rec.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/xdr_rec.c	2018-07-04 21:45:28.613820737 +0200
@@ -54,12 +54,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/svc_auth.h>
-#include <rpc/svc.h>
-#include <rpc/clnt.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
+#include <tirpc/rpc/auth.h>
+#include <tirpc/rpc/svc_auth.h>
+#include <tirpc/rpc/svc.h>
+#include <tirpc/rpc/clnt.h>
 #include <stddef.h>
 #include "rpc_com.h"
 static bool_t	xdrrec_getlong(XDR *, long *);
diff -urNp libtirpc-1.0.3-orig/src/xdr_reference.c libtirpc-1.0.3-dwok/src/xdr_reference.c
--- libtirpc-1.0.3-orig/src/xdr_reference.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/xdr_reference.c	2018-07-04 21:45:34.829706170 +0200
@@ -41,8 +41,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <rpc/types.h>
-#include <rpc/xdr.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 #include <libc_private.h>
diff -urNp libtirpc-1.0.3-orig/src/xdr_sizeof.c libtirpc-1.0.3-dwok/src/xdr_sizeof.c
--- libtirpc-1.0.3-orig/src/xdr_sizeof.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/xdr_sizeof.c	2018-07-04 21:45:42.369567201 +0200
@@ -35,8 +35,8 @@
  */
 
 
-#include <rpc/types.h>
-#include <rpc/xdr.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdint.h>
diff -urNp libtirpc-1.0.3-orig/src/xdr_stdio.c libtirpc-1.0.3-dwok/src/xdr_stdio.c
--- libtirpc-1.0.3-orig/src/xdr_stdio.c	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/src/xdr_stdio.c	2018-07-04 21:45:49.345438627 +0200
@@ -40,8 +40,8 @@
 #include <stdio.h>
 
 #include <arpa/inet.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
 #include "un-namespace.h"
 
 static void xdrstdio_destroy(XDR *);
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/auth_des.h libtirpc-1.0.3-dwok/tirpc/rpc/auth_des.h
--- libtirpc-1.0.3-orig/tirpc/rpc/auth_des.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/auth_des.h	2018-07-04 21:46:02.689192685 +0200
@@ -42,7 +42,7 @@
 #ifndef _TI_AUTH_DES_
 #define _TI_AUTH_DES_
 
-#include <rpc/auth.h>
+#include <tirpc/rpc/auth.h>
 
 /*
  * There are two kinds of "names": fullnames and nicknames
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/auth_gss.h libtirpc-1.0.3-dwok/tirpc/rpc/auth_gss.h
--- libtirpc-1.0.3-orig/tirpc/rpc/auth_gss.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/auth_gss.h	2018-07-04 21:46:07.897096697 +0200
@@ -37,7 +37,7 @@
 #ifndef _TIRPC_AUTH_GSS_H
 #define _TIRPC_AUTH_GSS_H
 
-#include <rpc/clnt.h>
+#include <tirpc/rpc/clnt.h>
 #include <gssapi/gssapi.h>
 
 /* RPCSEC_GSS control procedures. */
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/auth.h libtirpc-1.0.3-dwok/tirpc/rpc/auth.h
--- libtirpc-1.0.3-orig/tirpc/rpc/auth.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/auth.h	2018-07-04 21:45:57.457289116 +0200
@@ -46,8 +46,8 @@
 #ifndef _TIRPC_AUTH_H
 #define  _TIRPC_AUTH_H
 
-#include <rpc/xdr.h>
-#include <rpc/clnt_stat.h>
+#include <tirpc/rpc/xdr.h>
+#include <tirpc/rpc/clnt_stat.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/clnt.h libtirpc-1.0.3-dwok/tirpc/rpc/clnt.h
--- libtirpc-1.0.3-orig/tirpc/rpc/clnt.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/clnt.h	2018-07-04 21:50:46.099969069 +0200
@@ -39,10 +39,10 @@
 #ifndef _TIRPC_CLNT_H_
 #define _TIRPC_CLNT_H_
 
-#include <rpc/clnt_stat.h>
-#include <rpc/auth.h>
+#include <tirpc/rpc/clnt_stat.h>
+#include <tirpc/rpc/auth.h>
 
-#include <netconfig.h>
+#include <tirpc/netconfig.h>
 #include <sys/un.h>
 
 /*
@@ -562,6 +562,6 @@ extern enum clnt_stat rpc_broadcast_exp(
 #endif
 
 /* For backward compatibility */
-#include <rpc/clnt_soc.h>
+#include <tirpc/rpc/clnt_soc.h>
 
 #endif /* !_TIRPC_CLNT_H_ */
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/des_crypt.h libtirpc-1.0.3-dwok/tirpc/rpc/des_crypt.h
--- libtirpc-1.0.3-orig/tirpc/rpc/des_crypt.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/des_crypt.h	2018-07-04 21:46:21.612843898 +0200
@@ -43,7 +43,7 @@
 #ifndef _DES_DES_CRYPT_H
 #define _DES_DES_CRYPT_H
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 
 #define DES_MAXDATA 8192	/* max bytes encrypted in one call */
 #define DES_DIRMASK (1 << 0)
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/key_prot.h libtirpc-1.0.3-dwok/tirpc/rpc/key_prot.h
--- libtirpc-1.0.3-orig/tirpc/rpc/key_prot.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/key_prot.h	2018-07-04 21:46:27.892728152 +0200
@@ -6,7 +6,7 @@
 #ifndef _KEY_PROT_H_RPCGEN
 #define _KEY_PROT_H_RPCGEN
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 
 
 #ifdef __cplusplus
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/nettype.h libtirpc-1.0.3-dwok/tirpc/rpc/nettype.h
--- libtirpc-1.0.3-orig/tirpc/rpc/nettype.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/nettype.h	2018-07-04 21:50:54.327817419 +0200
@@ -41,7 +41,7 @@
 #ifndef	_TIRPC_NETTYPE_H
 #define	_TIRPC_NETTYPE_H
 
-#include <netconfig.h>
+#include <tirpc/netconfig.h>
 
 #define	_RPC_NONE	0
 #define	_RPC_NETPATH	1
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/pmap_clnt.h libtirpc-1.0.3-dwok/tirpc/rpc/pmap_clnt.h
--- libtirpc-1.0.3-orig/tirpc/rpc/pmap_clnt.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/pmap_clnt.h	2018-07-04 21:46:33.976616018 +0200
@@ -64,9 +64,9 @@
 #ifndef _RPC_PMAP_CLNT_H_
 #define _RPC_PMAP_CLNT_H_
 
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/clnt.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
+#include <tirpc/rpc/clnt.h>
 
 #ifdef __cplusplus
 extern "C" {
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/rpcb_clnt.h libtirpc-1.0.3-dwok/tirpc/rpc/rpcb_clnt.h
--- libtirpc-1.0.3-orig/tirpc/rpc/rpcb_clnt.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/rpcb_clnt.h	2018-07-04 21:47:06.148023059 +0200
@@ -57,8 +57,8 @@
 /* #pragma ident	"@(#)rpcb_clnt.h	1.13	94/04/25 SMI" */
 /* rpcb_clnt.h 1.3 88/12/05 SMI */
 
-#include <rpc/types.h>
-#include <rpc/rpcb_prot.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/rpcb_prot.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/rpcb_prot.h libtirpc-1.0.3-dwok/tirpc/rpc/rpcb_prot.h
--- libtirpc-1.0.3-orig/tirpc/rpc/rpcb_prot.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/rpcb_prot.h	2018-07-04 21:47:12.495906059 +0200
@@ -6,7 +6,7 @@
 #ifndef _RPCB_PROT_H_RPCGEN
 #define _RPCB_PROT_H_RPCGEN
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 
 #ifndef IXDR_GET_INT32
 #define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/rpc.h libtirpc-1.0.3-dwok/tirpc/rpc/rpc.h
--- libtirpc-1.0.3-orig/tirpc/rpc/rpc.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/rpc.h	2018-07-04 21:46:50.116318543 +0200
@@ -35,42 +35,42 @@
 #ifndef _TIRPC_RPC_H
 #define _TIRPC_RPC_H
 
-#include <rpc/types.h>		/* some typedefs */
+#include <tirpc/rpc/types.h>		/* some typedefs */
 #include <sys/socket.h>
 #include <netinet/in.h>
 
 /* external data representation interfaces */
-#include <rpc/xdr.h>		/* generic (de)serializer */
+#include <tirpc/rpc/xdr.h>		/* generic (de)serializer */
 
 /* Client side only authentication */
-#include <rpc/auth.h>		/* generic authenticator (client side) */
+#include <tirpc/rpc/auth.h>		/* generic authenticator (client side) */
 
 /* Client side (mostly) remote procedure call */
-#include <rpc/clnt.h>		/* generic rpc stuff */
+#include <tirpc/rpc/clnt.h>		/* generic rpc stuff */
 
 /* semi-private protocol headers */
-#include <rpc/rpc_msg.h>	/* protocol for rpc messages */
-#include <rpc/auth_unix.h>	/* protocol for unix style cred */
+#include <tirpc/rpc/rpc_msg.h>	/* protocol for rpc messages */
+#include <tirpc/rpc/auth_unix.h>	/* protocol for unix style cred */
 
 /*
  *  Uncomment-out the next line if you are building the rpc library with
  *  DES Authentication (see the README file in the secure_rpc/ directory).
  */
-#include <rpc/auth_des.h>	/* protocol for des style cred */
+#include <tirpc/rpc/auth_des.h>	/* protocol for des style cred */
 
 /* Server side only remote procedure callee */
-#include <rpc/svc_auth.h>	/* service side authenticator */
-#include <rpc/svc.h>		/* service manager and multiplexer */
+#include <tirpc/rpc/svc_auth.h>	/* service side authenticator */
+#include <tirpc/rpc/svc.h>		/* service manager and multiplexer */
 
 /* Portmapper client, server, and protocol headers */
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_prot.h>
+#include <tirpc/rpc/pmap_clnt.h>
+#include <tirpc/rpc/pmap_prot.h>
 
 #ifndef _KERNEL
-#include <rpc/rpcb_clnt.h>	/* rpcbind interface functions */
-#include <rpc/svc_mt.h>
+#include <tirpc/rpc/rpcb_clnt.h>	/* rpcbind interface functions */
+#include <tirpc/rpc/svc_mt.h>
 #endif
-#include <rpc/rpcent.h>
+#include <tirpc/rpc/rpcent.h>
 
 #ifndef UDPMSGSIZE
 #define UDPMSGSIZE 8800
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/rpc_msg.h libtirpc-1.0.3-dwok/tirpc/rpc/rpc_msg.h
--- libtirpc-1.0.3-orig/tirpc/rpc/rpc_msg.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/rpc_msg.h	2018-07-04 21:47:00.540126420 +0200
@@ -45,7 +45,7 @@
 #define RPC_MSG_VERSION		((u_int32_t) 2)
 #define RPC_SERVICE_PORT	((u_short) 2048)
 
-#include <rpc/auth.h>
+#include <tirpc/rpc/auth.h>
 
 /*
  * Bottom up definition of an rpc message.
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/rpcsec_gss.h libtirpc-1.0.3-dwok/tirpc/rpc/rpcsec_gss.h
--- libtirpc-1.0.3-orig/tirpc/rpc/rpcsec_gss.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/rpcsec_gss.h	2018-07-04 21:47:18.139802035 +0200
@@ -31,8 +31,8 @@
 
 #include <sys/types.h>
 
-#include <rpc/auth.h>
-#include <rpc/clnt.h>
+#include <tirpc/rpc/auth.h>
+#include <tirpc/rpc/clnt.h>
 
 #include <gssapi/gssapi.h>
 
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/svc_auth_gss.h libtirpc-1.0.3-dwok/tirpc/rpc/svc_auth_gss.h
--- libtirpc-1.0.3-orig/tirpc/rpc/svc_auth_gss.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/svc_auth_gss.h	2018-07-04 21:47:30.279578284 +0200
@@ -29,7 +29,7 @@
 #ifndef _TIRPC_SVC_AUTH_GSS_H
 #define _TIRPC_SVC_AUTH_GSS_H
 
-#include <rpc/svc_auth.h>
+#include <tirpc/rpc/svc_auth.h>
 #include <gssapi/gssapi.h>
 
 /*
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/svc.h libtirpc-1.0.3-dwok/tirpc/rpc/svc.h
--- libtirpc-1.0.3-orig/tirpc/rpc/svc.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/svc.h	2018-07-04 21:47:24.559683709 +0200
@@ -460,7 +460,7 @@ int __rpc_get_local_uid(SVCXPRT *_transp
 
 
 /* for backward compatibility */
-#include <rpc/svc_soc.h>
+#include <tirpc/rpc/svc_soc.h>
 
 
 
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/types.h libtirpc-1.0.3-dwok/tirpc/rpc/types.h
--- libtirpc-1.0.3-orig/tirpc/rpc/types.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/types.h	2018-07-04 21:51:31.539131568 +0200
@@ -90,7 +90,7 @@ typedef __caddr_t caddr_t;
 #include <sys/time.h>
 #include <sys/param.h>
 #include <stdlib.h>
-#include <netconfig.h>
+#include <tirpc/netconfig.h>
 
 /*
  * The netbuf structure is defined here, because FreeBSD / NetBSD only use
diff -urNp libtirpc-1.0.3-orig/tirpc/rpc/xdr.h libtirpc-1.0.3-dwok/tirpc/rpc/xdr.h
--- libtirpc-1.0.3-orig/tirpc/rpc/xdr.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpc/xdr.h	2018-07-04 21:47:35.215487308 +0200
@@ -43,7 +43,7 @@
 #include <stdio.h>
 #include <netinet/in.h>
 
-#include <rpc/types.h>
+#include <tirpc/rpc/types.h>
 
 /*
  * XDR provides a conventional way for converting between C data
diff -urNp libtirpc-1.0.3-orig/tirpc/rpcsvc/crypt.h libtirpc-1.0.3-dwok/tirpc/rpcsvc/crypt.h
--- libtirpc-1.0.3-orig/tirpc/rpcsvc/crypt.h	2018-03-14 14:55:12.000000000 +0100
+++ libtirpc-1.0.3-dwok/tirpc/rpcsvc/crypt.h	2018-07-04 21:47:45.755293047 +0200
@@ -6,7 +6,7 @@
 #ifndef _CRYPT_H_RPCGEN
 #define _CRYPT_H_RPCGEN
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 
 #ifndef IXDR_GET_INT32
 #define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))
diff -urNp libtirpc-1.0.3-orig/tirpc/rpcsvc/nis.h libtirpc-1.0.3-dwok/tirpc/rpcsvc/nis.h
--- libtirpc-1.0.3-orig/tirpc/rpcsvc/nis.h	2018-07-04 21:34:28.389989492 +0200
+++ libtirpc-1.0.3-dwok/tirpc/rpcsvc/nis.h	2018-07-04 21:54:22.099987916 +0200
@@ -33,8 +33,8 @@
 #define _RPCSVC_NIS_H 1
 
 #include <features.h>
-#include <rpc/rpc.h>
-#include <rpcsvc/nis_tags.h>
+#include <tirpc/rpc/rpc.h>
+#include <tirpc/rpcsvc/nis_tags.h>
 
 __BEGIN_DECLS