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 bf59c7840fac89d0f93700284f404c09cd94d626..29e5a973eb51d7a8e17ea9c85eb8f3cf3299a67e 100644 (file)
--- 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 fa1fe7a2f1aecb0ba9ea7336a7a56d462429b5e1..46bfb936235e4d62dee1e6ddf31551cf47a71cc7 100644 (file)
--- 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 79c0bad5c7e5d8541d85177276733cc10acaeb7d..ad3fd6286a356b644f7a020e51c40f3285b33ece 100644 (file)
--- 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 f0b3b53129aabefa1ea9bd0da819ad692d4da8d9..86e90e9ebcabe7965672212212752766ad1c044d 100644 (file)
--- 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 d768e4e47c7243e4e219c2eb8c3944067401596f..476724201aa9943d7f11e6f38ce9df71e71f92c9 100644 (file)
--- 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);