Coverity Issue: PW.INCLUDE_RECURSION in several files

Coverity ID: 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417,
418, 419, 423, 424, 425, 426, 427, 428, 429, 436, 437, 438, 439,
440, 441, 442, 443

Issue: Event include_recursion

Removed redundant, recursive includes from the files.

Change-Id: I920776b1fa089a2d4917ca722d0075a9239911a7
BUG: 789278
Signed-off-by: Girjesh Rajoria <grajoria@redhat.com>

58 files changed, 0 insertions, 65 deletions

diff --git a/api/src/glfs-mgmt.c b/api/src/glfs-mgmt.c
index 32b9dbd4e3..ac306e4002 100644
--- a/api/src/glfs-mgmt.c
+++ b/api/src/glfs-mgmt.c
@@ -18,7 +18,6 @@
 
 #include "glusterfs.h"
 #include "glfs.h"
-#include "stack.h"
 #include "dict.h"
 #include "event.h"
 #include "defaults.h"
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index 415c26d68d..b8ebdefb87 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -14,7 +14,6 @@
 #include <signal.h>
 
 #include "glusterfs.h"
-#include "stack.h"
 #include "dict.h"
 #include "event.h"
 #include "defaults.h"
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index 2a1898be30..bb85628c80 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -62,7 +62,6 @@
 #include "list.h"
 #include "timer.h"
 #include "glusterfsd.h"
-#include "stack.h"
 #include "revision.h"
 #include "common-utils.h"
 #include "event.h"
diff --git a/libglusterfs/src/call-stub.h b/libglusterfs/src/call-stub.h
index 300b593576..59868d414e 100644
--- a/libglusterfs/src/call-stub.h
+++ b/libglusterfs/src/call-stub.h
@@ -14,7 +14,6 @@
 #include "xlator.h"
 #include "defaults.h"
 #include "default-args.h"
-#include "stack.h"
 #include "list.h"
 
 typedef struct _call_stub {
diff --git a/libglusterfs/src/fd.c b/libglusterfs/src/fd.c
index a824db7c7a..d6002a4eb1 100644
--- a/libglusterfs/src/fd.c
+++ b/libglusterfs/src/fd.c
@@ -10,7 +10,6 @@
 
 #include "fd.h"
 #include "glusterfs.h"
-#include "inode.h"
 #include "dict.h"
 #include "statedump.h"
 #include "libglusterfs-messages.h"
diff --git a/libglusterfs/src/globals.c b/libglusterfs/src/globals.c
index f182b1c720..1c733840f4 100644
--- a/libglusterfs/src/globals.c
+++ b/libglusterfs/src/globals.c
@@ -11,7 +11,6 @@
 #include <pthread.h>
 
 #include "glusterfs.h"
-#include "globals.h"
 #include "xlator.h"
 #include "mem-pool.h"
 #include "syncop.h"
diff --git a/libglusterfs/src/inode.c b/libglusterfs/src/inode.c
index b7b5ac6a7d..1c8d1badf4 100644
--- a/libglusterfs/src/inode.c
+++ b/libglusterfs/src/inode.c
@@ -9,7 +9,6 @@
 */
 
 #include "inode.h"
-#include "fd.h"
 #include "common-utils.h"
 #include "statedump.h"
 #include <pthread.h>
diff --git a/libglusterfs/src/latency.c b/libglusterfs/src/latency.c
index d0039a1f73..4c83024e85 100644
--- a/libglusterfs/src/latency.c
+++ b/libglusterfs/src/latency.c
@@ -15,7 +15,6 @@
  */
 
 #include "glusterfs.h"
-#include "stack.h"
 #include "xlator.h"
 #include "common-utils.h"
 #include "statedump.h"
diff --git a/libglusterfs/src/xlator.h b/libglusterfs/src/xlator.h
index d802bdc76c..7f9d483ccb 100644
--- a/libglusterfs/src/xlator.h
+++ b/libglusterfs/src/xlator.h
@@ -58,8 +58,6 @@ typedef int32_t (*event_notify_fn_t) (xlator_t *this, int32_t event, void *data,
 #include "gf-dirent.h"
 #include "stack.h"
 #include "iobuf.h"
-#include "inode.h"
-#include "fd.h"
 #include "globals.h"
 #include "iatt.h"
 #include "options.h"
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 5e336c2a74..11594a2b7a 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -21,7 +21,6 @@
 #include "xlator.h"
 #include "hashfn.h"
 #include "logging.h"
-#include "stack.h"
 #include "list.h"
 #include "call-stub.h"
 #include "defaults.h"
@@ -30,10 +29,8 @@
 #include "compat.h"
 #include "byte-order.h"
 #include "statedump.h"
-#include "inode.h"
 #include "events.h"
 #include "upcall-utils.h"
-#include "fd.h"
 
 #include "afr-inode-read.h"
 #include "afr-inode-write.h"
diff --git a/xlators/cluster/afr/src/afr-dir-read.c b/xlators/cluster/afr/src/afr-dir-read.c
index 4e29171482..5218d386c7 100644
--- a/xlators/cluster/afr/src/afr-dir-read.c
+++ b/xlators/cluster/afr/src/afr-dir-read.c
@@ -22,7 +22,6 @@
 #include "xlator.h"
 #include "hashfn.h"
 #include "logging.h"
-#include "stack.h"
 #include "list.h"
 #include "call-stub.h"
 #include "defaults.h"
diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c
index 9099b8c1ee..1afd5d3967 100644
--- a/xlators/cluster/afr/src/afr-dir-write.c
+++ b/xlators/cluster/afr/src/afr-dir-write.c
@@ -22,7 +22,6 @@
 #include "xlator.h"
 #include "hashfn.h"
 #include "logging.h"
-#include "stack.h"
 #include "list.h"
 #include "call-stub.h"
 #include "defaults.h"
diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c
index ecf94a523d..75b2bf8e22 100644
--- a/xlators/cluster/afr/src/afr-inode-read.c
+++ b/xlators/cluster/afr/src/afr-inode-read.c
@@ -22,7 +22,6 @@
 #include "xlator.h"
 #include "hashfn.h"
 #include "logging.h"
-#include "stack.h"
 #include "list.h"
 #include "call-stub.h"
 #include "byte-order.h"
diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c
index 97397f986b..1411469959 100644
--- a/xlators/cluster/afr/src/afr-inode-write.c
+++ b/xlators/cluster/afr/src/afr-inode-write.c
@@ -22,7 +22,6 @@
 #include "xlator.h"
 #include "hashfn.h"
 #include "logging.h"
-#include "stack.h"
 #include "list.h"
 #include "call-stub.h"
 #include "defaults.h"
diff --git a/xlators/cluster/afr/src/afr-open.c b/xlators/cluster/afr/src/afr-open.c
index 6c625ccf7d..de125296bb 100644
--- a/xlators/cluster/afr/src/afr-open.c
+++ b/xlators/cluster/afr/src/afr-open.c
@@ -21,7 +21,6 @@
 #include "xlator.h"
 #include "hashfn.h"
 #include "logging.h"
-#include "stack.h"
 #include "list.h"
 #include "call-stub.h"
 #include "defaults.h"
@@ -31,8 +30,6 @@
 #include "byte-order.h"
 #include "statedump.h"
 
-#include "fd.h"
-
 #include "afr-inode-read.h"
 #include "afr-inode-write.h"
 #include "afr-dir-read.h"
diff --git a/xlators/experimental/fdl/src/recon-tmpl.c b/xlators/experimental/fdl/src/recon-tmpl.c
index ab5edb1a37..228860401a 100644
--- a/xlators/experimental/fdl/src/recon-tmpl.c
+++ b/xlators/experimental/fdl/src/recon-tmpl.c
@@ -5,7 +5,6 @@
 #endif
 
 #include "glusterfs.h"
-#include "fd.h"
 #include "iatt.h"
 #include "syncop.h"
 #include "xlator.h"
diff --git a/xlators/features/leases/src/leases.h b/xlators/features/leases/src/leases.h
index 5dde1592fb..80dbcbb06b 100644
--- a/xlators/features/leases/src/leases.h
+++ b/xlators/features/leases/src/leases.h
@@ -19,7 +19,6 @@
 #include "common-utils.h"
 #include "glusterfs.h"
 #include "xlator.h"
-#include "inode.h"
 #include "call-stub.h"
 #include "logging.h"
 #include "client_t.h"
diff --git a/xlators/features/locks/src/clear.c b/xlators/features/locks/src/clear.c
index d7c210f24a..f6897333ce 100644
--- a/xlators/features/locks/src/clear.c
+++ b/xlators/features/locks/src/clear.c
@@ -15,7 +15,6 @@
 #include "glusterfs.h"
 #include "compat.h"
 #include "xlator.h"
-#include "inode.h"
 #include "logging.h"
 #include "common-utils.h"
 
diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c
index 4b63c43057..b8c09a988e 100644
--- a/xlators/features/locks/src/common.c
+++ b/xlators/features/locks/src/common.c
@@ -15,7 +15,6 @@
 #include "glusterfs.h"
 #include "compat.h"
 #include "xlator.h"
-#include "inode.h"
 #include "logging.h"
 #include "common-utils.h"
 
diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c
index 4231d760cd..0dfc9df737 100644
--- a/xlators/features/locks/src/entrylk.c
+++ b/xlators/features/locks/src/entrylk.c
@@ -10,7 +10,6 @@
 #include "glusterfs.h"
 #include "compat.h"
 #include "xlator.h"
-#include "inode.h"
 #include "logging.h"
 #include "common-utils.h"
 #include "list.h"
diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c
index e1702c78ba..a8381adda3 100644
--- a/xlators/features/locks/src/inodelk.c
+++ b/xlators/features/locks/src/inodelk.c
@@ -10,7 +10,6 @@
 #include "glusterfs.h"
 #include "compat.h"
 #include "xlator.h"
-#include "inode.h"
 #include "logging.h"
 #include "common-utils.h"
 #include "list.h"
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c
index ff9a3da1a2..7e94c284ed 100644
--- a/xlators/features/locks/src/posix.c
+++ b/xlators/features/locks/src/posix.c
@@ -15,7 +15,6 @@
 #include "glusterfs.h"
 #include "compat.h"
 #include "xlator.h"
-#include "inode.h"
 #include "logging.h"
 #include "common-utils.h"
 
diff --git a/xlators/features/locks/src/reservelk.c b/xlators/features/locks/src/reservelk.c
index 13b23f9f88..5c7a5b47f3 100644
--- a/xlators/features/locks/src/reservelk.c
+++ b/xlators/features/locks/src/reservelk.c
@@ -10,7 +10,6 @@
 #include "glusterfs.h"
 #include "compat.h"
 #include "xlator.h"
-#include "inode.h"
 #include "logging.h"
 #include "common-utils.h"
 #include "list.h"
diff --git a/xlators/features/locks/tests/unit-test.c b/xlators/features/locks/tests/unit-test.c
index dec2ba8590..9468f9e186 100644
--- a/xlators/features/locks/tests/unit-test.c
+++ b/xlators/features/locks/tests/unit-test.c
@@ -10,7 +10,6 @@
 #include "glusterfs.h"
 #include "compat.h"
 #include "xlator.h"
-#include "inode.h"
 #include "logging.h"
 #include "common-utils.h"
 #include "list.h"
diff --git a/xlators/features/marker/src/marker-common.h b/xlators/features/marker/src/marker-common.h
index c6ca422dd6..fbe9a2ce4b 100644
--- a/xlators/features/marker/src/marker-common.h
+++ b/xlators/features/marker/src/marker-common.h
@@ -10,7 +10,6 @@
 #ifndef _MARKER_COMMON_H
 #define _MARKER_COMMON_H
 
-#include "inode.h"
 #include "xlator.h"
 #include "marker.h"
 
diff --git a/xlators/features/quota/src/quota.h b/xlators/features/quota/src/quota.h
index adab7eb629..b99ca820e7 100644
--- a/xlators/features/quota/src/quota.h
+++ b/xlators/features/quota/src/quota.h
@@ -19,7 +19,6 @@
 #include "compat.h"
 #include "logging.h"
 #include "dict.h"
-#include "stack.h"
 #include "event.h"
 #include "rpcsvc.h"
 #include "rpc-clnt.h"
diff --git a/xlators/features/snapview-server/src/snapview-server.h b/xlators/features/snapview-server/src/snapview-server.h
index a12319fa9b..d776ed93a3 100644
--- a/xlators/features/snapview-server/src/snapview-server.h
+++ b/xlators/features/snapview-server/src/snapview-server.h
@@ -14,7 +14,6 @@
 #include "defaults.h"
 #include "mem-types.h"
 #include "call-stub.h"
-#include "inode.h"
 #include "byte-order.h"
 #include "iatt.h"
 #include <ctype.h>
diff --git a/xlators/features/upcall/src/upcall-internal.c b/xlators/features/upcall/src/upcall-internal.c
index 8b15dfceee..867b2901cb 100644
--- a/xlators/features/upcall/src/upcall-internal.c
+++ b/xlators/features/upcall/src/upcall-internal.c
@@ -15,7 +15,6 @@
 #include "glusterfs.h"
 #include "compat.h"
 #include "xlator.h"
-#include "inode.h"
 #include "logging.h"
 #include "common-utils.h"
 
diff --git a/xlators/features/upcall/src/upcall.c b/xlators/features/upcall/src/upcall.c
index 3e1d307260..9d17d59578 100644
--- a/xlators/features/upcall/src/upcall.c
+++ b/xlators/features/upcall/src/upcall.c
@@ -16,7 +16,6 @@
 #include "glusterfs.h"
 #include "compat.h"
 #include "xlator.h"
-#include "inode.h"
 #include "logging.h"
 #include "common-utils.h"
 
diff --git a/xlators/meta/src/cmdline-file.c b/xlators/meta/src/cmdline-file.c
index 941b8073f4..9bf5a65fee 100644
--- a/xlators/meta/src/cmdline-file.c
+++ b/xlators/meta/src/cmdline-file.c
@@ -14,7 +14,6 @@
 #include "meta-mem-types.h"
 #include "meta.h"
 #include "strfd.h"
-#include "globals.h"
 #include "lkowner.h"
 
 
diff --git a/xlators/meta/src/frames-file.c b/xlators/meta/src/frames-file.c
index 027fa294fe..4785c6dea3 100644
--- a/xlators/meta/src/frames-file.c
+++ b/xlators/meta/src/frames-file.c
@@ -14,7 +14,6 @@
 #include "meta-mem-types.h"
 #include "meta.h"
 #include "strfd.h"
-#include "globals.h"
 #include "lkowner.h"
 
 static int
diff --git a/xlators/meta/src/name-file.c b/xlators/meta/src/name-file.c
index 44c359ef5c..faadbff734 100644
--- a/xlators/meta/src/name-file.c
+++ b/xlators/meta/src/name-file.c
@@ -14,7 +14,6 @@
 #include "meta-mem-types.h"
 #include "meta.h"
 #include "strfd.h"
-#include "globals.h"
 #include "lkowner.h"
 
 
diff --git a/xlators/meta/src/process_uuid-file.c b/xlators/meta/src/process_uuid-file.c
index 3210de1d48..37eb03ac5c 100644
--- a/xlators/meta/src/process_uuid-file.c
+++ b/xlators/meta/src/process_uuid-file.c
@@ -14,7 +14,6 @@
 #include "meta-mem-types.h"
 #include "meta.h"
 #include "strfd.h"
-#include "globals.h"
 #include "lkowner.h"
 
 
diff --git a/xlators/meta/src/type-file.c b/xlators/meta/src/type-file.c
index f27e4b0a77..235ecc2dd6 100644
--- a/xlators/meta/src/type-file.c
+++ b/xlators/meta/src/type-file.c
@@ -14,7 +14,6 @@
 #include "meta-mem-types.h"
 #include "meta.h"
 #include "strfd.h"
-#include "globals.h"
 #include "lkowner.h"
 
 
diff --git a/xlators/meta/src/version-file.c b/xlators/meta/src/version-file.c
index ace419ea43..1b0e445844 100644
--- a/xlators/meta/src/version-file.c
+++ b/xlators/meta/src/version-file.c
@@ -14,7 +14,6 @@
 #include "meta-mem-types.h"
 #include "meta.h"
 #include "strfd.h"
-#include "globals.h"
 #include "lkowner.h"
 
 
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index acf9da703f..eacf818bfc 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -9,7 +9,6 @@
 */
 #include <inttypes.h>
 
-#include "globals.h"
 #include "glusterfs.h"
 #include "compat.h"
 #include "dict.h"
@@ -48,7 +47,6 @@
 
 #include "common-utils.h"
 
-#include "globals.h"
 #include "glusterd-syncop.h"
 #include "glusterd-messages.h"
 
diff --git a/xlators/mgmt/glusterd/src/glusterd-hooks.c b/xlators/mgmt/glusterd/src/glusterd-hooks.c
index fa88b667c1..b310bc2a10 100644
--- a/xlators/mgmt/glusterd/src/glusterd-hooks.c
+++ b/xlators/mgmt/glusterd/src/glusterd-hooks.c
@@ -8,7 +8,6 @@
    cases as published by the Free Software Foundation.
 */
 
-#include "globals.h"
 #include "glusterfs.h"
 #include "dict.h"
 #include "xlator.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.h b/xlators/mgmt/glusterd/src/glusterd-op-sm.h
index 48275c57e1..7139a27ffb 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.h
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.h
@@ -18,7 +18,6 @@
 #include "xlator.h"
 #include "logging.h"
 #include "call-stub.h"
-#include "fd.h"
 #include "byte-order.h"
 #include "glusterd.h"
 #include "protocol-common.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd-pmap.h b/xlators/mgmt/glusterd/src/glusterd-pmap.h
index b0fa8aca55..04004c2b2a 100644
--- a/xlators/mgmt/glusterd/src/glusterd-pmap.h
+++ b/xlators/mgmt/glusterd/src/glusterd-pmap.h
@@ -17,7 +17,6 @@
 #include "xlator.h"
 #include "logging.h"
 #include "call-stub.h"
-#include "fd.h"
 #include "byte-order.h"
 #include "rpcsvc.h"
 
diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
index bbf624b44c..02c47be823 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
@@ -13,7 +13,6 @@
 #include <sys/resource.h>
 #include <sys/statvfs.h>
 
-#include "globals.h"
 #include "compat.h"
 #include "protocol-common.h"
 #include "xlator.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.h b/xlators/mgmt/glusterd/src/glusterd-sm.h
index 9e4fe33b55..640468830d 100644
--- a/xlators/mgmt/glusterd/src/glusterd-sm.h
+++ b/xlators/mgmt/glusterd/src/glusterd-sm.h
@@ -18,7 +18,6 @@
 #include "xlator.h"
 #include "logging.h"
 #include "call-stub.h"
-#include "fd.h"
 #include "byte-order.h"
 //#include "glusterd.h"
 #include "rpcsvc.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
index e41f0cd7b7..70692fc086 100644
--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c
+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
@@ -35,7 +35,6 @@
 
 #include <regex.h>
 
-#include "globals.h"
 #include "compat.h"
 #include "protocol-common.h"
 #include "xlator.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index 6747c03877..8ddcc8a9aa 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -12,7 +12,6 @@
 #include <inttypes.h>
 
 
-#include "globals.h"
 #include "glusterfs.h"
 #include "compat.h"
 #include "dict.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.h b/xlators/mgmt/glusterd/src/glusterd-store.h
index 381676078c..d809f2c796 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.h
+++ b/xlators/mgmt/glusterd/src/glusterd-store.h
@@ -18,7 +18,6 @@
 #include "run.h"
 #include "logging.h"
 #include "call-stub.h"
-#include "fd.h"
 #include "byte-order.h"
 #include "glusterd.h"
 #include "rpcsvc.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index f211f199ce..e6793d9b75 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -20,7 +20,6 @@
 #include <libxml/xmlwriter.h>
 #endif
 
-#include "globals.h"
 #include "glusterfs.h"
 #include "compat.h"
 #include "dict.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h
index 33c6fa38b5..e76ee63edf 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.h
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.h
@@ -17,7 +17,6 @@
 #include "xlator.h"
 #include "logging.h"
 #include "call-stub.h"
-#include "fd.h"
 #include "byte-order.h"
 #include "glusterd.h"
 #include "rpc-clnt.h"
diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h
index 2a097b864b..d56727744c 100644
--- a/xlators/mgmt/glusterd/src/glusterd.h
+++ b/xlators/mgmt/glusterd/src/glusterd.h
@@ -22,7 +22,6 @@
 #include "xlator.h"
 #include "logging.h"
 #include "call-stub.h"
-#include "fd.h"
 #include "byte-order.h"
 #include "glusterd-mem-types.h"
 #include "rpcsvc.h"
diff --git a/xlators/nfs/server/src/acl3.c b/xlators/nfs/server/src/acl3.c
index 26fd798653..ec4b0e3dbb 100644
--- a/xlators/nfs/server/src/acl3.c
+++ b/xlators/nfs/server/src/acl3.c
@@ -16,7 +16,6 @@
 #include "mem-pool.h"
 #include "logging.h"
 #include "nfs-fops.h"
-#include "inode.h"
 #include "nfs3.h"
 #include "nfs-mem-types.h"
 #include "nfs3-helpers.h"
diff --git a/xlators/nfs/server/src/nfs-fops.c b/xlators/nfs/server/src/nfs-fops.c
index 28b1781f4b..f3741a4099 100644
--- a/xlators/nfs/server/src/nfs-fops.c
+++ b/xlators/nfs/server/src/nfs-fops.c
@@ -14,10 +14,8 @@
 #include "xlator.h"
 #include "iobuf.h"
 #include "call-stub.h"
-#include "stack.h"
 #include "nfs.h"
 #include "nfs-fops.h"
-#include "inode.h"
 #include "nfs-common.h"
 #include "nfs3-helpers.h"
 #include "nfs-mem-types.h"
diff --git a/xlators/nfs/server/src/nfs-fops.h b/xlators/nfs/server/src/nfs-fops.h
index e511e8ac1d..acf81e2ce1 100644
--- a/xlators/nfs/server/src/nfs-fops.h
+++ b/xlators/nfs/server/src/nfs-fops.h
@@ -15,7 +15,6 @@
 #include "xlator.h"
 #include "iobuf.h"
 #include "call-stub.h"
-#include "stack.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 ccfc0ae87c..7e10ea8978 100644
--- a/xlators/nfs/server/src/nfs-generics.c
+++ b/xlators/nfs/server/src/nfs-generics.c
@@ -11,7 +11,6 @@
 
 #include "string.h"
 
-#include "inode.h"
 #include "nfs.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 0dad30ba10..515622a3d5 100644
--- a/xlators/nfs/server/src/nfs-inodes.c
+++ b/xlators/nfs/server/src/nfs-inodes.c
@@ -10,7 +10,6 @@
 
 #include "string.h"
 
-#include "inode.h"
 #include "nfs.h"
 #include "nfs-inodes.h"
 #include "nfs-fops.h"
diff --git a/xlators/nfs/server/src/nfs-inodes.h b/xlators/nfs/server/src/nfs-inodes.h
index 9ec94f2bef..40037fbcbb 100644
--- a/xlators/nfs/server/src/nfs-inodes.h
+++ b/xlators/nfs/server/src/nfs-inodes.h
@@ -15,7 +15,6 @@
 #include "xlator.h"
 #include "iobuf.h"
 #include "call-stub.h"
-#include "stack.h"
 #include "nfs-fops.h"
 
 
diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c
index 1f637fd609..b03f407e1b 100644
--- a/xlators/nfs/server/src/nfs.c
+++ b/xlators/nfs/server/src/nfs.c
@@ -21,7 +21,6 @@
 #include "mem-pool.h"
 #include "logging.h"
 #include "nfs-fops.h"
-#include "inode.h"
 #include "mount3.h"
 #include "nfs3.h"
 #include "nfs-mem-types.h"
diff --git a/xlators/nfs/server/src/nlm4.c b/xlators/nfs/server/src/nlm4.c
index 04ec79f0a5..78965469d1 100644
--- a/xlators/nfs/server/src/nlm4.c
+++ b/xlators/nfs/server/src/nlm4.c
@@ -17,7 +17,6 @@
 #include "logging.h"
 #include "syscall.h"
 #include "nfs-fops.h"
-#include "inode.h"
 #include "mount3.h"
 #include "nfs3.h"
 #include "nfs-mem-types.h"
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 6cb5b6b38c..469302b0dc 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -19,7 +19,6 @@
 
 #include "xdr-rpc.h"
 #include "glusterfs3.h"
-#include "gf-dirent.h"
 #include "client-messages.h"
 
 extern rpc_clnt_prog_t clnt_handshake_prog;
diff --git a/xlators/storage/posix/src/posix-handle.h b/xlators/storage/posix/src/posix-handle.h
index 9af6a7a544..c76e618546 100644
--- a/xlators/storage/posix/src/posix-handle.h
+++ b/xlators/storage/posix/src/posix-handle.h
@@ -13,7 +13,6 @@
 #include <limits.h>
 #include <sys/types.h>
 #include "xlator.h"
-#include "gf-dirent.h"
 #include "posix-messages.h"
 
 /* From Open Group Base Specifications Issue 6 */
diff --git a/xlators/storage/posix/src/posix.h b/xlators/storage/posix/src/posix.h
index b63643d970..1e19311cb0 100644
--- a/xlators/storage/posix/src/posix.h
+++ b/xlators/storage/posix/src/posix.h
@@ -33,7 +33,6 @@
 #endif
 
 #include "xlator.h"
-#include "inode.h"
 #include "compat.h"
 #include "timer.h"
 #include "posix-mem-types.h"