path: root/xlators/lib/src
diff options
authorYaniv Kaul <>2019-06-09 13:31:31 +0300
committerAmar Tumballi <>2019-06-14 16:50:32 +0000
commit0a6fe8551ac9807a8b6ad62241ec8048cf9f9025 (patch)
tree7f6d6b7920ed775c75ca7b4a3dd14aceef5eec38 /xlators/lib/src
parent65e3624091e895ca32cd91468552589f34d17595 (diff)
multiple files: another attempt to remove includes
There are many include statements that are not needed. A previous more ambitious attempt failed because of *BSD plafrom (see ) Now trying a more conservative reduction. It does not solve all circular deps that we have, but it does reduce some of them. There is just too much to handle reasonably (dht-common.h includes dht-lock.h which includes dht-common.h ...), but it does reduce the overall number of lines of include we need to look at in the future to understand and fix the mess later one. Change-Id: I550cd001bdefb8be0fe67632f783c0ef6bee3f9f updates: bz#1193929 Signed-off-by: Yaniv Kaul <>
Diffstat (limited to 'xlators/lib/src')
2 files changed, 6 insertions, 4 deletions
diff --git a/xlators/lib/src/libxlator.c b/xlators/lib/src/libxlator.c
index 724ceef5f2a..8075fa0c29f 100644
--- a/xlators/lib/src/libxlator.c
+++ b/xlators/lib/src/libxlator.c
@@ -7,7 +7,7 @@
later), or the GNU General Public License, version 2 (GPLv2), in all
cases as published by the Free Software Foundation.
-#include <glusterfs/mem-types.h>
#include "libxlator.h"
int marker_xtime_default_gauge[] = {
diff --git a/xlators/lib/src/libxlator.h b/xlators/lib/src/libxlator.h
index d17a1e21891..81da4060d55 100644
--- a/xlators/lib/src/libxlator.h
+++ b/xlators/lib/src/libxlator.h
@@ -10,10 +10,12 @@
#ifndef _LIBXLATOR_H
#define _LIBXLATOR_H
-#include <glusterfs/xlator.h>
-#include <glusterfs/logging.h>
#include <glusterfs/defaults.h>
-#include <glusterfs/common-utils.h>
+#include <stdint.h> // for int32_t
+#include "glusterfs/dict.h" // for dict_t, data_t
+#include "glusterfs/globals.h" // for xlator_t, loc_t
+#include "glusterfs/stack.h" // for call_frame_t
#include <glusterfs/compat.h>
#include <glusterfs/compat-errno.h>