From 0a6fe8551ac9807a8b6ad62241ec8048cf9f9025 Mon Sep 17 00:00:00 2001
From: Yaniv Kaul <ykaul@redhat.com>
Date: Sun, 9 Jun 2019 13:31:31 +0300
Subject: 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 https://review.gluster.org/#/c/glusterfs/+/21929/ )

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 <ykaul@redhat.com>
---
 api/src/glfs-master.c | 6 ------
 api/src/glfs-mgmt.c   | 7 -------
 2 files changed, 13 deletions(-)

(limited to 'api')

diff --git a/api/src/glfs-master.c b/api/src/glfs-master.c
index b4473b16604..4bc69d1f3d8 100644
--- a/api/src/glfs-master.c
+++ b/api/src/glfs-master.c
@@ -8,14 +8,8 @@
   cases as published by the Free Software Foundation.
 */
 
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
-#include <inttypes.h>
-#include <limits.h>
 
-#include <glusterfs/xlator.h>
 #include <glusterfs/glusterfs.h>
 
 #include "glfs-internal.h"
diff --git a/api/src/glfs-mgmt.c b/api/src/glfs-mgmt.c
index 7476d5b64f3..66a13432f38 100644
--- a/api/src/glfs-mgmt.c
+++ b/api/src/glfs-mgmt.c
@@ -18,22 +18,15 @@
 #include <glusterfs/glusterfs.h>
 #include "glfs.h"
 #include <glusterfs/dict.h>
-#include <glusterfs/gf-event.h>
-#include <glusterfs/defaults.h>
 
 #include "rpc-clnt.h"
 #include "protocol-common.h"
-#include "glusterfs3.h"
-#include "portmap-xdr.h"
-#include "xdr-common.h"
 #include "xdr-generic.h"
 #include "rpc-common-xdr.h"
 
 #include <glusterfs/syncop.h>
-#include <glusterfs/xlator.h>
 
 #include "glfs-internal.h"
-#include "glfs-mem-types.h"
 #include "gfapi-messages.h"
 #include <glusterfs/syscall.h>
 
-- 
cgit