From: chenxiaowei <cxwshawn@gmail.com>
Date: Sat, 21 May 2016 03:48:32 +0000 (+0100)
Subject: global: optimize header file dependency.
X-Git-Tag: v11.0.0~452^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4adf35d6fc8971a5bd208a56a7378041c409a57a;p=ceph.git

global: optimize header file dependency.

Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
---

diff --git a/src/global/global_context.h b/src/global/global_context.h
index bf59c7840fac..29e5a973eb51 100644
--- a/src/global/global_context.h
+++ b/src/global/global_context.h
@@ -15,10 +15,7 @@
 #ifndef CEPH_GLOBAL_CONTEXT_H
 #define CEPH_GLOBAL_CONTEXT_H
 
-#include "common/ceph_context.h"
-
-#include <stdint.h>
-
+class CephContext;
 struct md_config_t;
 
 extern CephContext *g_ceph_context;
diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index fa1fe7a2f1ae..46bfb936235e 100644
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -12,29 +12,22 @@
  *
  */
 
-#include "common/Thread.h"
 #include "common/ceph_argparse.h"
 #include "common/code_environment.h"
-#include "common/common_init.h"
 #include "common/config.h"
 #include "common/debug.h"
 #include "common/errno.h"
-#include "common/safe_io.h"
 #include "common/signal.h"
 #include "common/version.h"
-#include "common/admin_socket.h"
 #include "global/global_context.h"
 #include "global/global_init.h"
 #include "global/pidfile.h"
 #include "global/signal_handler.h"
 #include "include/compat.h"
-#include "include/color.h"
 
 #include <pwd.h>
 #include <grp.h>
-
 #include <errno.h>
-#include <deque>
 
 #define dout_subsys ceph_subsys_
 
diff --git a/src/global/global_init.h b/src/global/global_init.h
index 79c0bad5c7e5..ad3fd6286a35 100644
--- a/src/global/global_init.h
+++ b/src/global/global_init.h
@@ -15,9 +15,7 @@
 #ifndef CEPH_COMMON_GLOBAL_INIT_H
 #define CEPH_COMMON_GLOBAL_INIT_H
 
-#include <deque>
 #include <stdint.h>
-#include <string>
 #include <vector>
 
 #include "common/code_environment.h"
diff --git a/src/global/signal_handler.cc b/src/global/signal_handler.cc
index f0b3b53129aa..86e90e9ebcab 100644
--- a/src/global/signal_handler.cc
+++ b/src/global/signal_handler.cc
@@ -13,8 +13,6 @@
  */
 
 #include "common/BackTrace.h"
-#include "common/perf_counters.h"
-#include "common/config.h"
 #include "common/debug.h"
 #include "global/pidfile.h"
 #include "global/signal_handler.h"
diff --git a/src/global/signal_handler.h b/src/global/signal_handler.h
index d768e4e47c72..476724201aa9 100644
--- a/src/global/signal_handler.h
+++ b/src/global/signal_handler.h
@@ -16,8 +16,6 @@
 #define CEPH_GLOBAL_SIGNAL_HANDLER_H
 
 #include <signal.h>
-#include <string>
-
 #include "acconfig.h"
 
 typedef void (*signal_handler_t)(int);