From 0821a57bd2e7518d1c8df2d4403a2dfbb8ee5b6b Mon Sep 17 00:00:00 2001
From: Girjesh Rajoria <grajoria@redhat.com>
Date: Fri, 3 Nov 2017 02:42:23 +0530
Subject: 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>
---
 xlators/cluster/afr/src/afr-common.c                   | 3 ---
 xlators/cluster/afr/src/afr-dir-read.c                 | 1 -
 xlators/cluster/afr/src/afr-dir-write.c                | 1 -
 xlators/cluster/afr/src/afr-inode-read.c               | 1 -
 xlators/cluster/afr/src/afr-inode-write.c              | 1 -
 xlators/cluster/afr/src/afr-open.c                     | 3 ---
 xlators/experimental/fdl/src/recon-tmpl.c              | 1 -
 xlators/features/leases/src/leases.h                   | 1 -
 xlators/features/locks/src/clear.c                     | 1 -
 xlators/features/locks/src/common.c                    | 1 -
 xlators/features/locks/src/entrylk.c                   | 1 -
 xlators/features/locks/src/inodelk.c                   | 1 -
 xlators/features/locks/src/posix.c                     | 1 -
 xlators/features/locks/src/reservelk.c                 | 1 -
 xlators/features/locks/tests/unit-test.c               | 1 -
 xlators/features/marker/src/marker-common.h            | 1 -
 xlators/features/quota/src/quota.h                     | 1 -
 xlators/features/snapview-server/src/snapview-server.h | 1 -
 xlators/features/upcall/src/upcall-internal.c          | 1 -
 xlators/features/upcall/src/upcall.c                   | 1 -
 xlators/meta/src/cmdline-file.c                        | 1 -
 xlators/meta/src/frames-file.c                         | 1 -
 xlators/meta/src/name-file.c                           | 1 -
 xlators/meta/src/process_uuid-file.c                   | 1 -
 xlators/meta/src/type-file.c                           | 1 -
 xlators/meta/src/version-file.c                        | 1 -
 xlators/mgmt/glusterd/src/glusterd-handler.c           | 2 --
 xlators/mgmt/glusterd/src/glusterd-hooks.c             | 1 -
 xlators/mgmt/glusterd/src/glusterd-op-sm.h             | 1 -
 xlators/mgmt/glusterd/src/glusterd-pmap.h              | 1 -
 xlators/mgmt/glusterd/src/glusterd-rebalance.c         | 1 -
 xlators/mgmt/glusterd/src/glusterd-sm.h                | 1 -
 xlators/mgmt/glusterd/src/glusterd-snapshot.c          | 1 -
 xlators/mgmt/glusterd/src/glusterd-store.c             | 1 -
 xlators/mgmt/glusterd/src/glusterd-store.h             | 1 -
 xlators/mgmt/glusterd/src/glusterd-utils.c             | 1 -
 xlators/mgmt/glusterd/src/glusterd-utils.h             | 1 -
 xlators/mgmt/glusterd/src/glusterd.h                   | 1 -
 xlators/nfs/server/src/acl3.c                          | 1 -
 xlators/nfs/server/src/nfs-fops.c                      | 2 --
 xlators/nfs/server/src/nfs-fops.h                      | 1 -
 xlators/nfs/server/src/nfs-generics.c                  | 1 -
 xlators/nfs/server/src/nfs-inodes.c                    | 1 -
 xlators/nfs/server/src/nfs-inodes.h                    | 1 -
 xlators/nfs/server/src/nfs.c                           | 1 -
 xlators/nfs/server/src/nlm4.c                          | 1 -
 xlators/protocol/client/src/client.c                   | 1 -
 xlators/storage/posix/src/posix-handle.h               | 1 -
 xlators/storage/posix/src/posix.h                      | 1 -
 49 files changed, 55 deletions(-)

(limited to 'xlators')

diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 5e336c2a74c..11594a2b7ae 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 4e29171482a..5218d386c79 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 9099b8c1eee..1afd5d39670 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 ecf94a523db..75b2bf8e22c 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 97397f986b5..14114699594 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 6c625ccf7da..de125296bb3 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 ab5edb1a378..228860401ae 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 5dde1592fb5..80dbcbb06b9 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 d7c210f24a5..f6897333ce7 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 4b63c43057f..b8c09a988ee 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 4231d760cdc..0dfc9df737b 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 e1702c78ba1..a8381adda3d 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 ff9a3da1a2e..7e94c284ed1 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 13b23f9f887..5c7a5b47f3e 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 dec2ba85909..9468f9e1865 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 c6ca422dd6a..fbe9a2ce4b0 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 adab7eb629c..b99ca820e7f 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 a12319fa9b2..d776ed93a3a 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 8b15dfceee7..867b2901cb6 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 3e1d307260a..9d17d595783 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 941b8073f4f..9bf5a65feef 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 027fa294fe8..4785c6dea31 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 44c359ef5c8..faadbff7341 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 3210de1d484..37eb03ac5c3 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 f27e4b0a777..235ecc2dd6d 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 ace419ea439..1b0e4458448 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 acf9da703f0..eacf818bfc6 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 fa88b667c14..b310bc2a109 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 48275c57e12..7139a27ffb4 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 b0fa8aca559..04004c2b2af 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 bbf624b44c5..02c47be8234 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 9e4fe33b558..640468830d5 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 e41f0cd7b75..70692fc0862 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 6747c038773..8ddcc8a9aae 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 381676078cb..d809f2c7963 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 f211f199ce6..e6793d9b751 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 33c6fa38b59..e76ee63edf1 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 2a097b864b2..d56727744cb 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 26fd7986534..ec4b0e3dbbb 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 28b1781f4b1..f3741a40998 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 e511e8ac1de..acf81e2ce12 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 ccfc0ae87c5..7e10ea8978c 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 0dad30ba10e..515622a3d5c 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 9ec94f2befe..40037fbcbb2 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 1f637fd6091..b03f407e1bb 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 04ec79f0a5c..78965469d12 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 6cb5b6b38ca..469302b0dc0 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 9af6a7a5442..c76e618546f 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 b63643d970b..1e19311cb03 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"
-- 
cgit