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>

api/src/gfapi-messages.h

@@ -11,7 +11,7 @@
 #ifndef _GFAPI_MESSAGES_H__
 #define _GFAPI_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.
  *

api/src/glfs-fops.c

@@ -18,10 +18,10 @@
 
 #include "glfs-internal.h"
 #include "glfs-mem-types.h"
-#include "syncop.h"
+#include <glusterfs/syncop.h>
 #include "glfs.h"
 #include "gfapi-messages.h"
-#include "compat-errno.h"
+#include <glusterfs/compat-errno.h>
 #include <limits.h>
 #include "glusterfs3.h"
 

api/src/glfs-handleops.c

@@ -10,7 +10,7 @@
 
 #include "glfs-internal.h"
 #include "glfs-mem-types.h"
-#include "syncop.h"
+#include <glusterfs/syncop.h>
 #include "glfs.h"
 #include "glfs-handles.h"
 #include "gfapi-messages.h"
@@ -2267,7 +2267,7 @@ out:
 GFAPI_SYMVER_PUBLIC(glfs_h_poll_upcall370, glfs_h_poll_upcall, 3.7.0);
 
 #ifdef HAVE_ACL_LIBACL_H
-#include "glusterfs-acl.h"
+#include <glusterfs/glusterfs-acl.h>
 #include <acl/libacl.h>
 
 int

api/src/glfs-internal.h

@@ -11,11 +11,11 @@
 #ifndef _GLFS_INTERNAL_H
 #define _GLFS_INTERNAL_H
 
-#include "xlator.h"
-#include "glusterfs.h"
-#include "upcall-utils.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/upcall-utils.h>
 #include "glfs-handles.h"
-#include "refcount.h"
+#include <glusterfs/refcount.h>
 
 #define GLFS_SYMLINK_MAX_FOLLOW 2048
 

api/src/glfs-master.c

@@ -15,8 +15,8 @@
 #include <inttypes.h>
 #include <limits.h>
 
-#include "xlator.h"
-#include "glusterfs.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/glusterfs.h>
 
 #include "glfs-internal.h"
 #include "glfs-mem-types.h"

api/src/glfs-mem-types.h

@@ -11,7 +11,7 @@
 #ifndef _GLFS_MEM_TYPES_H
 #define _GLFS_MEM_TYPES_H
 
-#include "mem-types.h"
+#include <glusterfs/mem-types.h>
 
 #define GF_MEM_TYPE_START (gf_common_mt_end + 1)
 

api/src/glfs-mgmt.c

@@ -15,11 +15,11 @@
 #include <signal.h>
 #include <pthread.h>
 
-#include "glusterfs.h"
+#include <glusterfs/glusterfs.h>
 #include "glfs.h"
-#include "dict.h"
-#include "gf-event.h"
-#include "defaults.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/gf-event.h>
+#include <glusterfs/defaults.h>
 
 #include "rpc-clnt.h"
 #include "protocol-common.h"
@@ -29,13 +29,13 @@
 #include "xdr-generic.h"
 #include "rpc-common-xdr.h"
 
-#include "syncop.h"
-#include "xlator.h"
+#include <glusterfs/syncop.h>
+#include <glusterfs/xlator.h>
 
 #include "glfs-internal.h"
 #include "glfs-mem-types.h"
 #include "gfapi-messages.h"
-#include "syscall.h"
+#include <glusterfs/syscall.h>
 
 int
 glfs_volfile_fetch(struct glfs *fs);

api/src/glfs-resolve.c

@@ -15,16 +15,16 @@
 #include <inttypes.h>
 #include <limits.h>
 
-#include "glusterfs.h"
-#include "logging.h"
-#include "stack.h"
-#include "gf-event.h"
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/logging.h>
+#include <glusterfs/stack.h>
+#include <glusterfs/gf-event.h>
 #include "glfs-mem-types.h"
-#include "common-utils.h"
-#include "syncop.h"
-#include "call-stub.h"
+#include <glusterfs/common-utils.h>
+#include <glusterfs/syncop.h>
+#include <glusterfs/call-stub.h>
 #include "gfapi-messages.h"
-#include "inode.h"
+#include <glusterfs/inode.h>
 #include "glfs-internal.h"
 
 #define graphid_str(subvol)                                                    \

api/src/glfs.c

@@ -34,17 +34,17 @@
 #include <sys/prctl.h>
 #endif
 
-#include "glusterfs.h"
-#include "logging.h"
-#include "stack.h"
-#include "gf-event.h"
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/logging.h>
+#include <glusterfs/stack.h>
+#include <glusterfs/gf-event.h>
 #include "glfs-mem-types.h"
-#include "common-utils.h"
-#include "syncop.h"
-#include "call-stub.h"
-#include "hashfn.h"
+#include <glusterfs/common-utils.h>
+#include <glusterfs/syncop.h>
+#include <glusterfs/call-stub.h>
+#include <glusterfs/hashfn.h>
 #include "rpc-clnt.h"
-#include "statedump.h"
+#include <glusterfs/statedump.h>
 
 #include "gfapi-messages.h"
 #include "glfs.h"

cli/src/cli-cmd-global.c

@@ -23,9 +23,9 @@
 #include "cli-cmd.h"
 #include "cli-mem-types.h"
 #include "cli1-xdr.h"
-#include "run.h"
-#include "syscall.h"
-#include "common-utils.h"
+#include <glusterfs/run.h>
+#include <glusterfs/syscall.h>
+#include <glusterfs/common-utils.h>
 
 extern rpc_clnt_prog_t *cli_rpc_prog;
 

cli/src/cli-cmd-parser.c

@@ -18,8 +18,8 @@
 #include "cli.h"
 #include "cli-cmd.h"
 #include "cli-mem-types.h"
-#include "dict.h"
-#include "list.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/list.h>
 
 #include "protocol-common.h"
 #include "cli1-xdr.h"

cli/src/cli-cmd-peer.c

@@ -18,7 +18,7 @@
 #include "cli-mem-types.h"
 #include "cli1-xdr.h"
 #include "protocol-common.h"
-#include "events.h"
+#include <glusterfs/events.h>
 
 extern struct rpc_clnt *global_rpc;
 

cli/src/cli-cmd-volume.c

@@ -23,10 +23,10 @@
 #include "cli-cmd.h"
 #include "cli-mem-types.h"
 #include "cli1-xdr.h"
-#include "run.h"
-#include "syscall.h"
-#include "common-utils.h"
-#include "events.h"
+#include <glusterfs/run.h>
+#include <glusterfs/syscall.h>
+#include <glusterfs/common-utils.h>
+#include <glusterfs/events.h>
 
 extern struct rpc_clnt *global_rpc;
 extern struct rpc_clnt *global_quotad_rpc;

cli/src/cli-cmd.h

@@ -13,7 +13,7 @@
 #include <netdb.h>
 
 #include "cli.h"
-#include "list.h"
+#include <glusterfs/list.h>
 
 #define GLUSTER_SHARED_STORAGE "gluster_shared_storage"
 

cli/src/cli-mem-types.h

@@ -10,7 +10,7 @@
 #ifndef __CLI_MEM_TYPES_H__
 #define __CLI_MEM_TYPES_H__
 
-#include "mem-types.h"
+#include <glusterfs/mem-types.h>
 
 #define CLI_MEM_TYPE_START (gf_common_mt_end + 1)
 

cli/src/cli-quotad-client.h

@@ -8,8 +8,8 @@
    cases as published by the Free Software Foundation.
 */
 #include "cli.h"
-#include "compat-errno.h"
-#include "compat.h"
+#include <glusterfs/compat-errno.h>
+#include <glusterfs/compat.h>
 #include "cli-cmd.h"
 #include "cli1-xdr.h"
 #include "xdr-generic.h"

cli/src/cli-rl.c

@@ -17,7 +17,7 @@
 #include "cli-cmd.h"
 #include "cli-mem-types.h"
 
-#include "gf-event.h"
+#include <glusterfs/gf-event.h>
 
 #include <fnmatch.h>
 

cli/src/cli-rpc-ops.c

@@ -24,7 +24,7 @@
 #define REBAL_ESTIMATE_START_TIME 600
 
 #include "cli.h"
-#include "compat-errno.h"
+#include <glusterfs/compat-errno.h>
 #include "cli-cmd.h"
 #include <sys/uio.h>
 #include <stdlib.h>
@@ -33,18 +33,18 @@
 #include "xdr-generic.h"
 #include "protocol-common.h"
 #include "cli-mem-types.h"
-#include "compat.h"
-#include "upcall-utils.h"
+#include <glusterfs/compat.h>
+#include <glusterfs/upcall-utils.h>
 
-#include "syscall.h"
+#include <glusterfs/syscall.h>
 #include "glusterfs3.h"
 #include "portmap-xdr.h"
-#include "byte-order.h"
+#include <glusterfs/byte-order.h>
 
 #include "cli-quotad-client.h"
-#include "run.h"
-#include "quota-common-utils.h"
-#include "events.h"
+#include <glusterfs/run.h>
+#include <glusterfs/quota-common-utils.h>
+#include <glusterfs/events.h>
 
 enum gf_task_types { GF_TASK_TYPE_REBALANCE, GF_TASK_TYPE_REMOVE_BRICK };
 

cli/src/cli-xml-output.c

@@ -10,10 +10,10 @@
 #include <stdlib.h>
 #include "cli.h"
 #include "cli1-xdr.h"
-#include "run.h"
-#include "compat.h"
-#include "syscall.h"
-#include "upcall-utils.h"
+#include <glusterfs/run.h>
+#include <glusterfs/compat.h>
+#include <glusterfs/syscall.h>
+#include <glusterfs/upcall-utils.h>
 
 enum gf_task_types { GF_TASK_TYPE_REBALANCE, GF_TASK_TYPE_REMOVE_BRICK };
 

cli/src/cli.c

@@ -44,19 +44,19 @@
 #include "cli-cmd.h"
 #include "cli-mem-types.h"
 
-#include "xlator.h"
-#include "glusterfs.h"
-#include "compat.h"
-#include "logging.h"
-#include "dict.h"
-#include "list.h"
-#include "timer.h"
-#include "stack.h"
-#include "revision.h"
-#include "common-utils.h"
-#include "gf-event.h"
-#include "syscall.h"
-#include "call-stub.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/compat.h>
+#include <glusterfs/logging.h>
+#include <glusterfs/dict.h>
+#include <glusterfs/list.h>
+#include <glusterfs/timer.h>
+#include <glusterfs/stack.h>
+#include <glusterfs/revision.h>
+#include <glusterfs/common-utils.h>
+#include <glusterfs/gf-event.h>
+#include <glusterfs/syscall.h>
+#include <glusterfs/call-stub.h>
 #include <fnmatch.h>
 
 #include "xdr-generic.h"

cli/src/cli.h

@@ -11,10 +11,10 @@
 #define __CLI_H__
 
 #include "rpc-clnt.h"
-#include "glusterfs.h"
+#include <glusterfs/glusterfs.h>
 #include "protocol-common.h"
-#include "logging.h"
-#include "quota-common-utils.h"
+#include <glusterfs/logging.h>
+#include <glusterfs/quota-common-utils.h>
 
 #include "cli1-xdr.h"
 

contrib/fuse-lib/misc.c

@@ -10,7 +10,7 @@
 #include <string.h>
 #include <limits.h>
 #include <fcntl.h>
-#include "glusterfs.h"
+#include "glusterfs/glusterfs.h"
 #include "fuse_kernel.h"
 #include "fuse-misc.h"
 

contrib/fuse-lib/mount-gluster-compat.h

@@ -96,9 +96,9 @@ typedef long long mount_flag_t;
 #define FREE(ptr) free (ptr)
 #define GFFUSE_LOGERR(...) fprintf (stderr, ## __VA_ARGS__)
 #else /* FUSE_UTIL */
-#include "glusterfs.h"
-#include "logging.h"
-#include "common-utils.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/common-utils.h"
 
 #define GFFUSE_LOGERR(...) \
         gf_log ("glusterfs-fuse", GF_LOG_ERROR, ## __VA_ARGS__)

contrib/macfuse/mount_darwin.c

@@ -34,9 +34,9 @@
 #include "fuse_param.h"
 #include "fuse_ioctl.h"
 
-#include "glusterfs.h"
-#include "logging.h"
-#include "common-utils.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/common-utils.h"
 
 #define GFFUSE_LOGERR(...) \
         gf_log ("glusterfs-fuse", GF_LOG_ERROR, ## __VA_ARGS__)

contrib/timer-wheel/timer-wheel.h

@@ -17,9 +17,9 @@
 #ifndef __TIMER_WHEEL_H
 #define __TIMER_WHEEL_H
 
-#include "locking.h"
+#include "glusterfs/locking.h"
 
-#include "list.h"
+#include "glusterfs/list.h"
 
 #define TVR_BITS  8
 #define TVN_BITS  6

contrib/umountd/umountd.c

@@ -23,11 +23,11 @@
 #include <sys/stat.h>
 #include <sys/mount.h>
 
-#include "glusterfs.h"
-#include "globals.h"
-#include "logging.h"
-#include "syscall.h"
-#include "mem-types.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/globals.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/syscall.h"
+#include "glusterfs/mem-types.h"
 
 static void
 usage (void)

extras/create_new_xlator/new-xlator-tmpl.c

@@ -113,9 +113,9 @@ xlator_api_t xlator_api = {
 
 #include "@XL_NAME@-mem-types.h"
 #include "@XL_NAME@-messages.h"
-#include "glusterfs.h"
-#include "xlator.h"
-#include "defaults.h"
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/xlator.h>
+#include <glusterfs/defaults.h>
 
 #endif /* __@HFL_NAME@_H__ */
 
@@ -123,7 +123,7 @@ xlator_api_t xlator_api = {
 #ifndef __ @HFL_NAME @_H__
 #define __ @HFL_NAME @_H__
 
-#include "mem-types.h"
+#include <glusterfs/mem-types.h>
 
 enum gf_mdc_mem_types_ {
     gf_ @FOP_PREFIX @_mt_ = gf_common_mt_end + 1,
@@ -136,7 +136,7 @@ enum gf_mdc_mem_types_ {
 #ifndef __ @HFL_NAME @_H__
 #define __ @HFL_NAME @_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.
  *

extras/geo-rep/gsync-sync-gfid.c

@@ -7,8 +7,8 @@
 #include <libgen.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include "glusterfs.h"
-#include "syscall.h"
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/syscall.h>
 
 #ifndef UUID_CANONICAL_FORM_LEN
 #define UUID_CANONICAL_FORM_LEN 36

geo-replication/src/gsyncd.c

@@ -7,8 +7,8 @@
    later), or the GNU General Public License, version 2 (GPLv2), in all
    cases as published by the Free Software Foundation.
 */
-#include "compat.h"
-#include "syscall.h"
+#include <glusterfs/compat.h>
+#include <glusterfs/syscall.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -24,13 +24,13 @@
  * We unconditionally pass then while building gsyncd binary.
  */
 #ifdef USE_LIBGLUSTERFS
-#include "glusterfs.h"
-#include "globals.h"
-#include "defaults.h"
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/globals.h>
+#include <glusterfs/defaults.h>
 #endif
 
-#include "common-utils.h"
-#include "run.h"
+#include <glusterfs/common-utils.h>
+#include <glusterfs/run.h>
 #include "procdiggy.h"
 
 #define _GLUSTERD_CALLED_ "_GLUSTERD_CALLED_"

geo-replication/src/procdiggy.c

@@ -15,8 +15,8 @@
 #include <ctype.h>
 #include <sys/param.h> /* for PATH_MAX */
 
-#include "common-utils.h"
-#include "syscall.h"
+#include <glusterfs/common-utils.h>
+#include <glusterfs/syscall.h>
 #include "procdiggy.h"
 
 pid_t

glusterfsd/src/gf_attach.c

@@ -13,8 +13,8 @@
 #include <unistd.h>
 
 //#include "config.h"
-#include "glusterfs.h"
-#include "globals.h"
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/globals.h>
 #include "glfs-internal.h"
 #include "rpc-clnt.h"
 #include "protocol-common.h"

glusterfsd/src/glusterfsd-mem-types.h

@@ -10,7 +10,7 @@
 #ifndef __GLUSTERFSD_MEM_TYPES_H__
 #define __GLUSTERFSD_MEM_TYPES_H__
 
-#include "mem-types.h"
+#include <glusterfs/mem-types.h>
 
 #define GF_MEM_TYPE_START (gf_common_mt_end + 1)
 

glusterfsd/src/glusterfsd-messages.h

@@ -11,7 +11,7 @@
 #ifndef _GLUSTERFSD_MESSAGES_H_
 #define _GLUSTERFSD_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.
  *

glusterfsd/src/glusterfsd-mgmt.c

@@ -13,10 +13,10 @@
 #include <stdlib.h>
 #include <signal.h>
 
-#include "glusterfs.h"
-#include "dict.h"
-#include "gf-event.h"
-#include "defaults.h"
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/dict.h>
+#include <glusterfs/gf-event.h>
+#include <glusterfs/defaults.h>
 
 #include "rpc-clnt.h"
 #include "protocol-common.h"
@@ -28,11 +28,11 @@
 #include "glusterfsd.h"
 #include "rpcsvc.h"
 #include "cli1-xdr.h"
-#include "statedump.h"
-#include "syncop.h"
-#include "xlator.h"
-#include "syscall.h"
-#include "monitoring.h"
+#include <glusterfs/statedump.h>
+#include <glusterfs/syncop.h>
+#include <glusterfs/xlator.h>
+#include <glusterfs/syscall.h>
+#include <glusterfs/monitoring.h>
 #include "server.h"
 
 static gf_boolean_t is_mgmt_rpc_reconnect = _gf_false;

glusterfsd/src/glusterfsd.c

@@ -53,32 +53,32 @@
 #endif
 #endif
 
-#include "xlator.h"
-#include "glusterfs.h"
-#include "compat.h"
-#include "logging.h"
+#include <glusterfs/xlator.h>
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/compat.h>
+#include <glusterfs/logging.h>
 #include "glusterfsd-messages.h"
-#include "dict.h"
-#include "list.h"
-#include "timer.h"
+#include <glusterfs/dict.h>
+#include <glusterfs/list.h>
+#include <glusterfs/timer.h>
 #include "glusterfsd.h"
-#include "revision.h"
-#include "common-utils.h"
-#include "gf-event.h"
-#include "statedump.h"
-#include "latency.h"
+#include <glusterfs/revision.h>
+#include <glusterfs/common-utils.h>
+#include <glusterfs/gf-event.h>
+#include <glusterfs/statedump.h>
+#include <glusterfs/latency.h>
 #include "glusterfsd-mem-types.h"
-#include "syscall.h"
-#include "call-stub.h"
+#include <glusterfs/syscall.h>
+#include <glusterfs/call-stub.h>
 #include <fnmatch.h>
 #include "rpc-clnt.h"
-#include "syncop.h"
-#include "client_t.h"
+#include <glusterfs/syncop.h>
+#include <glusterfs/client_t.h>
 #include "netgroups.h"
 #include "exports.h"
-#include "monitoring.h"
+#include <glusterfs/monitoring.h>
 
-#include "daemon.h"
+#include <glusterfs/daemon.h>
 
 /* using argp for command line parsing */
 static char gf_doc[] = "";

heal/src/glfs-heal.c

@@ -15,12 +15,12 @@
 #include "glfs-handles.h"
 #include "glfs-internal.h"
 #include "protocol-common.h"
-#include "syscall.h"
-#include "syncop.h"
-#include "syncop-utils.h"
+#include <glusterfs/syscall.h>
+#include <glusterfs/syncop.h>
+#include <glusterfs/syncop-utils.h>
 #include <string.h>
 #include <time.h>
-#include "glusterfs.h"
+#include <glusterfs/glusterfs.h>
 #include <libgen.h>
 
 #if (HAVE_LIB_XML)

libglusterfs/src/Makefile.am

@@ -47,20 +47,29 @@ BUILT_SOURCES = graph.lex.c defaults.c eventtypes.h protocol-common.h
 protocol-common.h: $(top_srcdir)/rpc/rpc-lib/src/protocol-common.h
 	cp $(top_srcdir)/rpc/rpc-lib/src/protocol-common.h .
 
-libglusterfs_la_HEADERS = common-utils.h defaults.h default-args.h \
-	dict.h glusterfs.h hashfn.h timespec.h logging.h xlator.h \
-	stack.h timer.h list.h inode.h call-stub.h compat.h fd.h \
-	revision.h compat-errno.h gf-event.h mem-pool.h byte-order.h \
-	gf-dirent.h locking.h syscall.h iobuf.h globals.h statedump.h \
-	checksum.h daemon.h store.h rbthash.h iatt.h latency.h \
-	mem-types.h syncop.h cluster-syncop.h graph-utils.h trie.h \
-	refcount.h run.h options.h lkowner.h fd-lk.h circ-buff.h \
-	event-history.h gidcache.h client_t.h glusterfs-acl.h \
-	glfs-message-id.h template-component-messages.h strfd.h \
-	syncop-utils.h parse-utils.h libglusterfs-messages.h \
-	lvm-defaults.h quota-common-utils.h rot-buffs.h \
-	compat-uuid.h upcall-utils.h throttle-tbf.h events.h\
-	compound-fop-utils.h atomic.h monitoring.h
+libglusterfs_la_HEADERS = glusterfs/common-utils.h glusterfs/defaults.h \
+	glusterfs/default-args.h glusterfs/dict.h glusterfs/glusterfs.h \
+	glusterfs/hashfn.h glusterfs/timespec.h glusterfs/logging.h \
+	glusterfs/xlator.h glusterfs/stack.h glusterfs/timer.h glusterfs/list.h \
+	glusterfs/inode.h glusterfs/call-stub.h glusterfs/compat.h glusterfs/fd.h \
+	glusterfs/revision.h glusterfs/compat-errno.h glusterfs/gf-event.h \
+	glusterfs/mem-pool.h glusterfs/byte-order.h glusterfs/gf-dirent.h \
+	glusterfs/locking.h glusterfs/syscall.h glusterfs/iobuf.h \
+	glusterfs/globals.h glusterfs/statedump.h glusterfs/checksum.h \
+	glusterfs/daemon.h glusterfs/store.h glusterfs/rbthash.h glusterfs/iatt.h \
+	glusterfs/latency.h glusterfs/mem-types.h glusterfs/syncop.h \
+	glusterfs/cluster-syncop.h glusterfs/graph-utils.h glusterfs/trie.h \
+	glusterfs/refcount.h glusterfs/run.h glusterfs/options.h \
+	glusterfs/lkowner.h glusterfs/fd-lk.h glusterfs/circ-buff.h \
+	glusterfs/event-history.h glusterfs/gidcache.h glusterfs/client_t.h \
+	glusterfs/glusterfs-acl.h glusterfs/glfs-message-id.h \
+	glusterfs/template-component-messages.h glusterfs/strfd.h \
+	glusterfs/syncop-utils.h glusterfs/parse-utils.h \
+	glusterfs/libglusterfs-messages.h glusterfs/lvm-defaults.h \
+	glusterfs/quota-common-utils.h glusterfs/rot-buffs.h \
+	glusterfs/compat-uuid.h glusterfs/upcall-utils.h glusterfs/throttle-tbf.h \
+	glusterfs/events.h glusterfs/compound-fop-utils.h glusterfs/atomic.h \
+	glusterfs/monitoring.h
 
 libglusterfs_ladir = $(includedir)/glusterfs
 

libglusterfs/src/call-stub.c

@@ -11,9 +11,9 @@
 #include <openssl/md5.h>
 #include <inttypes.h>
 
-#include "call-stub.h"
-#include "mem-types.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/call-stub.h"
+#include "glusterfs/mem-types.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 static call_stub_t *
 stub_new(call_frame_t *frame, char wind, glusterfs_fop_t fop)

libglusterfs/src/circ-buff.c

@@ -8,8 +8,8 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "circ-buff.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/circ-buff.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 void
 cb_destroy_data(circular_buffer_t *cb, void (*destroy_buffer_data)(void *data))

libglusterfs/src/client_t.c

@@ -8,13 +8,13 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "glusterfs.h"
-#include "dict.h"
-#include "statedump.h"
-#include "client_t.h"
-#include "list.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/dict.h"
+#include "glusterfs/statedump.h"
+#include "glusterfs/client_t.h"
+#include "glusterfs/list.h"
 #include "rpcsvc.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 static int
 gf_client_chain_client_entries(cliententry_t *entries, uint32_t startidx,

libglusterfs/src/cluster-syncop.c

@@ -14,8 +14,8 @@
 /* NOTE: Cluster-syncop, like syncop blocks the executing thread until the
  * responses are gathered if it is not executed as part of synctask. So it
  * shouldn't be invoked in epoll worker thread */
-#include "cluster-syncop.h"
-#include "defaults.h"
+#include "glusterfs/cluster-syncop.h"
+#include "glusterfs/defaults.h"
 
 #define FOP_ONLIST(subvols, on, numsubvols, replies, output, frame, fop,       \
                    args...)                                                    \

libglusterfs/src/common-utils.c

@@ -40,19 +40,19 @@
 #include <sys/resource.h>
 #endif
 
-#include "compat-errno.h"
-#include "logging.h"
-#include "common-utils.h"
-#include "revision.h"
-#include "glusterfs.h"
-#include "stack.h"
-#include "lkowner.h"
-#include "syscall.h"
+#include "glusterfs/compat-errno.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/common-utils.h"
+#include "glusterfs/revision.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/stack.h"
+#include "glusterfs/lkowner.h"
+#include "glusterfs/syscall.h"
 #include "cli1-xdr.h"
 #define XXH_INLINE_ALL
 #include "xxhash.h"
 #include <ifaddrs.h>
-#include "libglusterfs-messages.h"
+#include "glusterfs/libglusterfs-messages.h"
 #include "protocol-common.h"
 #ifdef __FreeBSD__
 #include <pthread_np.h>
@@ -2281,7 +2281,7 @@ next_token(char **tokenp, token_iter_t *tit)
  * #include <stdio.h>
  * #include <stdlib.h>
  * #include <string.h>
- * #include "common-utils.h"
+ * #include "glusterfs/common-utils.h"
  *
  * int
  * main (int argc, char **argv)

libglusterfs/src/compat-errno.c

@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 
-#include "compat-errno.h"
+#include "glusterfs/compat-errno.h"
 
 static int32_t gf_error_to_errno_array[1024];
 static int32_t gf_errno_to_error_array[1024];

libglusterfs/src/compat.c

@@ -17,16 +17,16 @@
 #include <dirent.h>
 
 #ifdef GF_SOLARIS_HOST_OS
-#include "logging.h"
+#include "glusterfs/logging.h"
 #endif /* GF_SOLARIS_HOST_OS */
 
-#include "compat.h"
-#include "common-utils.h"
-#include "iatt.h"
-#include "inode.h"
-#include "syscall.h"
-#include "run.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/compat.h"
+#include "glusterfs/common-utils.h"
+#include "glusterfs/iatt.h"
+#include "glusterfs/inode.h"
+#include "glusterfs/syscall.h"
+#include "glusterfs/run.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 #ifdef GF_SOLARIS_HOST_OS
 int

libglusterfs/src/compound-fop-utils.c

@@ -8,10 +8,10 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "defaults.h"
-#include "default-args.h"
-#include "mem-types.h"
-#include "dict.h"
+#include "glusterfs/defaults.h"
+#include "glusterfs/default-args.h"
+#include "glusterfs/mem-types.h"
+#include "glusterfs/dict.h"
 
 void
 compound_args_cleanup(compound_args_t *args)

libglusterfs/src/ctx.c

@@ -10,8 +10,8 @@
 
 #include <pthread.h>
 
-#include "globals.h"
-#include "glusterfs.h"
+#include "glusterfs/globals.h"
+#include "glusterfs/glusterfs.h"
 #include "timer-wheel.h"
 
 glusterfs_ctx_t *

libglusterfs/src/daemon.c

@@ -11,7 +11,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdio.h>
-#include "daemon.h"
+#include "glusterfs/daemon.h"
 
 int
 os_daemon_return(int nochdir, int noclose)

libglusterfs/src/default-args.c

@@ -13,8 +13,8 @@
 #include "config.h"
 #endif
 
-#include "xlator.h"
-#include "defaults.h"
+#include "glusterfs/xlator.h"
+#include "glusterfs/defaults.h"
 
 int
 args_lookup_store(default_args_t *args, loc_t *loc, dict_t *xdata)

libglusterfs/src/defaults-tmpl.c

@@ -25,8 +25,8 @@
 #include "config.h"
 #endif
 
-#include "xlator.h"
-#include "defaults.h"
+#include "glusterfs/xlator.h"
+#include "glusterfs/defaults.h"
 
 #pragma generate
 

libglusterfs/src/dict.c

@@ -16,18 +16,18 @@
 #include <limits.h>
 #include <fnmatch.h>
 
-#include "glusterfs.h"
-#include "common-utils.h"
-#include "dict.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/common-utils.h"
+#include "glusterfs/dict.h"
 #define XXH_INLINE_ALL
 #include "xxhash.h"
-#include "logging.h"
-#include "compat.h"
-#include "compat-errno.h"
-#include "byte-order.h"
-#include "globals.h"
-#include "statedump.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/compat.h"
+#include "glusterfs/compat-errno.h"
+#include "glusterfs/byte-order.h"
+#include "glusterfs/globals.h"
+#include "glusterfs/statedump.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 #include "glusterfs-fops.h"
 

libglusterfs/src/event-epoll.c

@@ -16,12 +16,12 @@
 #include <errno.h>
 #include <string.h>
 
-#include "logging.h"
-#include "gf-event.h"
-#include "mem-pool.h"
-#include "common-utils.h"
-#include "syscall.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/gf-event.h"
+#include "glusterfs/mem-pool.h"
+#include "glusterfs/common-utils.h"
+#include "glusterfs/syscall.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 #ifdef HAVE_SYS_EPOLL_H
 #include <sys/epoll.h>

libglusterfs/src/event-history.c

@@ -8,8 +8,8 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "event-history.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/event-history.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 eh_t *
 eh_new(size_t buffer_size, gf_boolean_t use_buffer_once,

libglusterfs/src/event-poll.c

@@ -16,12 +16,12 @@
 #include <errno.h>
 #include <string.h>
 
-#include "logging.h"
-#include "gf-event.h"
-#include "mem-pool.h"
-#include "common-utils.h"
-#include "syscall.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/gf-event.h"
+#include "glusterfs/mem-pool.h"
+#include "glusterfs/common-utils.h"
+#include "glusterfs/syscall.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 struct event_slot_poll {
     int fd;

libglusterfs/src/event.c

@@ -16,12 +16,12 @@
 #include <errno.h>
 #include <string.h>
 
-#include "logging.h"
-#include "gf-event.h"
-#include "mem-pool.h"
-#include "common-utils.h"
-#include "libglusterfs-messages.h"
-#include "syscall.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/gf-event.h"
+#include "glusterfs/mem-pool.h"
+#include "glusterfs/common-utils.h"
+#include "glusterfs/libglusterfs-messages.h"
+#include "glusterfs/syscall.h"
 
 struct event_pool *
 event_pool_new(int count, int eventthreadcount)

libglusterfs/src/events.c

@@ -19,11 +19,11 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
-#include "syscall.h"
-#include "mem-pool.h"
-#include "glusterfs.h"
-#include "globals.h"
-#include "events.h"
+#include "glusterfs/syscall.h"
+#include "glusterfs/mem-pool.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/globals.h"
+#include "glusterfs/events.h"
 
 #define EVENT_HOST "127.0.0.1"
 #define EVENT_PORT 24009

libglusterfs/src/fd-lk.c

@@ -8,9 +8,9 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "fd-lk.h"
-#include "common-utils.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/fd-lk.h"
+#include "glusterfs/common-utils.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 int32_t
 _fd_lk_delete_lock(fd_lk_ctx_node_t *lock)

libglusterfs/src/fd.c

@@ -8,11 +8,11 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "fd.h"
-#include "glusterfs.h"
-#include "dict.h"
-#include "statedump.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/fd.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/dict.h"
+#include "glusterfs/statedump.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 static int
 gf_fd_fdtable_expand(fdtable_t *fdtable, uint32_t nr);

libglusterfs/src/gf-dirent.c

@@ -11,9 +11,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
-#include "compat.h"
-#include "xlator.h"
-#include "syncop.h"
+#include "glusterfs/compat.h"
+#include "glusterfs/xlator.h"
+#include "glusterfs/syncop.h"
 
 #define ONE 1ULL
 #define PRESENT_D_OFF_BITS 63

libglusterfs/src/gfdb/gfdb_data_store.c

@@ -10,8 +10,8 @@
 
 #include "gfdb_sqlite3.h"
 #include "gfdb_data_store.h"
-#include "list.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/list.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 /******************************************************************************
  *

libglusterfs/src/gfdb/gfdb_data_store.h

@@ -10,10 +10,10 @@
 #ifndef __GFDB_DATA_STORE_H
 #define __GFDB_DATA_STORE_H
 
-#include "glusterfs.h"
-#include "xlator.h"
-#include "logging.h"
-#include "common-utils.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/xlator.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/common-utils.h"
 #include <time.h>
 #include <sys/time.h>
 

libglusterfs/src/gfdb/gfdb_data_store_helper.c

@@ -1,6 +1,6 @@
 
 #include "gfdb_data_store_helper.h"
-#include "syscall.h"
+#include "glusterfs/syscall.h"
 
 /******************************************************************************
  *

libglusterfs/src/gfdb/gfdb_data_store_helper.h

@@ -15,12 +15,12 @@
 #include <string.h>
 #include <fcntl.h>
 
-#include "common-utils.h"
-#include "compat-uuid.h"
+#include "glusterfs/common-utils.h"
+#include "glusterfs/compat-uuid.h"
 #include "gfdb_mem-types.h"
-#include "dict.h"
-#include "byte-order.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/dict.h"
+#include "glusterfs/byte-order.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 #define GFDB_DATA_STORE "gfdbdatastore"
 

libglusterfs/src/gfdb/gfdb_mem-types.h

@@ -11,7 +11,7 @@
 #ifndef __GFDB_MEM_TYPES_H__
 #define __GFDB_MEM_TYPES_H__
 
-#include "mem-types.h"
+#include "glusterfs/mem-types.h"
 
 enum gfdb_mem_types_ { gfdb_mtstart = gf_common_mt_end + 1, gfdb_mt_end };
 #endif

libglusterfs/src/gfdb/gfdb_sqlite3.c

@@ -10,8 +10,8 @@
 
 #include "gfdb_sqlite3.h"
 #include "gfdb_sqlite3_helper.h"
-#include "libglusterfs-messages.h"
-#include "syscall.h"
+#include "glusterfs/libglusterfs-messages.h"
+#include "glusterfs/syscall.h"
 
 /******************************************************************************
  *

libglusterfs/src/gfdb/gfdb_sqlite3.h

@@ -13,10 +13,10 @@
 /*Sqlite3 header file*/
 #include <sqlite3.h>
 
-#include "logging.h"
+#include "glusterfs/logging.h"
 #include "gfdb_data_store_types.h"
 #include "gfdb_mem-types.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 #define GF_STMT_SIZE_MAX 2048
 

libglusterfs/src/gidcache.c

@@ -8,8 +8,8 @@
   cases as published by the Free Software Foundation.
 */
 
-#include "gidcache.h"
-#include "mem-pool.h"
+#include "glusterfs/gidcache.h"
+#include "glusterfs/mem-pool.h"
 
 /*
  * We treat this as a very simple set-associative LRU cache, with entries aged

libglusterfs/src/globals.c

@@ -10,13 +10,13 @@
 
 #include <pthread.h>
 
-#include "glusterfs.h"
-#include "globals.h"
-#include "xlator.h"
-#include "mem-pool.h"
-#include "syncop.h"
-#include "libglusterfs-messages.h"
-#include "upcall-utils.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/globals.h"
+#include "glusterfs/xlator.h"
+#include "glusterfs/mem-pool.h"
+#include "glusterfs/syncop.h"
+#include "glusterfs/libglusterfs-messages.h"
+#include "glusterfs/upcall-utils.h"
 
 const char *gf_fop_list[GF_FOP_MAXVALUE] = {
     [GF_FOP_NULL] = "NULL",

libglusterfs/src/glusterfs/atomic.h

@@ -14,7 +14,7 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include "locking.h"
+#include "glusterfs/locking.h"
 
 /* Macros used to join two arguments and generate a new macro name. */
 #define GF_ATOMIC_MACRO_1(_macro) _macro

libglusterfs/src/glusterfs/call-stub.h

@@ -11,11 +11,11 @@
 #ifndef _CALL_STUB_H_
 #define _CALL_STUB_H_
 
-#include "xlator.h"
-#include "defaults.h"
-#include "default-args.h"
-#include "stack.h"
-#include "list.h"
+#include "glusterfs/xlator.h"
+#include "glusterfs/defaults.h"
+#include "glusterfs/default-args.h"
+#include "glusterfs/stack.h"
+#include "glusterfs/list.h"
 
 typedef struct _call_stub {
     struct list_head list;

libglusterfs/src/glusterfs/circ-buff.h

@@ -11,9 +11,9 @@
 #ifndef _CB_H
 #define _CB_H
 
-#include "common-utils.h"
-#include "logging.h"
-#include "mem-types.h"
+#include "glusterfs/common-utils.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/mem-types.h"
 
 #define BUFFER_SIZE 10
 #define TOTAL_SIZE BUFFER_SIZE + 1

libglusterfs/src/glusterfs/client_t.h

@@ -11,9 +11,9 @@
 #ifndef _CLIENT_T_H
 #define _CLIENT_T_H
 
-#include "glusterfs.h"
-#include "locking.h" /* for gf_lock_t, not included by glusterfs.h */
-#include "atomic.h"  /* for gf_atomic_t */
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/locking.h" /* for gf_lock_t, not included by glusterfs.h */
+#include "glusterfs/atomic.h"  /* for gf_atomic_t */
 
 struct client_ctx {
     void *ctx_key;

libglusterfs/src/glusterfs/cluster-syncop.h

@@ -11,13 +11,13 @@
 #ifndef _CLUSTER_SYNCOP_H
 #define _CLUSTER_SYNCOP_H
 
-#include "xlator.h"
+#include "glusterfs/xlator.h"
 #include <sys/time.h>
 #include <pthread.h>
 #include <ucontext.h>
-#include "defaults.h"
-#include "default-args.h"
-#include "syncop.h"
+#include "glusterfs/defaults.h"
+#include "glusterfs/default-args.h"
+#include "glusterfs/syncop.h"
 
 /*********************************************************************
  *

libglusterfs/src/glusterfs/common-utils.h

@@ -38,15 +38,15 @@ trap(void);
 /* To solve type punned error */
 #define VOID(ptr) ((void **)((void *)ptr))
 
-#include "logging.h"
-#include "glusterfs.h"
-#include "locking.h"
-#include "mem-pool.h"
-#include "compat-uuid.h"
-#include "iatt.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/locking.h"
+#include "glusterfs/mem-pool.h"
+#include "glusterfs/compat-uuid.h"
+#include "glusterfs/iatt.h"
+#include "glusterfs/libglusterfs-messages.h"
 #include "protocol-common.h"
-#include "iobuf.h"
+#include "glusterfs/iobuf.h"
 
 #define STRINGIFY(val) #val
 #define TOSTRING(val) STRINGIFY(val)

libglusterfs/src/glusterfs/compound-fop-utils.h

@@ -11,10 +11,10 @@
 #ifndef __COMPOUND_FOP_UTILS_H__
 #define __COMPOUND_FOP_UTILS_H__
 
-#include "defaults.h"
-#include "default-args.h"
-#include "mem-types.h"
-#include "dict.h"
+#include "glusterfs/defaults.h"
+#include "glusterfs/default-args.h"
+#include "glusterfs/mem-types.h"
+#include "glusterfs/dict.h"
 
 #define COMPOUND_PACK_ARGS(fop, fop_enum, args, counter, params...)            \
     do {                                                                       \

libglusterfs/src/glusterfs/default-args.h

@@ -15,7 +15,7 @@
 #ifndef _DEFAULT_ARGS_H
 #define _DEFAULT_ARGS_H
 
-#include "xlator.h"
+#include "glusterfs/xlator.h"
 
 int
 args_lookup_cbk_store(default_args_cbk_t *args, int32_t op_ret,

libglusterfs/src/glusterfs/defaults.h

@@ -15,7 +15,7 @@
 #ifndef _DEFAULTS_H
 #define _DEFAULTS_H
 
-#include "xlator.h"
+#include "glusterfs/xlator.h"
 
 typedef struct {
     int op_ret;

libglusterfs/src/glusterfs/dict.h

@@ -15,8 +15,8 @@
 #include <sys/uio.h>
 #include <pthread.h>
 
-#include "common-utils.h"
-#include "libglusterfs-messages.h"
+#include "glusterfs/common-utils.h"
+#include "glusterfs/libglusterfs-messages.h"
 
 typedef struct _data data_t;
 typedef struct _dict dict_t;

libglusterfs/src/glusterfs/event-history.h

@@ -11,8 +11,8 @@
 #ifndef _EH_H
 #define _EH_H
 
-#include "mem-types.h"
-#include "circ-buff.h"
+#include "glusterfs/mem-types.h"
+#include "glusterfs/circ-buff.h"
 
 struct event_hist {
     buffer_t *buffer;

libglusterfs/src/glusterfs/fd-lk.h

@@ -11,14 +11,14 @@
 #ifndef _FD_LK_H
 #define _FD_LK_H
 
-#include "fd.h"
-#include "locking.h"
-#include "list.h"
-#include "logging.h"
-#include "mem-pool.h"
-#include "mem-types.h"
-#include "glusterfs.h"
-#include "common-utils.h"
+#include "glusterfs/fd.h"
+#include "glusterfs/locking.h"
+#include "glusterfs/list.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/mem-pool.h"
+#include "glusterfs/mem-types.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/common-utils.h"
 
 #define get_lk_type(type)                                                      \
     type == F_UNLCK ? "F_UNLCK" : (type == F_RDLCK ? "F_RDLCK" : "F_WRLCK")

libglusterfs/src/glusterfs/fd.h

@@ -11,13 +11,13 @@
 #ifndef _FD_H
 #define _FD_H
 
-#include "list.h"
+#include "glusterfs/list.h"
 #include <sys/types.h>
 #include <unistd.h>
-#include "glusterfs.h"
-#include "locking.h"
-#include "fd-lk.h"
-#include "common-utils.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/locking.h"
+#include "glusterfs/fd-lk.h"
+#include "glusterfs/common-utils.h"
 
 #define GF_ANON_FD_NO -2
 #define GF_ANON_FD_FLAGS (O_RDWR | O_LARGEFILE)
@@ -77,8 +77,8 @@ typedef struct _fdtable fdtable_t;
  */
 #define GF_FDENTRY_ALLOCATED -2
 
-#include "logging.h"
-#include "xlator.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/xlator.h"
 
 void
 gf_fd_put(fdtable_t *fdtable, int32_t fd);

libglusterfs/src/glusterfs/gf-dirent.h

@@ -11,8 +11,8 @@
 #ifndef _GF_DIRENT_H
 #define _GF_DIRENT_H
 
-#include "iatt.h"
-#include "inode.h"
+#include "glusterfs/iatt.h"
+#include "glusterfs/inode.h"
 
 #define gf_dirent_size(name) (sizeof(gf_dirent_t) + strlen(name) + 1)
 

libglusterfs/src/glusterfs/gidcache.h

@@ -11,8 +11,8 @@
 #ifndef __GIDCACHE_H__
 #define __GIDCACHE_H__
 
-#include "glusterfs.h"
-#include "locking.h"
+#include "glusterfs/glusterfs.h"
+#include "glusterfs/locking.h"
 
 /*
  * TBD: make the cache size tunable

libglusterfs/src/glusterfs/globals.h

@@ -115,8 +115,8 @@
 
 #define GD_OP_VER_PERSISTENT_AFR_XATTRS GD_OP_VERSION_3_6_0
 
-#include "xlator.h"
-#include "options.h"
+#include "glusterfs/xlator.h"
+#include "glusterfs/options.h"
 
 /* THIS */
 #define THIS (*__glusterfs_this_location())

libglusterfs/src/glusterfs/glusterfs-acl.h

@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <sys/types.h> /* For uid_t */
 
-#include "locking.h" /* For gf_lock_t in struct posix_acl_conf */
+#include "glusterfs/locking.h" /* For gf_lock_t in struct posix_acl_conf */
 
 #define ACL_PROGRAM 100227
 #define ACLV3_VERSION 3

libglusterfs/src/glusterfs/glusterfs.h

@@ -45,13 +45,13 @@
 #define IXDR_PUT_U_LONG(buf, v) IXDR_PUT_LONG(buf, (long)(v))
 #endif
 
-#include "list.h"
-#include "locking.h"
-#include "logging.h"
-#include "lkowner.h"
-#include "compat-uuid.h"
-#include "refcount.h"
-#include "atomic.h"
+#include "glusterfs/list.h"
+#include "glusterfs/locking.h"
+#include "glusterfs/logging.h"
+#include "glusterfs/lkowner.h"
+#include "glusterfs/compat-uuid.h"
+#include "glusterfs/refcount.h"
+#include "glusterfs/atomic.h"
 
 #define GF_YES 1
 #define GF_NO 0

libglusterfs/src/glusterfs/iatt.h

@@ -18,8 +18,8 @@
 #include <sys/stat.h> /* for iatt <--> stat conversions */
 #include <unistd.h>
 
-#include "compat.h"
-#include "compat-uuid.h"
+#include "glusterfs/compat.h"
+#include "glusterfs/compat-uuid.h"
 
 typedef enum {
     IA_INVAL = 0,

libglusterfs/src/glusterfs/inode.h

@@ -28,10 +28,10 @@ typedef struct _inode inode_t;
 struct _dentry;
 typedef struct _dentry dentry_t;
 
-#include "list.h"
-#include "iatt.h"
-#include "compat-uuid.h"
-#include "fd.h"
+#include "glusterfs/list.h"
+#include "glusterfs/iatt.h"
+#include "glusterfs/compat-uuid.h"
+#include "glusterfs/fd.h"
 
 struct _inode_table {
     pthread_mutex_t lock;

libglusterfs/src/glusterfs/iobuf.h

@@ -11,8 +11,8 @@
 #ifndef _IOBUF_H_
 #define _IOBUF_H_
 
-#include "list.h"
-#include "common-utils.h"
+#include "glusterfs/list.h"
+#include "glusterfs/common-utils.h"
 #include <pthread.h>
 #include <sys/mman.h>
 #include <sys/uio.h>

libglusterfs/src/glusterfs/latency.h

@@ -11,7 +11,7 @@
 #ifndef __LATENCY_H__
 #define __LATENCY_H__
 
-#include "glusterfs.h"
+#include "glusterfs/glusterfs.h"
 
 typedef struct fop_latency {
     double min;   /* min time for the call (microseconds) */