3 files changed, 9 insertions, 7 deletions
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
index ee6a675edba..084cad5d97c 100644
--- a/cli/src/Makefile.am
+++ b/cli/src/Makefile.am
@@ -5,7 +5,7 @@ gluster_SOURCES = cli.c registry.c input.c cli-cmd.c cli-rl.c \
 	 cli-cmd-misc.c
 
 gluster_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GF_LDADD)\
-		$(RLLIBS) $(top_builddir)/xlators/protocol/lib/src/libgfproto1.la\
+		$(RLLIBS) $(top_builddir)/rpc/xdr/src/libgfxdr.la
 		$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la
 
 gluster_LDFLAGS = $(GF_LDFLAGS) $(GF_GLUSTERFS_LDFLAGS)
@@ -13,7 +13,7 @@ noinst_HEADERS = cli.h cli-mem-types.h cli-cmd.h
 
 AM_CFLAGS = -fPIC -Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\
 	-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src\
-	-I$(top_srcdir)/xlators/protocol/lib/src\
+	-I$(top_srcdir)/rpc/xdr/src\
 	-DDATADIR=\"$(localstatedir)\" \
 	-DCONFDIR=\"$(sysconfdir)/glusterfs\" $(GF_GLUSTERFS_CFLAGS)
 
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
index 68c6a29c865..cffa22a7e70 100644
--- a/cli/src/cli-cmd-parser.c
+++ b/cli/src/cli-cmd-parser.c
@@ -31,9 +31,10 @@
 #include "cli.h"
 #include "cli-cmd.h"
 #include "cli-mem-types.h"
-#include "protocol-common.h"
 #include "dict.h"
-#include "gluster1.h"
+
+#include "protocol-common.h"
+#include "cli1-xdr.h"
 
 int32_t
 cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options)
diff --git a/cli/src/cli3_1-cops.c b/cli/src/cli3_1-cops.c
index 4016fee80cb..95d0a703902 100644
--- a/cli/src/cli3_1-cops.c
+++ b/cli/src/cli3_1-cops.c
@@ -24,13 +24,14 @@
 #endif
 
 #include "cli.h"
-#include "gluster1.h"
-#include "cli-xdr.h"
 #include "compat-errno.h"
-#include "protocol-common.h"
 #include "cli-cmd.h"
 #include <sys/uio.h>
 
+#include "cli1-xdr.h"
+#include "cli1.h"
+#include "protocol-common.h"
+
 extern rpc_clnt_prog_t *cli_rpc_prog;
 
 int