diff -urNp ogdi-3.2.0-orig/include/Linux/ogdi_macro.h ogdi-3.2.0-dwok/include/Linux/ogdi_macro.h
--- ogdi-3.2.0-orig/include/Linux/ogdi_macro.h	2018-01-20 01:40:01.126398445 +0100
+++ ogdi-3.2.0-dwok/include/Linux/ogdi_macro.h	2018-01-20 01:42:25.456238149 +0100
@@ -1,6 +1,6 @@
 #include <signal.h>
 #include <wait.h>
-#include <rpc/xdr.h>
+#include <tirpc/rpc/xdr.h>
 #include <stdio.h>
 
 #define ogdi_IXDR_PUT_LONG(buf, v) { \
diff -urNp ogdi-3.2.0-orig/ogdi/c-api/ecs_xdrz.c ogdi-3.2.0-dwok/ogdi/c-api/ecs_xdrz.c
--- ogdi-3.2.0-orig/ogdi/c-api/ecs_xdrz.c	2018-01-20 01:40:01.174399056 +0100
+++ ogdi-3.2.0-dwok/ogdi/c-api/ecs_xdrz.c	2018-01-20 01:42:50.252554216 +0100
@@ -27,8 +27,8 @@
  *
  */
 
-#include <rpc/types.h>
-#include <rpc/xdr.h>
+#include <tirpc/rpc/types.h>
+#include <tirpc/rpc/xdr.h>
 
 #include "ecs.h"
 #include "zlib.h"
diff -urNp ogdi-3.2.0-orig/ogdi/driver/network/remote.c ogdi-3.2.0-dwok/ogdi/driver/network/remote.c
--- ogdi-3.2.0-orig/ogdi/driver/network/remote.c	2018-01-20 01:40:50.123022982 +0100
+++ ogdi-3.2.0-dwok/ogdi/driver/network/remote.c	2018-01-20 01:40:14.118564049 +0100
@@ -1,7 +1,7 @@
 #include "ecs.h"
 
 #ifdef _SCO
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #include <sys/fs/nfs/time.h>
 #endif
 
diff -urNp ogdi-3.2.0-orig/ogdi/gltpd/asyncsvr.c ogdi-3.2.0-dwok/ogdi/gltpd/asyncsvr.c
--- ogdi-3.2.0-orig/ogdi/gltpd/asyncsvr.c	2018-01-20 01:40:01.166398954 +0100
+++ ogdi-3.2.0-dwok/ogdi/gltpd/asyncsvr.c	2018-01-20 01:43:06.792765046 +0100
@@ -71,7 +71,7 @@ ECS_CVSID("$Id: asyncsvr.c,v 1.7 2016/06
 #endif
 
 #ifdef HAVE_STD_RPC_INCLUDES
-#  include <rpc/pmap_clnt.h>
+#  include <tirpc/rpc/pmap_clnt.h>
 #endif
 
 #ifdef svc_fdset
diff -urNp ogdi-3.2.0-orig/ogdi/gltpd/ecs_svc.c ogdi-3.2.0-dwok/ogdi/gltpd/ecs_svc.c
--- ogdi-3.2.0-orig/ogdi/gltpd/ecs_svc.c	2018-01-20 01:40:01.166398954 +0100
+++ ogdi-3.2.0-dwok/ogdi/gltpd/ecs_svc.c	2018-01-20 01:43:16.172884610 +0100
@@ -7,7 +7,7 @@
 #ifndef _WINDOWS
 #include <stdio.h>
 #include <stdlib.h>/* getenv, exit */
-#include <rpc/pmap_clnt.h> /* for pmap_unset */
+#include <tirpc/rpc/pmap_clnt.h> /* for pmap_unset */
 #include <string.h> /* strcmp */ 
 #include <signal.h>
 #include <sys/ioctl.h> /* ioctl, TIOCNOTTY */
diff -urNp ogdi-3.2.0-orig/ogdi/include/ecs.h ogdi-3.2.0-dwok/ogdi/include/ecs.h
--- ogdi-3.2.0-orig/ogdi/include/ecs.h	2018-01-20 01:40:50.127023033 +0100
+++ ogdi-3.2.0-dwok/ogdi/include/ecs.h	2018-01-20 01:40:14.086563642 +0100
@@ -6,7 +6,7 @@
 #ifndef _ECSH_H_RPCGEN
 #define	_ECSH_H_RPCGEN
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 
 #ifdef __cplusplus
 extern "C" {
diff -urNp ogdi-3.2.0-orig/ogdi/include/ecs_util.h ogdi-3.2.0-dwok/ogdi/include/ecs_util.h
--- ogdi-3.2.0-orig/ogdi/include/ecs_util.h	2018-01-20 01:40:50.127023033 +0100
+++ ogdi-3.2.0-dwok/ogdi/include/ecs_util.h	2018-01-20 01:40:14.086563642 +0100
@@ -114,7 +114,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #include <math.h>
 #include <memory.h>
 #include <ctype.h>
diff -urNp ogdi-3.2.0-orig/ogdi/include/sun/ecs.h ogdi-3.2.0-dwok/ogdi/include/sun/ecs.h
--- ogdi-3.2.0-orig/ogdi/include/sun/ecs.h	2018-01-20 01:40:50.127023033 +0100
+++ ogdi-3.2.0-dwok/ogdi/include/sun/ecs.h	2018-01-20 01:40:14.086563642 +0100
@@ -6,7 +6,7 @@
 #ifndef _ECS_H_RPCGEN
 #define	_ECS_H_RPCGEN
 
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 /* 
  * fichier genere par RPCGEN a partir de ecs.x
  *
diff -urNp ogdi-3.2.0-orig/ogdi/include/sun/ecs_util.h ogdi-3.2.0-dwok/ogdi/include/sun/ecs_util.h
--- ogdi-3.2.0-orig/ogdi/include/sun/ecs_util.h	2018-01-20 01:40:50.131023084 +0100
+++ ogdi-3.2.0-dwok/ogdi/include/sun/ecs_util.h	2018-01-20 01:40:14.086563642 +0100
@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <rpc/rpc.h>
+#include <tirpc/rpc/rpc.h>
 #include <math.h>
 #include <memory.h>
 #include <ctype.h>