5 files changed, 9 insertions, 7 deletions
diff --git a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am
index 7811e088..159faf26 100644
--- a/xlators/protocol/client/src/Makefile.am
+++ b/xlators/protocol/client/src/Makefile.am
@@ -6,11 +6,11 @@ client_la_LDFLAGS = -module -avoidversion
 
 client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
 	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
-	$(top_builddir)/xlators/protocol/lib/src/libgfproto1.la
+	$(top_builddir)/rpc/xdr/src/libgfxdr.la
 
 client_la_SOURCES = client.c client-helpers.c client3_1-fops.c client-handshake.c
 noinst_HEADERS = client.h client-mem-types.h
 
 AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \
 	-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)  \
-	-I$(top_srcdir)/xlators/protocol/lib/src -I$(top_srcdir)/rpc/rpc-lib/src/
+	-I$(top_srcdir)/rpc/xdr/src -I$(top_srcdir)/rpc/rpc-lib/src/
diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c
index 353921ac..31690ef1 100644
--- a/xlators/protocol/client/src/client-handshake.c
+++ b/xlators/protocol/client/src/client-handshake.c
@@ -26,10 +26,11 @@
 #include "xlator.h"
 #include "defaults.h"
 #include "glusterfs.h"
-#include "msg-xdr.h"
 #include "statedump.h"
 #include "compat-errno.h"
 
+#include "glusterfs3.h"
+
 extern rpc_clnt_prog_t clnt3_1_fop_prog;
 
 int client_ping_cbk (struct rpc_req *req, struct iovec *iov, int count,
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 97e638df..80a2d4d3 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -27,10 +27,11 @@
 #include "xlator.h"
 #include "defaults.h"
 #include "glusterfs.h"
-#include "msg-xdr.h"
 #include "statedump.h"
 #include "compat-errno.h"
 
+#include "glusterfs3.h"
+
 extern rpc_clnt_prog_t clnt_handshake_prog;
 extern rpc_clnt_prog_t clnt_dump_prog;
 
diff --git a/xlators/protocol/client/src/client.h b/xlators/protocol/client/src/client.h
index 26679cf6..b6aff1fb 100644
--- a/xlators/protocol/client/src/client.h
+++ b/xlators/protocol/client/src/client.h
@@ -28,7 +28,7 @@
 #include "inode.h"
 #include "client-mem-types.h"
 #include "protocol-common.h"
-#include "glusterfs-xdr.h"
+#include "glusterfs3-xdr.h"
 
 struct clnt_options {
         char *remote_subvolume;
diff --git a/xlators/protocol/client/src/client3_1-fops.c b/xlators/protocol/client/src/client3_1-fops.c
index 564b1b12..4c222adb 100644
--- a/xlators/protocol/client/src/client3_1-fops.c
+++ b/xlators/protocol/client/src/client3_1-fops.c
@@ -24,8 +24,8 @@
 #endif
 
 #include "client.h"
-#include "glusterfs-xdr.h"
-#include "msg-xdr.h"
+#include "glusterfs3-xdr.h"
+#include "glusterfs3.h"
 #include "compat-errno.h"
 
 int32_t client3_getspec (call_frame_t *frame, xlator_t *this, void *data);