libglusterfs: Move devel headers under glusterfs directory

libglusterfs devel package headers are referenced in code using
include semantics for a program, this while it works can be better
especially when dealing with out of tree xlator builds or in
general out of tree devel package usage.

Towards this, the following changes are done,
- moved all devel headers under a glusterfs directory
- Included these headers using system header notation <> in all
code outside of libglusterfs
- Included these headers using own program notation "" within
libglusterfs

This change although big, is just moving around the headers and
making it correct when including these headers from other sources.

This helps us correctly include libglusterfs includes without
namespace conflicts.

Change-Id: Id2a98854e671a7ee5d73be44da5ba1a74252423b
Updates: bz#1193929
Signed-off-by: ShyamsundarR <srangana@redhat.com>

33 files changed, 106 insertions, 106 deletions

diff --git a/xlators/nfs/server/src/acl3.c b/xlators/nfs/server/src/acl3.c
index ff4bcfd8f4b..0eca45d8a3e 100644
--- a/xlators/nfs/server/src/acl3.c
+++ b/xlators/nfs/server/src/acl3.c
@@ -8,13 +8,13 @@
  * cases as published by the Free Software Foundation.
  */
 
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "rpcsvc.h"
-#include "dict.h"
-#include "xlator.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
 #include "nfs.h"
-#include "mem-pool.h"
-#include "logging.h"
+#include <glusterfs/mem-pool.h>
+#include <glusterfs/logging.h>
 #include "nfs-fops.h"
 #include "nfs3.h"
 #include "nfs-mem-types.h"
@@ -22,8 +22,8 @@
 #include "nfs3-fh.h"
 #include "nfs-generics.h"
 #include "acl3.h"
-#include "byte-order.h"
-#include "compat-errno.h"
+#include <glusterfs/byte-order.h>
+#include <glusterfs/compat-errno.h>
 #include "nfs-messages.h"
 
 static int
diff --git a/xlators/nfs/server/src/acl3.h b/xlators/nfs/server/src/acl3.h
index 500d2ef6ae5..dead04b4273 100644
--- a/xlators/nfs/server/src/acl3.h
+++ b/xlators/nfs/server/src/acl3.h
@@ -11,7 +11,7 @@
 #ifndef _ACL3_H
 #define _ACL3_H
 
-#include "glusterfs-acl.h"
+#include <glusterfs/glusterfs-acl.h>
 
 #define ACL3_NULL 0
 #define ACL3_GETACL 1
diff --git a/xlators/nfs/server/src/auth-cache.c b/xlators/nfs/server/src/auth-cache.c
index 248a90b0587..f8e5061dc54 100644
--- a/xlators/nfs/server/src/auth-cache.c
+++ b/xlators/nfs/server/src/auth-cache.c
@@ -11,7 +11,7 @@
    cases as published by the Free Software Foundation.
 */
 
-#include "refcount.h"
+#include <glusterfs/refcount.h>
 #include "auth-cache.h"
 #include "nfs3.h"
 #include "exports.h"
diff --git a/xlators/nfs/server/src/auth-cache.h b/xlators/nfs/server/src/auth-cache.h
index d48c6f64e43..4c9d09207f8 100644
--- a/xlators/nfs/server/src/auth-cache.h
+++ b/xlators/nfs/server/src/auth-cache.h
@@ -17,7 +17,7 @@
 
 #include "nfs-mem-types.h"
 #include "exports.h"
-#include "dict.h"
+#include <glusterfs/dict.h>
 #include "nfs3.h"
 
 struct auth_cache {
diff --git a/xlators/nfs/server/src/exports.c b/xlators/nfs/server/src/exports.c
index 342ad503a6a..26d3d926cdc 100644
--- a/xlators/nfs/server/src/exports.c
+++ b/xlators/nfs/server/src/exports.c
@@ -13,8 +13,8 @@
 */
 
 #include "exports.h"
-#include "hashfn.h"
-#include "parse-utils.h"
+#include <glusterfs/hashfn.h>
+#include <glusterfs/parse-utils.h>
 #include "nfs-messages.h"
 
 static void
diff --git a/xlators/nfs/server/src/exports.h b/xlators/nfs/server/src/exports.h
index d44e32e3f74..ad35ad8c3a0 100644
--- a/xlators/nfs/server/src/exports.h
+++ b/xlators/nfs/server/src/exports.h
@@ -16,7 +16,7 @@
 #define _EXPORTS_H_
 
 #include "nfs-mem-types.h"
-#include "dict.h"
+#include <glusterfs/dict.h>
 #include "nfs.h"
 
 #define GF_EXP GF_NFS "-exports"
diff --git a/xlators/nfs/server/src/mount3-auth.c b/xlators/nfs/server/src/mount3-auth.c
index 37839c230e8..10e57c84cdb 100644
--- a/xlators/nfs/server/src/mount3-auth.c
+++ b/xlators/nfs/server/src/mount3-auth.c
@@ -38,7 +38,7 @@
 #include "mount3-auth.h"
 #include "exports.h"
 #include "netgroups.h"
-#include "mem-pool.h"
+#include <glusterfs/mem-pool.h>
 #include "nfs-messages.h"
 
 /**
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c
index 3d5be6a6a6b..726dc293af6 100644
--- a/xlators/nfs/server/src/mount3.c
+++ b/xlators/nfs/server/src/mount3.c
@@ -9,27 +9,27 @@
 */
 
 #include "rpcsvc.h"
-#include "dict.h"
-#include "xlator.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
 #include "mount3.h"
 #include "xdr-nfs3.h"
 #include "msg-nfs3.h"
-#include "iobuf.h"
+#include <glusterfs/iobuf.h>
 #include "nfs-common.h"
 #include "nfs3-fh.h"
 #include "nfs-fops.h"
 #include "nfs-inodes.h"
 #include "nfs-generics.h"
-#include "locking.h"
-#include "iatt.h"
+#include <glusterfs/locking.h>
+#include <glusterfs/iatt.h>
 #include "nfs-mem-types.h"
 #include "nfs.h"
-#include "common-utils.h"
-#include "store.h"
+#include <glusterfs/common-utils.h>
+#include <glusterfs/store.h>
 #include "glfs-internal.h"
 #include "glfs.h"
 #include "mount3-auth.h"
-#include "hashfn.h"
+#include <glusterfs/hashfn.h>
 #include "nfs-messages.h"
 
 #include <errno.h>
diff --git a/xlators/nfs/server/src/mount3.h b/xlators/nfs/server/src/mount3.h
index 9b0f73e3af7..b185df835ae 100644
--- a/xlators/nfs/server/src/mount3.h
+++ b/xlators/nfs/server/src/mount3.h
@@ -12,15 +12,15 @@
 #define _MOUNT3_H_
 
 #include "rpcsvc.h"
-#include "dict.h"
-#include "xlator.h"
-#include "iobuf.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
+#include <glusterfs/iobuf.h>
 #include "nfs.h"
-#include "list.h"
+#include <glusterfs/list.h>
 #include "xdr-nfs3.h"
-#include "locking.h"
+#include <glusterfs/locking.h>
 #include "nfs3-fh.h"
-#include "compat-uuid.h"
+#include <glusterfs/compat-uuid.h>
 #include "exports.h"
 #include "mount3-auth.h"
 #include "auth-cache.h"
diff --git a/xlators/nfs/server/src/mount3udp_svc.c b/xlators/nfs/server/src/mount3udp_svc.c
index d542e2951c3..d5e41691f3d 100644
--- a/xlators/nfs/server/src/mount3udp_svc.c
+++ b/xlators/nfs/server/src/mount3udp_svc.c
@@ -9,8 +9,8 @@
 */
 
 #include "xdr-nfs3.h"
-#include "logging.h"
-#include "mem-pool.h"
+#include <glusterfs/logging.h>
+#include <glusterfs/mem-pool.h>
 #include "nfs-mem-types.h"
 #include "nfs-messages.h"
 #include "mount3.h"
diff --git a/xlators/nfs/server/src/netgroups.c b/xlators/nfs/server/src/netgroups.c
index 092d4707205..f68a7f14a26 100644
--- a/xlators/nfs/server/src/netgroups.c
+++ b/xlators/nfs/server/src/netgroups.c
@@ -13,7 +13,7 @@
 */
 
 #include "netgroups.h"
-#include "parse-utils.h"
+#include <glusterfs/parse-utils.h>
 #include "nfs-messages.h"
 
 static void
diff --git a/xlators/nfs/server/src/netgroups.h b/xlators/nfs/server/src/netgroups.h
index 1bb666b9596..9c715f75d3c 100644
--- a/xlators/nfs/server/src/netgroups.h
+++ b/xlators/nfs/server/src/netgroups.h
@@ -16,7 +16,7 @@
 #define _NETGROUPS_H
 
 #include "nfs-mem-types.h"
-#include "dict.h"
+#include <glusterfs/dict.h>
 #include "nfs.h"
 
 #define GF_NG GF_NFS "-netgroup"
diff --git a/xlators/nfs/server/src/nfs-common.c b/xlators/nfs/server/src/nfs-common.c
index 2e8d401ba52..43bb3f3f78c 100644
--- a/xlators/nfs/server/src/nfs-common.c
+++ b/xlators/nfs/server/src/nfs-common.c
@@ -9,16 +9,16 @@
 */
 
 #include "rpcsvc.h"
-#include "dict.h"
-#include "xlator.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
 #include "xdr-nfs3.h"
 #include "msg-nfs3.h"
-#include "iobuf.h"
+#include <glusterfs/iobuf.h>
 #include "nfs-common.h"
 #include "nfs-fops.h"
 #include "nfs-mem-types.h"
 #include "rpcsvc.h"
-#include "iatt.h"
+#include <glusterfs/iatt.h>
 #include "nfs-messages.h"
 
 #include <libgen.h>
diff --git a/xlators/nfs/server/src/nfs-common.h b/xlators/nfs/server/src/nfs-common.h
index 46147757ef5..bd80d8b3be5 100644
--- a/xlators/nfs/server/src/nfs-common.h
+++ b/xlators/nfs/server/src/nfs-common.h
@@ -13,10 +13,10 @@
 
 #include <unistd.h>
 
-#include "xlator.h"
+#include <glusterfs/xlator.h>
 #include "rpcsvc.h"
-#include "iatt.h"
-#include "compat-uuid.h"
+#include <glusterfs/iatt.h>
+#include <glusterfs/compat-uuid.h>
 
 // NFS_PATH_MAX hard-coded to 4096 as a work around for bug 2476.
 // nfs server crashes when path received is longer than PATH_MAX
diff --git a/xlators/nfs/server/src/nfs-fops.c b/xlators/nfs/server/src/nfs-fops.c
index e78cef7f0b4..896c67c9305 100644
--- a/xlators/nfs/server/src/nfs-fops.c
+++ b/xlators/nfs/server/src/nfs-fops.c
@@ -10,10 +10,10 @@
 
 #include <pwd.h>
 
-#include "dict.h"
-#include "xlator.h"
-#include "iobuf.h"
-#include "call-stub.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
+#include <glusterfs/iobuf.h>
+#include <glusterfs/call-stub.h>
 #include "nfs.h"
 #include "nfs-fops.h"
 #include "nfs-common.h"
diff --git a/xlators/nfs/server/src/nfs-fops.h b/xlators/nfs/server/src/nfs-fops.h
index 1f7c3b2d1f9..005cb788a45 100644
--- a/xlators/nfs/server/src/nfs-fops.h
+++ b/xlators/nfs/server/src/nfs-fops.h
@@ -11,10 +11,10 @@
 #ifndef _NFS_FOPS_H_
 #define _NFS_FOPS_H_
 
-#include "dict.h"
-#include "xlator.h"
-#include "iobuf.h"
-#include "call-stub.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
+#include <glusterfs/iobuf.h>
+#include <glusterfs/call-stub.h>
 #include "nfs.h"
 #include "nfs-common.h"
 #include "nfs-messages.h"
diff --git a/xlators/nfs/server/src/nfs-generics.c b/xlators/nfs/server/src/nfs-generics.c
index feadb4cfb3f..009991877cb 100644
--- a/xlators/nfs/server/src/nfs-generics.c
+++ b/xlators/nfs/server/src/nfs-generics.c
@@ -14,7 +14,7 @@
 #include "nfs-fops.h"
 #include "nfs-inodes.h"
 #include "nfs-generics.h"
-#include "xlator.h"
+#include <glusterfs/xlator.h>
 
 int
 nfs_fstat(xlator_t *nfsx, xlator_t *xl, nfs_user_t *nfu, fd_t *fd,
diff --git a/xlators/nfs/server/src/nfs-generics.h b/xlators/nfs/server/src/nfs-generics.h
index f71b45a513d..07a79994a4b 100644
--- a/xlators/nfs/server/src/nfs-generics.h
+++ b/xlators/nfs/server/src/nfs-generics.h
@@ -12,7 +12,7 @@
 #define _NFS_GENERICS_H_
 
 #include "nfs.h"
-#include "xlator.h"
+#include <glusterfs/xlator.h>
 #include "nfs-fops.h"
 #include "nfs-inodes.h"
 
diff --git a/xlators/nfs/server/src/nfs-inodes.c b/xlators/nfs/server/src/nfs-inodes.c
index 9999e884ffa..6f34ca705ba 100644
--- a/xlators/nfs/server/src/nfs-inodes.c
+++ b/xlators/nfs/server/src/nfs-inodes.c
@@ -13,7 +13,7 @@
 #include "nfs.h"
 #include "nfs-inodes.h"
 #include "nfs-fops.h"
-#include "xlator.h"
+#include <glusterfs/xlator.h>
 #include "nfs-messages.h"
 
 #include <libgen.h>
diff --git a/xlators/nfs/server/src/nfs-inodes.h b/xlators/nfs/server/src/nfs-inodes.h
index 7a874c8a4ce..e8efd1e127c 100644
--- a/xlators/nfs/server/src/nfs-inodes.h
+++ b/xlators/nfs/server/src/nfs-inodes.h
@@ -11,10 +11,10 @@
 #ifndef _NFS_INODES_H_
 #define _NFS_INODES_H_
 
-#include "dict.h"
-#include "xlator.h"
-#include "iobuf.h"
-#include "call-stub.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
+#include <glusterfs/iobuf.h>
+#include <glusterfs/call-stub.h>
 #include "nfs-fops.h"
 
 extern int
diff --git a/xlators/nfs/server/src/nfs-mem-types.h b/xlators/nfs/server/src/nfs-mem-types.h
index ea1d9323088..0a3c887eff1 100644
--- a/xlators/nfs/server/src/nfs-mem-types.h
+++ b/xlators/nfs/server/src/nfs-mem-types.h
@@ -11,7 +11,7 @@
 #ifndef __NFS_MEM_TYPES_H__
 #define __NFS_MEM_TYPES_H__
 
-#include "mem-types.h"
+#include <glusterfs/mem-types.h>
 
 enum gf_nfs_mem_types_ {
     gf_nfs_mt_mountentry = gf_common_mt_end + 1,
diff --git a/xlators/nfs/server/src/nfs-messages.h b/xlators/nfs/server/src/nfs-messages.h
index b8fe99e45d3..04e15cbe78c 100644
--- a/xlators/nfs/server/src/nfs-messages.h
+++ b/xlators/nfs/server/src/nfs-messages.h
@@ -10,7 +10,7 @@
 #ifndef _NFS_MESSAGES_H_
 #define _NFS_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/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c
index 6f55ed2f0e5..ceb4943bc93 100644
--- a/xlators/nfs/server/src/nfs.c
+++ b/xlators/nfs/server/src/nfs.c
@@ -12,23 +12,23 @@
  * Every other protocol version gets initialized from here.
  */
 
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "rpcsvc.h"
-#include "dict.h"
-#include "xlator.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
 #include "nfs.h"
-#include "mem-pool.h"
-#include "logging.h"
+#include <glusterfs/mem-pool.h>
+#include <glusterfs/logging.h>
 #include "nfs-fops.h"
 #include "mount3.h"
 #include "nfs3.h"
 #include "nfs-mem-types.h"
 #include "nfs3-helpers.h"
 #include "nlm4.h"
-#include "options.h"
+#include <glusterfs/options.h>
 #include "acl3.h"
 #include "rpc-drc.h"
-#include "syscall.h"
+#include <glusterfs/syscall.h>
 #include "rpcsvc.h"
 #include "nfs-messages.h"
 
diff --git a/xlators/nfs/server/src/nfs.h b/xlators/nfs/server/src/nfs.h
index 531a269071c..e3daaed17a6 100644
--- a/xlators/nfs/server/src/nfs.h
+++ b/xlators/nfs/server/src/nfs.h
@@ -12,10 +12,10 @@
 #define __NFS_H__
 
 #include "rpcsvc.h"
-#include "dict.h"
-#include "xlator.h"
-#include "lkowner.h"
-#include "gidcache.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
+#include <glusterfs/lkowner.h>
+#include <glusterfs/gidcache.h>
 
 #define GF_NFS "nfs"
 
diff --git a/xlators/nfs/server/src/nfs3-fh.c b/xlators/nfs/server/src/nfs3-fh.c
index c63f9328f57..d0c0a2f55b2 100644
--- a/xlators/nfs/server/src/nfs3-fh.c
+++ b/xlators/nfs/server/src/nfs3-fh.c
@@ -9,15 +9,15 @@
 */
 
 #include "rpcsvc.h"
-#include "dict.h"
-#include "xlator.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
 #include "xdr-nfs3.h"
 #include "msg-nfs3.h"
-#include "iobuf.h"
+#include <glusterfs/iobuf.h>
 #include "nfs3-fh.h"
 #include "nfs-common.h"
-#include "iatt.h"
-#include "common-utils.h"
+#include <glusterfs/iatt.h>
+#include <glusterfs/common-utils.h>
 #include "nfs-messages.h"
 
 int
diff --git a/xlators/nfs/server/src/nfs3-fh.h b/xlators/nfs/server/src/nfs3-fh.h
index 442f6feeb25..cd7916b892d 100644
--- a/xlators/nfs/server/src/nfs3-fh.h
+++ b/xlators/nfs/server/src/nfs3-fh.h
@@ -11,11 +11,11 @@
 #ifndef _NFS_FH_H_
 #define _NFS_FH_H_
 
-#include "xlator.h"
+#include <glusterfs/xlator.h>
 #include "xdr-nfs3.h"
-#include "iatt.h"
+#include <glusterfs/iatt.h>
 #include <sys/types.h>
-#include "compat-uuid.h"
+#include <glusterfs/compat-uuid.h>
 
 /* BIG FAT WARNING: The file handle code is tightly coupled to NFSv3 file
  * handles for now. This will change if and when we need v4. */
diff --git a/xlators/nfs/server/src/nfs3-helpers.c b/xlators/nfs/server/src/nfs3-helpers.c
index 5cd3bb8cb93..8a58977b53c 100644
--- a/xlators/nfs/server/src/nfs3-helpers.c
+++ b/xlators/nfs/server/src/nfs3-helpers.c
@@ -10,18 +10,18 @@
 
 #include <inttypes.h>
 
-#include "xlator.h"
+#include <glusterfs/xlator.h>
 #include "nfs3.h"
 #include "nfs3-fh.h"
 #include "msg-nfs3.h"
-#include "rbthash.h"
+#include <glusterfs/rbthash.h>
 #include "nfs-fops.h"
 #include "nfs-inodes.h"
 #include "nfs-generics.h"
 #include "nfs3-helpers.h"
 #include "nfs-mem-types.h"
-#include "iatt.h"
-#include "common-utils.h"
+#include <glusterfs/iatt.h>
+#include <glusterfs/common-utils.h>
 #include "nfs-messages.h"
 #include "mount3.h"
 #include <string.h>
diff --git a/xlators/nfs/server/src/nfs3-helpers.h b/xlators/nfs/server/src/nfs3-helpers.h
index 7c70c20b787..aead636c831 100644
--- a/xlators/nfs/server/src/nfs3-helpers.h
+++ b/xlators/nfs/server/src/nfs3-helpers.h
@@ -11,7 +11,7 @@
 #ifndef _NFS3_HELPER_H_
 #define _NFS3_HELPER_H_
 
-#include "xlator.h"
+#include <glusterfs/xlator.h>
 #include "nfs3.h"
 #include "nfs3-fh.h"
 #include "msg-nfs3.h"
diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c
index d8e41680008..1400c4ea30d 100644
--- a/xlators/nfs/server/src/nfs3.c
+++ b/xlators/nfs/server/src/nfs3.c
@@ -9,15 +9,15 @@
 */
 
 #include "rpcsvc.h"
-#include "dict.h"
-#include "xlator.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
 #include "mount3.h"
 #include "xdr-nfs3.h"
 #include "msg-nfs3.h"
-#include "iobuf.h"
+#include <glusterfs/iobuf.h>
 #include "nfs3.h"
-#include "mem-pool.h"
-#include "logging.h"
+#include <glusterfs/mem-pool.h>
+#include <glusterfs/logging.h>
 #include "nfs-common.h"
 #include "nfs-fops.h"
 #include "nfs-inodes.h"
diff --git a/xlators/nfs/server/src/nfs3.h b/xlators/nfs/server/src/nfs3.h
index f6d98d9f308..cdb7e03a619 100644
--- a/xlators/nfs/server/src/nfs3.h
+++ b/xlators/nfs/server/src/nfs3.h
@@ -12,18 +12,18 @@
 #define _NFS3_H_
 
 #include "rpcsvc.h"
-#include "dict.h"
-#include "xlator.h"
-#include "iobuf.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
+#include <glusterfs/iobuf.h>
 #include "nfs.h"
 #include "nfs3-fh.h"
 #include "nfs-common.h"
 #include "xdr-nfs3.h"
-#include "mem-pool.h"
+#include <glusterfs/mem-pool.h>
 #include "nlm4.h"
 #include "acl3-xdr.h"
 #include "acl3.h"
-#include "refcount.h"
+#include <glusterfs/refcount.h>
 #include <sys/statvfs.h>
 
 #define GF_NFS3 GF_NFS "-nfsv3"
diff --git a/xlators/nfs/server/src/nlm4.c b/xlators/nfs/server/src/nlm4.c
index 6fd952fd338..3ac0977fb22 100644
--- a/xlators/nfs/server/src/nlm4.c
+++ b/xlators/nfs/server/src/nlm4.c
@@ -8,14 +8,14 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "defaults.h"
+#include <glusterfs/defaults.h>
 #include "rpcsvc.h"
-#include "dict.h"
-#include "xlator.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
 #include "nfs.h"
-#include "mem-pool.h"
-#include "logging.h"
-#include "syscall.h"
+#include <glusterfs/mem-pool.h>
+#include <glusterfs/logging.h>
+#include <glusterfs/syscall.h>
 #include "nfs-fops.h"
 #include "mount3.h"
 #include "nfs3.h"
@@ -28,13 +28,13 @@
 #include "nfs-generics.h"
 #include "rpc-clnt.h"
 #include "nsm-xdr.h"
-#include "run.h"
+#include <glusterfs/run.h>
 #include "nfs-messages.h"
 #include <unistd.h>
 #include <rpc/pmap_clnt.h>
 #include <rpc/rpc.h>
 #include <rpc/xdr.h>
-#include <statedump.h>
+#include <glusterfs/statedump.h>
 
 #define KILLALL_CMD "pkill"
 
diff --git a/xlators/nfs/server/src/nlm4.h b/xlators/nfs/server/src/nlm4.h
index 4755c83f3dc..a22032cac69 100644
--- a/xlators/nfs/server/src/nlm4.h
+++ b/xlators/nfs/server/src/nlm4.h
@@ -14,17 +14,17 @@
 #include <sys/types.h>
 #include <signal.h>
 #include "rpcsvc.h"
-#include "dict.h"
-#include "xlator.h"
-#include "iobuf.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/xlator.h>
+#include <glusterfs/iobuf.h>
 #include "nfs.h"
-#include "list.h"
+#include <glusterfs/list.h>
 #include "xdr-nfs3.h"
-#include "locking.h"
+#include <glusterfs/locking.h>
 #include "nfs3-fh.h"
-#include "compat-uuid.h"
+#include <glusterfs/compat-uuid.h>
 #include "nlm4-xdr.h"
-#include "lkowner.h"
+#include <glusterfs/lkowner.h>
 
 #define NLM4_NULL 0
 #define NLM4_TEST 1
diff --git a/xlators/nfs/server/src/nlmcbk_svc.c b/xlators/nfs/server/src/nlmcbk_svc.c
index 1d57f415e2c..d18b86ce8db 100644
--- a/xlators/nfs/server/src/nlmcbk_svc.c
+++ b/xlators/nfs/server/src/nlmcbk_svc.c
@@ -14,7 +14,7 @@
  */
 
 #include "nlm4.h"
-#include "logging.h"
+#include <glusterfs/logging.h>
 #include "nfs-messages.h"
 #include <stdio.h>
 #include <stdlib.h>