--- rtime_clnt.c	2003-02-11 01:23:30.000000000 +0000
+++ ../rtime_clnt.c	2003-02-11 00:50:38.000000000 +0000
@@ -2,8 +2,8 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <assert.h>
-#include "lwp.h"
-#include "rpc2.h"
+#include <lwp/lwp.h>
+#include <rpc2/rpc2.h>
 #include "rtime.h"
 
 
@@ -56,7 +56,7 @@
   if (LWP_Init(LWP_VERSION, LWP_NORMAL_PRIORITY, &mylpid) != LWP_SUCCESS)
       error_report("Can't Initialize LWP");   /* Initialize LWP package */
  
-  rc = RPC2_Init(RPC2_VERSION, NULL, NULL, 0, -1, NULL) ;         
+  rc = RPC2_Init(RPC2_VERSION, NULL, 0, -1, NULL);         
   if (rc != RPC2_SUCCESS)
       error_report("%s\nCan't Initialize RPC2", RPC2_ErrorMsg(rc));  
   /* Initialize RPC2 package */
@@ -67,7 +67,7 @@
 char *machine_name;
 {
   RPC2_HostIdent hid;
-  RPC2_PortalIdent pid;
+  RPC2_PortIdent pid;
   RPC2_SubsysIdent sid;
   RPC2_Handle cid;
   char msg[100];
@@ -80,7 +80,7 @@
       error_report(msg);
   } ;       
   strcpy(hid.Value.Name, machine_name);
-  pid.Tag = RPC2_PORTALBYINETNUMBER;
+  pid.Tag = RPC2_PORTBYINETNUMBER;
   pid.Value.InetPortNumber = htons(RTIMEPORTAL);
   sid.Tag = RPC2_SUBSYSBYID;
   sid.Value.SubsysId = RTIMESUBSYSID;
@@ -90,7 +90,7 @@
   bp.SideEffectType = NULL;
   bp.ClientIdent = NULL;
   bp.SharedSecret = NULL;
-  rc = RPC2_NewBinding(&hid, &pid, &sid, &bp, &Gcid);
+  rc = RPC2_NewBinding(&hid, &pid, &sid, &bp, &cid);
   if (rc != RPC2_SUCCESS) {
       sprintf(msg, "%s\nCan't connect to machine %s", RPC2_ErrorMsg(rc),
               machine_name);