12 files changed, 36 insertions, 36 deletions
diff --git a/xlators/protocol/client/src/client-callback.c b/xlators/protocol/client/src/client-callback.c
index 352a1130e14..c401c4fd791 100644
--- a/xlators/protocol/client/src/client-callback.c
+++ b/xlators/protocol/client/src/client-callback.c
@@ -10,7 +10,7 @@
 
 #include "client.h"
 #include "rpc-clnt.h"
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "client-messages.h"
 
 int
diff --git a/xlators/protocol/client/src/client-common.c b/xlators/protocol/client/src/client-common.c
index 31615516fcf..7708c820918 100644
--- a/xlators/protocol/client/src/client-common.c
+++ b/xlators/protocol/client/src/client-common.c
@@ -8,8 +8,8 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "dict.h"
-#include "xlator.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
 #include "rpc-common-xdr.h"
 #include "glusterfs3-xdr.h"
 #include "glusterfs4-xdr.h"
diff --git a/xlators/protocol/client/src/client-common.h b/xlators/protocol/client/src/client-common.h
index 21d416d9f27..5214eae128e 100644
--- a/xlators/protocol/client/src/client-common.h
+++ b/xlators/protocol/client/src/client-common.h
@@ -11,8 +11,8 @@
 #ifndef __CLIENT_COMMON_H__
 #define __CLIENT_COMMON_H__
 
-#include "dict.h"
-#include "xlator.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
 #include "rpc-common-xdr.h"
 #include "glusterfs3-xdr.h"
 #include "glusterfs4-xdr.h"
diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c
index ed9d0a5d9d8..f9631c58e69 100644
--- a/xlators/protocol/client/src/client-handshake.c
+++ b/xlators/protocol/client/src/client-handshake.c
@@ -8,13 +8,13 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "fd-lk.h"
+#include <glusterfs/fd-lk.h>
 #include "client.h"
-#include "xlator.h"
-#include "defaults.h"
-#include "glusterfs.h"
-#include "statedump.h"
-#include "compat-errno.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/defaults.h>
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/statedump.h>
+#include <glusterfs/compat-errno.h>
 
 #include "glusterfs3.h"
 #include "portmap-xdr.h"
diff --git a/xlators/protocol/client/src/client-helpers.c b/xlators/protocol/client/src/client-helpers.c
index c70159fbce1..849fdfca0bc 100644
--- a/xlators/protocol/client/src/client-helpers.c
+++ b/xlators/protocol/client/src/client-helpers.c
@@ -9,11 +9,11 @@
 */
 
 #include "client.h"
-#include "fd.h"
+#include <glusterfs/fd.h>
 #include "client-messages.h"
 #include "client-common.h"
-#include "compat-errno.h"
-#include "common-utils.h"
+#include <glusterfs/compat-errno.h>
+#include <glusterfs/common-utils.h>
 
 int
 client_fd_lk_list_empty(fd_lk_ctx_t *lk_ctx, gf_boolean_t try_lock)
diff --git a/xlators/protocol/client/src/client-lk.c b/xlators/protocol/client/src/client-lk.c
index 48f32116de9..01613b7ab66 100644
--- a/xlators/protocol/client/src/client-lk.c
+++ b/xlators/protocol/client/src/client-lk.c
@@ -8,10 +8,10 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "common-utils.h"
-#include "xlator.h"
+#include <glusterfs/common-utils.h>
+#include <glusterfs/xlator.h>
 #include "client.h"
-#include "lkowner.h"
+#include <glusterfs/lkowner.h>
 #include "client-messages.h"
 
 static void
diff --git a/xlators/protocol/client/src/client-mem-types.h b/xlators/protocol/client/src/client-mem-types.h
index 715f981c31e..f61fa0c1828 100644
--- a/xlators/protocol/client/src/client-mem-types.h
+++ b/xlators/protocol/client/src/client-mem-types.h
@@ -11,7 +11,7 @@
 #ifndef __CLIENT_MEM_TYPES_H__
 #define __CLIENT_MEM_TYPES_H__
 
-#include "mem-types.h"
+#include <glusterfs/mem-types.h>
 
 enum gf_client_mem_types_ {
     gf_client_mt_clnt_conf_t = gf_common_mt_end + 1,
diff --git a/xlators/protocol/client/src/client-messages.h b/xlators/protocol/client/src/client-messages.h
index 879d53741d1..5c0ca5946c1 100644
--- a/xlators/protocol/client/src/client-messages.h
+++ b/xlators/protocol/client/src/client-messages.h
@@ -11,7 +11,7 @@
 #ifndef _PC_MESSAGES_H__
 #define _PC_MESSAGES_H__
 
-#include "glfs-message-id.h"
+#include <glusterfs/glfs-message-id.h>
 
 /* To add new message IDs, append new identifiers at the end of the list.
  *
diff --git a/xlators/protocol/client/src/client-rpc-fops.c b/xlators/protocol/client/src/client-rpc-fops.c
index 9e5a5b44c69..b7df7cc13e3 100644
--- a/xlators/protocol/client/src/client-rpc-fops.c
+++ b/xlators/protocol/client/src/client-rpc-fops.c
@@ -12,11 +12,11 @@
 #include "rpc-common-xdr.h"
 #include "glusterfs3-xdr.h"
 #include "glusterfs3.h"
-#include "compat-errno.h"
+#include <glusterfs/compat-errno.h>
 #include "client-messages.h"
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "client-common.h"
-#include "compound-fop-utils.h"
+#include <glusterfs/compound-fop-utils.h>
 
 int32_t
 client3_getspec(call_frame_t *frame, xlator_t *this, void *data);
diff --git a/xlators/protocol/client/src/client-rpc-fops_v2.c b/xlators/protocol/client/src/client-rpc-fops_v2.c
index 55a9fd04a6a..ca180c1db4b 100644
--- a/xlators/protocol/client/src/client-rpc-fops_v2.c
+++ b/xlators/protocol/client/src/client-rpc-fops_v2.c
@@ -12,11 +12,11 @@
 #include "rpc-common-xdr.h"
 #include "glusterfs4-xdr.h"
 #include "glusterfs3.h"
-#include "compat-errno.h"
+#include <glusterfs/compat-errno.h>
 #include "client-messages.h"
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "client-common.h"
-#include "compound-fop-utils.h"
+#include <glusterfs/compound-fop-utils.h>
 
 extern int32_t
 client3_getspec(call_frame_t *frame, xlator_t *this, void *data);
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 37c2d9891b6..44fd4d5409f 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -9,12 +9,12 @@
 */
 
 #include "client.h"
-#include "xlator.h"
-#include "defaults.h"
-#include "glusterfs.h"
-#include "statedump.h"
-#include "compat-errno.h"
-#include "gf-event.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/defaults.h>
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/statedump.h>
+#include <glusterfs/compat-errno.h>
+#include <glusterfs/gf-event.h>
 
 #include "xdr-rpc.h"
 #include "glusterfs3.h"
diff --git a/xlators/protocol/client/src/client.h b/xlators/protocol/client/src/client.h
index c63e3a290d6..5fc75a84628 100644
--- a/xlators/protocol/client/src/client.h
+++ b/xlators/protocol/client/src/client.h
@@ -15,15 +15,15 @@
 #include <stdint.h>
 
 #include "rpc-clnt.h"
-#include "list.h"
-#include "inode.h"
+#include <glusterfs/list.h>
+#include <glusterfs/inode.h>
 #include "client-mem-types.h"
 #include "protocol-common.h"
 #include "glusterfs3.h"
 #include "glusterfs3-xdr.h"
-#include "fd-lk.h"
-#include "defaults.h"
-#include "default-args.h"
+#include <glusterfs/fd-lk.h>
+#include <glusterfs/defaults.h>
+#include <glusterfs/default-args.h>
 #include "client-messages.h"
 
 /* FIXME: Needs to be defined in a common file */