cleanup: debug.h/dout.h and global_ceph_context changes

- common/dout.h became common/debug.h
- common/debug.h became global/debug.h
- removing magic forward include to global ctx from common/debug.h
- modified some source files to use the right debug.h (common/global)
- modified source files using g_* to include global_context.h

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>

109 files changed, 216 insertions, 135 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 1497b9dd341..aea336d6633 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1262,7 +1262,7 @@ libcommon_files = \
 	common/ceph_context.cc \
 	common/buffer.cc \
 	common/code_environment.cc \
-	common/dout.cc \
+	common/debug.cc \
 	common/signal.cc \
 	common/simple_spin.cc \
 	common/Thread.cc \
@@ -1471,8 +1471,8 @@ noinst_HEADERS = \
 	common/xattr.h\
 	common/blkdev.h\
 	common/compiler_extensions.h\
+	global/debug.h\
 	common/debug.h\
-	common/dout.h\
 	common/escape.h\
 	common/fd.h\
 	common/version.h\
diff --git a/src/auth/cephx/CephxKeyServer.cc b/src/auth/cephx/CephxKeyServer.cc
index c3e4f9cfdc1..03f3bdf9669 100644
--- a/src/auth/cephx/CephxKeyServer.cc
+++ b/src/auth/cephx/CephxKeyServer.cc
@@ -17,6 +17,8 @@
 #include "CephxKeyServer.h"
 #include "common/Timer.h"
 
+#include "global/global_context.h"
+
 #include <sstream>
 
 #define dout_subsys ceph_subsys_auth
diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 3e3edf9b90a..3a8429f94c3 100644
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -39,6 +39,7 @@ using namespace std;
 
 #include "global/global_init.h"
 #include "global/signal_handler.h"
+#include "global/debug.h"
 
 #include "include/assert.h"
 
diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 2965221d2b9..c515b9a10ea 100644
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -38,6 +38,7 @@ using namespace std;
 
 #include "global/global_init.h"
 #include "global/signal_handler.h"
+#include "global/debug.h"
 
 #include "include/color.h"
 #include "common/errno.h"
diff --git a/src/common/OutputDataSocket.cc b/src/common/OutputDataSocket.cc
index e4d21fe13ee..353596fe830 100644
--- a/src/common/OutputDataSocket.cc
+++ b/src/common/OutputDataSocket.cc
@@ -15,7 +15,7 @@
 #include "common/Thread.h"
 #include "common/OutputDataSocket.h"
 #include "common/config.h"
-#include "common/dout.h"
+#include "common/debug.h"
 #include "common/errno.h"
 #include "common/perf_counters.h"
 #include "common/pipe.h"
diff --git a/src/common/Throttle.cc b/src/common/Throttle.cc
index 844263aa111..796f0c5c4fc 100644
--- a/src/common/Throttle.cc
+++ b/src/common/Throttle.cc
@@ -1,6 +1,6 @@
 
 #include "common/Throttle.h"
-#include "common/dout.h"
+#include "common/debug.h"
 #include "common/ceph_context.h"
 #include "common/perf_counters.h"
 
diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc
index dc5519c7882..428f863fa9f 100644
--- a/src/common/admin_socket.cc
+++ b/src/common/admin_socket.cc
@@ -15,7 +15,7 @@
 #include "common/Thread.h"
 #include "common/admin_socket.h"
 #include "common/config.h"
-#include "common/dout.h"
+#include "common/debug.h"
 #include "common/errno.h"
 #include "common/perf_counters.h"
 #include "common/pipe.h"
diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index 3f7d501eb26..defde28b22e 100644
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -18,7 +18,7 @@
 #include "common/code_environment.h"
 #include "common/common_init.h"
 #include "common/config.h"
-#include "common/dout.h"
+#include "common/debug.h"
 #include "common/errno.h"
 #include "common/safe_io.h"
 #include "common/version.h"
diff --git a/src/common/dout.cc b/src/common/debug.cc
index 4bbbfc8fc23..4bbbfc8fc23 100644
--- a/src/common/dout.cc
+++ b/src/common/debug.cc
diff --git a/src/common/debug.h b/src/common/debug.h
index 7d5a785d38a..bf59ec0d21c 100644
--- a/src/common/debug.h
+++ b/src/common/debug.h
@@ -3,7 +3,8 @@
 /*
  * Ceph - scalable distributed file system
  *
- * Copyright (C) 2004-2011 New Dream Network
+ * Copyright (C) 2004-2010 Sage Weil <sage@newdream.net>
+ * Copyright (C) 2010 Dreamhost
  *
  * This is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,22 +13,58 @@
  *
  */
 
-#ifndef CEPH_DEBUG_H
-#define CEPH_DEBUG_H
+#ifndef CEPH_DOUT_H
+#define CEPH_DOUT_H
 
-#include "common/dout.h"
+#include "common/config.h"
+#include "common/likely.h"
+#include "common/Clock.h"
+#include "log/Log.h"
+#include "include/assert.h"
 
-/* Global version of the stuff in common/dout.h
- */
+#include <iostream>
+#include <pthread.h>
+#include <streambuf>
+#include <sstream>
+
+extern void dout_emergency(const char * const str);
+extern void dout_emergency(const std::string &str);
+
+// intentionally conflict with endl
+class _bad_endl_use_dendl_t { public: _bad_endl_use_dendl_t(int) {} };
+static const _bad_endl_use_dendl_t endl = 0;
+inline std::ostream& operator<<(std::ostream& out, _bad_endl_use_dendl_t) {
+  assert(0 && "you are using the wrong endl.. use std::endl or dendl");
+  return out;
+}
 
-#define dout(v) ldout((g_ceph_context), v)
+// generic macros
+#define dout_prefix *_dout
 
-#define pdout(v, p) lpdout((g_ceph_context), v, p)
+#define dout_impl(cct, sub, v)						\
+  do {									\
+  if (cct->_conf->subsys.should_gather(sub, v)) {			\
+    if (0) {								\
+      char __array[((v >= -1) && (v <= 200)) ? 0 : -1] __attribute__((unused)); \
+    }									\
+    ceph::log::Entry *_dout_e = cct->_log->create_entry(v, sub);	\
+    ostream _dout_os(&_dout_e->m_streambuf);				\
+    CephContext *_dout_cct = cct;					\
+    std::ostream* _dout = &_dout_os;
 
-#define generic_dout(v) lgeneric_dout((g_ceph_context), v)
+#define lsubdout(cct, sub, v)  dout_impl(cct, ceph_subsys_##sub, v) dout_prefix
+#define ldout(cct, v)  dout_impl(cct, dout_subsys, v) dout_prefix
+#define lderr(cct) dout_impl(cct, ceph_subsys_, -1) dout_prefix
 
-#define derr lderr((g_ceph_context))
+#define lgeneric_subdout(cct, sub, v) dout_impl(cct, ceph_subsys_##sub, v) *_dout
+#define lgeneric_dout(cct, v) dout_impl(cct, ceph_subsys_, v) *_dout
+#define lgeneric_derr(cct) dout_impl(cct, ceph_subsys_, -1) *_dout
 
-#define generic_derr lgeneric_derr((g_ceph_context))
+// NOTE: depend on magic value in _ASSERT_H so that we detect when
+// /usr/include/assert.h clobbers our fancier version.
+#define dendl std::flush;				\
+  _ASSERT_H->_log->submit_entry(_dout_e);		\
+    }						\
+  } while (0)
 
 #endif
diff --git a/src/common/dout.h b/src/common/dout.h
deleted file mode 100644
index f5536ac9f22..00000000000
--- a/src/common/dout.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-/*
- * Ceph - scalable distributed file system
- *
- * Copyright (C) 2004-2010 Sage Weil <sage@newdream.net>
- * Copyright (C) 2010 Dreamhost
- *
- * This is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software
- * Foundation.  See file COPYING.
- *
- */
-
-#ifndef CEPH_DOUT_H
-#define CEPH_DOUT_H
-
-#include "global/global_context.h"
-#include "common/config.h"
-#include "common/likely.h"
-#include "common/Clock.h"
-#include "log/Log.h"
-#include "include/assert.h"
-
-#include <iostream>
-#include <pthread.h>
-#include <streambuf>
-#include <sstream>
-
-extern void dout_emergency(const char * const str);
-extern void dout_emergency(const std::string &str);
-
-// intentionally conflict with endl
-class _bad_endl_use_dendl_t { public: _bad_endl_use_dendl_t(int) {} };
-static const _bad_endl_use_dendl_t endl = 0;
-inline std::ostream& operator<<(std::ostream& out, _bad_endl_use_dendl_t) {
-  assert(0 && "you are using the wrong endl.. use std::endl or dendl");
-  return out;
-}
-
-// generic macros
-#define dout_prefix *_dout
-
-#define dout_impl(cct, sub, v)						\
-  do {									\
-  if (cct->_conf->subsys.should_gather(sub, v)) {			\
-    if (0) {								\
-      char __array[((v >= -1) && (v <= 200)) ? 0 : -1] __attribute__((unused)); \
-    }									\
-    ceph::log::Entry *_dout_e = cct->_log->create_entry(v, sub);	\
-    ostream _dout_os(&_dout_e->m_streambuf);				\
-    CephContext *_dout_cct = cct;					\
-    std::ostream* _dout = &_dout_os;
-
-#define lsubdout(cct, sub, v)  dout_impl(cct, ceph_subsys_##sub, v) dout_prefix
-#define ldout(cct, v)  dout_impl(cct, dout_subsys, v) dout_prefix
-#define lderr(cct) dout_impl(cct, ceph_subsys_, -1) dout_prefix
-
-#define lgeneric_subdout(cct, sub, v) dout_impl(cct, ceph_subsys_##sub, v) *_dout
-#define lgeneric_dout(cct, v) dout_impl(cct, ceph_subsys_, v) *_dout
-#define lgeneric_derr(cct) dout_impl(cct, ceph_subsys_, -1) *_dout
-
-// NOTE: depend on magic value in _ASSERT_H so that we detect when
-// /usr/include/assert.h clobbers our fancier version.
-#define dendl std::flush;				\
-  _ASSERT_H->_log->submit_entry(_dout_e);		\
-    }						\
-  } while (0)
-
-#endif
diff --git a/src/common/lockdep.cc b/src/common/lockdep.cc
index 7f67ae959fe..44303709a9e 100644
--- a/src/common/lockdep.cc
+++ b/src/common/lockdep.cc
@@ -13,7 +13,7 @@
  */
 #include "BackTrace.h"
 #include "Clock.h"
-#include "common/dout.h"
+#include "common/debug.h"
 #include "common/environment.h"
 #include "include/types.h"
 #include "lockdep.h"
diff --git a/src/common/obj_bencher.cc b/src/common/obj_bencher.cc
index 74d54e16c90..aa7dcfcbbe5 100644
--- a/src/common/obj_bencher.cc
+++ b/src/common/obj_bencher.cc
@@ -15,6 +15,7 @@
  * it will just loop forever.
  */
 #include "common/Cond.h"
+#include "global/global_context.h"
 #include "obj_bencher.h"
 
 #include <iostream>
diff --git a/src/common/perf_counters.cc b/src/common/perf_counters.cc
index 67a777497b3..306ccf430c1 100644
--- a/src/common/perf_counters.cc
+++ b/src/common/perf_counters.cc
@@ -13,7 +13,7 @@
  */
 
 #include "common/perf_counters.h"
-#include "common/dout.h"
+#include "common/debug.h"
 #include "common/errno.h"
 
 #include <errno.h>
diff --git a/src/crushtool.cc b/src/crushtool.cc
index 6584be54d5a..0bf63de8437 100644
--- a/src/crushtool.cc
+++ b/src/crushtool.cc
@@ -19,13 +19,13 @@
 
 #include <fstream>
 
-#include "common/debug.h"
 #include "common/errno.h"
 #include "common/config.h"
 
 #include "common/ceph_argparse.h"
 #include "global/global_context.h"
 #include "global/global_init.h"
+#include "global/debug.h"
 #include "crush/CrushWrapper.h"
 #include "crush/CrushCompiler.h"
 #include "crush/CrushTester.h"
diff --git a/src/dupstore.cc b/src/dupstore.cc
index 33269028342..fb0125c3b95 100644
--- a/src/dupstore.cc
+++ b/src/dupstore.cc
@@ -15,6 +15,7 @@
 #include <iostream>
 #include "os/FileStore.h"
 #include "common/ceph_argparse.h"
+#include "global/global_context.h"
 #include "global/global_init.h"
 
 #include <ext/hash_map>
diff --git a/src/global/debug.h b/src/global/debug.h
new file mode 100644
index 00000000000..ce4deedf3e1
--- /dev/null
+++ b/src/global/debug.h
@@ -0,0 +1,35 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2004-2011 New Dream Network
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation.  See file COPYING.
+ *
+ */
+
+#ifndef CEPH_DEBUG_H
+#define CEPH_DEBUG_H
+
+#include "common/debug.h"
+
+#include "global_context.h"
+
+/* Global version of the stuff in common/dout.h
+ */
+
+#define dout(v) ldout((g_ceph_context), v)
+
+#define pdout(v, p) lpdout((g_ceph_context), v, p)
+
+#define generic_dout(v) lgeneric_dout((g_ceph_context), v)
+
+#define derr lderr((g_ceph_context))
+
+#define generic_derr lgeneric_derr((g_ceph_context))
+
+#endif
diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index 43ce0909565..c35afd8cf75 100644
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -17,7 +17,6 @@
 #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"
@@ -26,6 +25,7 @@
 #include "global/global_init.h"
 #include "global/pidfile.h"
 #include "global/signal_handler.h"
+#include "global/debug.h"
 #include "include/compat.h"
 #include "include/color.h"
 
diff --git a/src/global/pidfile.cc b/src/global/pidfile.cc
index 0de51d6d81d..e7fc9ff6269 100644
--- a/src/global/pidfile.cc
+++ b/src/global/pidfile.cc
@@ -12,9 +12,9 @@
  *
  */
 
-#include "common/debug.h"
 #include "common/errno.h"
 #include "common/safe_io.h"
+#include "global/debug.h"
 #include "global/pidfile.h"
 
 #include <errno.h>
diff --git a/src/global/signal_handler.cc b/src/global/signal_handler.cc
index 2a6260da66d..33915704834 100644
--- a/src/global/signal_handler.cc
+++ b/src/global/signal_handler.cc
@@ -15,8 +15,8 @@
 #include "common/BackTrace.h"
 #include "common/perf_counters.h"
 #include "common/config.h"
-#include "common/debug.h"
 #include "global/pidfile.h"
+#include "global/debug.h"
 #include "global/signal_handler.h"
 
 #include <signal.h>
diff --git a/src/include/Context.h b/src/include/Context.h
index a64bb2de5f6..c23e065a20c 100644
--- a/src/include/Context.h
+++ b/src/include/Context.h
@@ -16,8 +16,8 @@
 #ifndef CEPH_CONTEXT_H
 #define CEPH_CONTEXT_H
 
-#include "common/dout.h"
 #include "include/assert.h"
+#include "common/debug.h"
 
 #include <list>
 #include <set>
diff --git a/src/java/native/libcephfs_jni.cc b/src/java/native/libcephfs_jni.cc
index 09448b75ec4..0d6bad10611 100644
--- a/src/java/native/libcephfs_jni.cc
+++ b/src/java/native/libcephfs_jni.cc
@@ -26,7 +26,7 @@
 #include <jni.h>
 
 #include "include/cephfs/libcephfs.h"
-#include "common/dout.h"
+#include "common/debug.h"
 
 #define dout_subsys ceph_subsys_javaclient
 
diff --git a/src/librbd/AioCompletion.cc b/src/librbd/AioCompletion.cc
index 86b5b504ebd..723cc9705de 100644
--- a/src/librbd/AioCompletion.cc
+++ b/src/librbd/AioCompletion.cc
@@ -4,7 +4,7 @@
 #include <errno.h>
 
 #include "common/ceph_context.h"
-#include "common/dout.h"
+#include "common/debug.h"
 
 #include "librbd/AioRequest.h"
 #include "librbd/internal.h"
diff --git a/src/librbd/AioRequest.cc b/src/librbd/AioRequest.cc
index b9a76e48e0a..51d95885aaf 100644
--- a/src/librbd/AioRequest.cc
+++ b/src/librbd/AioRequest.cc
@@ -2,7 +2,7 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "common/ceph_context.h"
-#include "common/dout.h"
+#include "common/debug.h"
 #include "common/Mutex.h"
 
 #include "librbd/AioCompletion.h"
diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc
index 06dcc6619dd..152d4b84dd1 100644
--- a/src/librbd/ImageCtx.cc
+++ b/src/librbd/ImageCtx.cc
@@ -3,7 +3,7 @@
 #include <errno.h>
 
 #include "common/ceph_context.h"
-#include "common/dout.h"
+#include "common/debug.h"
 #include "common/errno.h"
 #include "common/perf_counters.h"
 
diff --git a/src/librbd/LibrbdWriteback.cc b/src/librbd/LibrbdWriteback.cc
index 6d69a8297e7..5ff73153c47 100644
--- a/src/librbd/LibrbdWriteback.cc
+++ b/src/librbd/LibrbdWriteback.cc
@@ -4,7 +4,7 @@
 #include <errno.h>
 
 #include "common/ceph_context.h"
-#include "common/dout.h"
+#include "common/debug.h"
 #include "common/Mutex.h"
 #include "include/Context.h"
 #include "include/rados/librados.hpp"
diff --git a/src/librbd/WatchCtx.cc b/src/librbd/WatchCtx.cc
index b64e8ef126d..0f0c4142afc 100644
--- a/src/librbd/WatchCtx.cc
+++ b/src/librbd/WatchCtx.cc
@@ -2,7 +2,7 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "common/ceph_context.h"
-#include "common/dout.h"
+#include "common/debug.h"
 #include "common/perf_counters.h"
 
 #include "librbd/ImageCtx.h"
diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 25f723b4b56..309c928ef0c 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -4,7 +4,7 @@
 #include <limits.h>
 
 #include "common/ceph_context.h"
-#include "common/dout.h"
+#include "common/debug.h"
 #include "common/errno.h"
 #include "cls/lock/cls_lock_client.h"
 #include "include/inttypes.h"
diff --git a/src/librbd/librbd.cc b/src/librbd/librbd.cc
index e8194552404..683dda3bbf0 100644
--- a/src/librbd/librbd.cc
+++ b/src/librbd/librbd.cc
@@ -16,7 +16,7 @@
 #include <inttypes.h>
 
 #include "common/Cond.h"
-#include "common/dout.h"
+#include "common/debug.h"
 #include "common/errno.h"
 #include "common/snap_types.h"
 #include "common/perf_counters.h"
diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index e43ecf50fa3..e19e8fe67e8 100644
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -23,6 +23,8 @@
 #include "include/types.h"
 #include "include/lru.h"
 
+#include "global/debug.h"
+
 #include "mdstypes.h"
 #include "flock.h"
 
diff --git a/src/mds/Dumper.h b/src/mds/Dumper.h
index 066ba5ccb1d..74b8c143d6c 100644
--- a/src/mds/Dumper.h
+++ b/src/mds/Dumper.h
@@ -20,6 +20,7 @@
 #include "msg/Dispatcher.h"
 #include "msg/Messenger.h"
 #include "auth/Auth.h"
+#include "global/global_context.h"
 
 /**
  * This class lets you dump out an mds journal for troubleshooting or whatever.
diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h
index dc8969c3cff..6adeb92f4a2 100644
--- a/src/mds/MDSMap.h
+++ b/src/mds/MDSMap.h
@@ -32,6 +32,8 @@ using namespace std;
 #include "include/CompatSet.h"
 #include "common/Formatter.h"
 
+#include "global/global_context.h"
+
 /*
 
  boot  --> standby, creating, or starting.
diff --git a/src/mds/Resetter.h b/src/mds/Resetter.h
index b3bc0677740..0d9e22ae810 100644
--- a/src/mds/Resetter.h
+++ b/src/mds/Resetter.h
@@ -20,6 +20,7 @@
 #include "msg/Dispatcher.h"
 #include "msg/Messenger.h"
 #include "auth/Auth.h"
+#include "global/global_context.h"
 
 /**
  * This class lets you dump out an mds journal for troubleshooting or whatever.
diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 22e754eb2a1..8f820c1b8c4 100644
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -18,6 +18,8 @@ using namespace std;
 #include "include/frag.h"
 #include "include/xlist.h"
 
+#include "global/debug.h"
+
 #include "inode_backtrace.h"
 
 #include <boost/pool/pool.hpp>
diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index 84585912be5..727c1c525a8 100644
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -34,6 +34,8 @@
 #include "common/config.h"
 #include "include/assert.h"
 
+#include "global/debug.h"
+
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, mon, paxos->get_version())
diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index e2ffa6bd571..3483c2438bb 100644
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -23,6 +23,8 @@
 #include "common/config.h"
 #include "include/assert.h"
 
+#include "global/debug.h"
+
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, mon, epoch)
diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc
index f06de5217a0..ccc896c77bf 100644
--- a/src/mon/LogMonitor.cc
+++ b/src/mon/LogMonitor.cc
@@ -30,6 +30,8 @@
 #include "common/config.h"
 #include "include/assert.h"
 
+#include "global/debug.h"
+
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, mon, paxos->get_version())
diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 72168ac9638..03364feac3d 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -35,6 +35,7 @@
 
 #include "common/config.h"
 #include "include/assert.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix
diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index 5a9d6ce96bd..3577fc94ed5 100644
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -12,7 +12,7 @@
 #include "common/ceph_argparse.h"
 #include "common/errno.h"
 
-#include "common/dout.h"
+#include "common/debug.h"
 
 using ceph::Formatter;
 
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index c5d3b5ebca3..7cae0417439 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -71,6 +71,8 @@
 #include "common/config.h"
 #include "include/assert.h"
 
+#include "global/debug.h"
+
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, this)
diff --git a/src/mon/MonitorStore.cc b/src/mon/MonitorStore.cc
index a74b750787c..fa14783ccd2 100644
--- a/src/mon/MonitorStore.cc
+++ b/src/mon/MonitorStore.cc
@@ -14,13 +14,13 @@
 
 #include "MonitorStore.h"
 #include "common/Clock.h"
-#include "common/debug.h"
 #include "common/entity_name.h"
 #include "common/errno.h"
 #include "common/run_cmd.h"
 #include "common/safe_io.h"
 #include "common/config.h"
 #include "common/sync_filesystem.h"
+#include "global/debug.h"
 
 #if defined(__FreeBSD__)
 #include <sys/param.h>
diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 196edeee476..46e0d7e2ca8 100644
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -29,6 +29,8 @@
 #include "common/config.h"
 #include "include/assert.h"
 
+#include "global/debug.h"
+
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, mon)
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 7b49eee72c6..fcbdbdfb07f 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -47,6 +47,8 @@
 #include "include/assert.h"
 #include "include/stringify.h"
 
+#include "global/debug.h"
+
 #define dout_subsys ceph_subsys_mon
 #undef dout_prefix
 #define dout_prefix _prefix(_dout, mon, osdmap)
diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index c679d415468..2791884953f 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -39,6 +39,9 @@
 
 #include "common/config.h"
 #include "common/errno.h"
+
+#include "global/debug.h"
+
 #include <sstream>
 
 #define dout_subsys ceph_subsys_mon
diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index fbe141e3a84..72d5bc76370 100644
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -20,6 +20,7 @@
 
 #include "common/config.h"
 #include "include/assert.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_paxos
 #undef dout_prefix
diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index ef59327012d..07d75e75625 100644
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -18,6 +18,7 @@
 
 #include "common/config.h"
 #include "include/assert.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_paxos
 #undef dout_prefix
diff --git a/src/mon/Session.h b/src/mon/Session.h
index edf5d66ef6f..d343085238a 100644
--- a/src/mon/Session.h
+++ b/src/mon/Session.h
@@ -22,6 +22,8 @@
 
 #include "MonCaps.h"
 
+#include "global/global_context.h"
+
 struct MonSession;
 
 struct Subscription {
diff --git a/src/monmaptool.cc b/src/monmaptool.cc
index 5870e5f81ad..cbc211accb9 100644
--- a/src/monmaptool.cc
+++ b/src/monmaptool.cc
@@ -24,6 +24,7 @@ using namespace std;
 #include "common/config.h"
 #include "common/ceph_argparse.h"
 #include "global/global_init.h"
+#include "global/debug.h"
 #include "mon/MonMap.h"
 #include "include/str_list.h"
 
diff --git a/src/objclass/class_debug.cc b/src/objclass/class_debug.cc
index 7b52fbb7b17..ced943be8a7 100644
--- a/src/objclass/class_debug.cc
+++ b/src/objclass/class_debug.cc
@@ -3,7 +3,7 @@
 
 #include "common/config.h"
 
-#include "common/debug.h"
+#include "global/debug.h"
 #include "objclass/objclass.h"
 
 #include <stdio.h>
diff --git a/src/os/DBObjectMap.cc b/src/os/DBObjectMap.cc
index 10b7b705a4b..3e7539c2414 100644
--- a/src/os/DBObjectMap.cc
+++ b/src/os/DBObjectMap.cc
@@ -15,7 +15,7 @@
 #include "DBObjectMap.h"
 #include <errno.h>
 
-#include "common/debug.h"
+#include "global/debug.h"
 #include "common/config.h"
 #include "include/assert.h"
 
diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
index 5f31406db40..f5b548d1968 100644
--- a/src/os/FileJournal.cc
+++ b/src/os/FileJournal.cc
@@ -12,7 +12,6 @@
  * 
  */
 
-#include "common/debug.h"
 #include "common/errno.h"
 #include "common/safe_io.h"
 #include "FileJournal.h"
@@ -30,6 +29,7 @@
 #include <sys/mount.h>
 
 #include "common/blkdev.h"
+#include "global/debug.h"
 
 
 #define dout_subsys ceph_subsys_journal
diff --git a/src/os/FileJournal.h b/src/os/FileJournal.h
index 0dd880bdfea..11349b87272 100644
--- a/src/os/FileJournal.h
+++ b/src/os/FileJournal.h
@@ -24,6 +24,7 @@ using std::deque;
 #include "common/Mutex.h"
 #include "common/Thread.h"
 #include "common/Throttle.h"
+#include "global/global_context.h"
 
 #ifdef HAVE_LIBAIO
 # include <libaio.h>
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 99cea7f22da..e8e1e6c5427 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -60,7 +60,6 @@
 #include "include/buffer.h"
 
 #include "common/Timer.h"
-#include "common/debug.h"
 #include "common/errno.h"
 #include "common/run_cmd.h"
 #include "common/safe_io.h"
@@ -81,6 +80,7 @@ using ceph::crypto::SHA1;
 #include "include/assert.h"
 
 #include "common/config.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_filestore
 #undef dout_prefix
diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index 0281e94d634..e4b1566fbb8 100644
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -43,6 +43,7 @@ using namespace __gnu_cxx;
 
 #include "include/uuid.h"
 
+#include "global/global_context.h"
 
 // from include/linux/falloc.h:
 #ifndef FALLOC_FL_PUNCH_HOLE
diff --git a/src/os/HashIndex.cc b/src/os/HashIndex.cc
index d0d155c8d18..4107a06bce7 100644
--- a/src/os/HashIndex.cc
+++ b/src/os/HashIndex.cc
@@ -19,7 +19,8 @@
 
 #include "HashIndex.h"
 
-#include "common/debug.h"
+#include "global/debug.h"
+
 #define dout_subsys ceph_subsys_filestore
 
 const string HashIndex::SUBDIR_ATTR = "contents";
diff --git a/src/os/IndexManager.cc b/src/os/IndexManager.cc
index 11bf5c18172..2d8b0e9306e 100644
--- a/src/os/IndexManager.cc
+++ b/src/os/IndexManager.cc
@@ -24,7 +24,6 @@
 #include "common/Mutex.h"
 #include "common/Cond.h"
 #include "common/config.h"
-#include "common/debug.h"
 #include "include/buffer.h"
 
 #include "IndexManager.h"
@@ -33,6 +32,8 @@
 #include "CollectionIndex.h"
 
 #include "chain_xattr.h"
+#include "global/global_context.h"
+#include "global/debug.h"
 
 static int set_version(const char *path, uint32_t version) {
   bufferlist bl;
diff --git a/src/os/JournalingObjectStore.cc b/src/os/JournalingObjectStore.cc
index 971fd15b824..dfdca068372 100644
--- a/src/os/JournalingObjectStore.cc
+++ b/src/os/JournalingObjectStore.cc
@@ -2,7 +2,7 @@
 
 #include "JournalingObjectStore.h"
 
-#include "common/debug.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_journal
 #undef dout_prefix
diff --git a/src/os/JournalingObjectStore.h b/src/os/JournalingObjectStore.h
index 338ac87ec21..82b9ed5c252 100644
--- a/src/os/JournalingObjectStore.h
+++ b/src/os/JournalingObjectStore.h
@@ -17,6 +17,7 @@
 
 #include "ObjectStore.h"
 #include "Journal.h"
+#include "global/global_context.h"
 #include "common/RWLock.h"
 
 class JournalingObjectStore : public ObjectStore {
diff --git a/src/osd/Ager.cc b/src/osd/Ager.cc
index a90b1c1855d..01e6745f16e 100644
--- a/src/osd/Ager.cc
+++ b/src/osd/Ager.cc
@@ -7,8 +7,8 @@
 #include "os/ObjectStore.h"
 
 #include "common/Clock.h"
-#include "common/debug.h"
 #include "global/global_context.h"
+#include "global/debug.h"
 
 // ick
 #include <sys/types.h>
diff --git a/src/osd/ClassHandler.cc b/src/osd/ClassHandler.cc
index 5ff8e73309c..e27f6c5ef2b 100644
--- a/src/osd/ClassHandler.cc
+++ b/src/osd/ClassHandler.cc
@@ -13,6 +13,7 @@
 #endif
 
 #include "common/config.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_osd
 #undef dout_prefix
diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc
index 468983d88d1..2999f7e8b5d 100644
--- a/src/osd/OpRequest.cc
+++ b/src/osd/OpRequest.cc
@@ -4,12 +4,13 @@
 #include "common/Formatter.h"
 #include <iostream>
 #include <vector>
-#include "common/debug.h"
 #include "common/config.h"
 #include "msg/Message.h"
 #include "messages/MOSDOp.h"
 #include "messages/MOSDSubOp.h"
 #include "include/assert.h"
+#include "global/global_context.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_optracker
 #undef dout_prefix
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index c25cce15df5..cd177f044e7 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -33,6 +33,8 @@
 #include "messages/MOSDSubOp.h"
 #include "messages/MOSDSubOpReply.h"
 
+#include "global/debug.h"
+
 #include <sstream>
 
 #define dout_subsys ceph_subsys_osd
diff --git a/src/osd/PG.h b/src/osd/PG.h
index acaa89708d6..8556fd21e43 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -44,6 +44,8 @@
 
 #include "common/DecayCounter.h"
 
+#include "global/global_context.h"
+
 #include <list>
 #include <memory>
 #include <string>
diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index fbc1b65571c..5d737e946a7 100644
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -23,6 +23,9 @@
 #include "messages/MOSDOp.h"
 #include "messages/MOSDOpReply.h"
 #include "messages/MOSDSubOp.h"
+
+#include "global/debug.h"
+
 class MOSDSubOpReply;
 
 class PGLSFilter {
diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index 544ac8c49c4..172b769915f 100644
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -13,7 +13,7 @@
  */
 
 #include "common/perf_counters.h"
-#include "common/dout.h"
+#include "common/debug.h"
 #include "include/Context.h"
 #include "msg/Messenger.h"
 #include "osdc/Journaler.h"
diff --git a/src/osdmaptool.cc b/src/osdmaptool.cc
index d367c36bf18..d4705390ee3 100644
--- a/src/osdmaptool.cc
+++ b/src/osdmaptool.cc
@@ -28,6 +28,7 @@ using namespace std;
 #include "mon/MonMap.h"
 #include "common/ceph_argparse.h"
 #include "global/global_init.h"
+#include "global/debug.h"
 
 void usage()
 {
diff --git a/src/perfglue/heap_profiler.cc b/src/perfglue/heap_profiler.cc
index 550f7f924c6..9b3eaf93798 100644
--- a/src/perfglue/heap_profiler.cc
+++ b/src/perfglue/heap_profiler.cc
@@ -18,7 +18,7 @@
 #include "common/environment.h"
 #include "common/LogClient.h"
 #include "global/global_context.h"
-#include "common/debug.h"
+#include "global/debug.h"
 
 bool ceph_using_tcmalloc()
 {
diff --git a/src/rados.cc b/src/rados.cc
index a87025574a4..f7b3c8e9a34 100644
--- a/src/rados.cc
+++ b/src/rados.cc
@@ -21,8 +21,8 @@ using namespace librados;
 #include "common/config.h"
 #include "common/ceph_argparse.h"
 #include "global/global_init.h"
+#include "global/debug.h"
 #include "common/Cond.h"
-#include "common/debug.h"
 #include "common/errno.h"
 #include "common/Formatter.h"
 #include "common/obj_bencher.h"
diff --git a/src/rbd.cc b/src/rbd.cc
index 3920d4b9d55..bd47ae1cfa1 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -19,6 +19,7 @@
 #include "auth/KeyRing.h"
 #include "common/errno.h"
 #include "common/ceph_argparse.h"
+#include "global/global_context.h"
 #include "global/global_init.h"
 #include "common/safe_io.h"
 #include "common/secret.h"
diff --git a/src/rgw/librgw.cc b/src/rgw/librgw.cc
index 556f57f3ba0..c8b8b8153d5 100644
--- a/src/rgw/librgw.cc
+++ b/src/rgw/librgw.cc
@@ -19,7 +19,7 @@
 #include "common/ceph_argparse.h"
 #include "common/ceph_context.h"
 #include "common/common_init.h"
-#include "common/dout.h"
+#include "common/debug.h"
 
 #include <errno.h>
 #include <sstream>
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index fb419d93b4c..ae3baa20dca 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -10,6 +10,7 @@ using namespace std;
 #include "common/ceph_argparse.h"
 #include "common/Formatter.h"
 #include "global/global_init.h"
+#include "global/debug.h"
 #include "common/errno.h"
 #include "include/utime.h"
 #include "include/str_list.h"
diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index 8564fdd985a..8a1e423af95 100644
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -12,6 +12,7 @@
 #include "common/perf_counters.h"
 #include "include/str_list.h"
 #include "auth/Crypto.h"
+#include "global/debug.h"
 
 #include <sstream>
 
diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 4b808fcbe74..ea7bff0b54c 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -16,7 +16,6 @@
 #define CEPH_RGW_COMMON_H
 
 #include "common/ceph_crypto.h"
-#include "common/debug.h"
 #include "common/perf_counters.h"
 
 #include "acconfig.h"
diff --git a/src/rgw/rgw_gc.cc b/src/rgw/rgw_gc.cc
index d7861e61250..7dbdf485b6e 100644
--- a/src/rgw/rgw_gc.cc
+++ b/src/rgw/rgw_gc.cc
@@ -1,5 +1,3 @@
-
-
 #include "rgw_gc.h"
 #include "include/rados/librados.hpp"
 #include "cls/rgw/cls_rgw_client.h"
@@ -7,6 +5,8 @@
 #include "cls/lock/cls_lock_client.h"
 #include "auth/Crypto.h"
 
+#include "global/debug.h"
+
 #include <list>
 
 #define dout_subsys ceph_subsys_rgw
diff --git a/src/rgw/rgw_http_client.cc b/src/rgw/rgw_http_client.cc
index 4c7b99c17c3..1a90cc52f50 100644
--- a/src/rgw/rgw_http_client.cc
+++ b/src/rgw/rgw_http_client.cc
@@ -1,6 +1,7 @@
 #include <curl/curl.h>
 #include <curl/easy.h>
 
+#include "global/debug.h"
 #include "rgw_common.h"
 #include "rgw_http_client.h"
 
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 3165ab0454a..b1c0e5107da 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -20,8 +20,10 @@
 #include "rgw_fcgi.h"
 
 #include "common/ceph_argparse.h"
+#include "global/global_context.h"
 #include "global/global_init.h"
 #include "global/signal_handler.h"
+#include "global/debug.h"
 #include "common/config.h"
 #include "common/errno.h"
 #include "common/WorkQueue.h"
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index cfb7d177926..b0e8e675fc8 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -8,6 +8,7 @@
 #include "common/armor.h"
 #include "common/mime.h"
 #include "common/utf8.h"
+#include "global/debug.h"
 
 #include "rgw_rados.h"
 #include "rgw_op.h"
diff --git a/src/rgw/rgw_policy_s3.cc b/src/rgw/rgw_policy_s3.cc
index c0a88b485b2..80137c8790c 100644
--- a/src/rgw/rgw_policy_s3.cc
+++ b/src/rgw/rgw_policy_s3.cc
@@ -1,11 +1,12 @@
 
 #include <errno.h>
 
+#include "global/debug.h"
+
 #include "rgw_policy_s3.h"
 #include "rgw_json.h"
 #include "rgw_common.h"
 
-
 #define dout_subsys ceph_subsys_rgw
 
 class RGWPolicyCondition {
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 70220b4176d..ce292540dee 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -16,6 +16,7 @@
 #include "rgw_tools.h"
 
 #include "common/Clock.h"
+#include "global/debug.h"
 
 #include "include/rados/librados.hpp"
 using namespace librados;
diff --git a/src/rgw/rgw_resolve.cc b/src/rgw/rgw_resolve.cc
index 80d94f7153d..21b72adfcf9 100644
--- a/src/rgw/rgw_resolve.cc
+++ b/src/rgw/rgw_resolve.cc
@@ -3,6 +3,7 @@
 #include <arpa/nameser.h>
 #include <resolv.h>
 
+#include "global/debug.h"
 #include "rgw_common.h"
 #include "rgw_resolve.h"
 
diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index c8c0bacf0a0..7163f50d156 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -4,6 +4,7 @@
 #include "common/Formatter.h"
 #include "common/utf8.h"
 #include "include/str_list.h"
+#include "global/debug.h"
 #include "rgw_common.h"
 #include "rgw_rados.h"
 #include "rgw_formats.h"
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index b2925940f77..9ac533b5fa0 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -4,6 +4,7 @@
 #include "common/ceph_crypto.h"
 #include "common/Formatter.h"
 #include "common/utf8.h"
+#include "global/debug.h"
 
 #include "rgw_rest.h"
 #include "rgw_rest_s3.h"
diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index 64614b5f59b..e8a6ac66add 100644
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -1,6 +1,7 @@
 
 #include "common/Formatter.h"
 #include "common/utf8.h"
+#include "global/debug.h"
 #include "rgw_swift.h"
 #include "rgw_rest_swift.h"
 #include "rgw_acl_swift.h"
diff --git a/src/rgw/rgw_swift.cc b/src/rgw/rgw_swift.cc
index 9bb7cecad82..988e6742a20 100644
--- a/src/rgw/rgw_swift.cc
+++ b/src/rgw/rgw_swift.cc
@@ -11,6 +11,8 @@
 
 #include "include/str_list.h"
 
+#include "global/global_context.h"
+#include "global/debug.h"
 #include "common/ceph_crypto_cms.h"
 #include "common/armor.h"
 
diff --git a/src/rgw/rgw_swift_auth.cc b/src/rgw/rgw_swift_auth.cc
index b0be5d45938..991132f9c75 100644
--- a/src/rgw/rgw_swift_auth.cc
+++ b/src/rgw/rgw_swift_auth.cc
@@ -1,6 +1,7 @@
 #include "rgw_swift_auth.h"
 #include "rgw_rest.h"
 
+#include "global/debug.h"
 #include "common/ceph_crypto.h"
 #include "common/Clock.h"
 
diff --git a/src/streamtest.cc b/src/streamtest.cc
index 21693ac8713..f3c53a3c45b 100644
--- a/src/streamtest.cc
+++ b/src/streamtest.cc
@@ -14,6 +14,7 @@
 
 #include <iostream>
 #include "os/FileStore.h"
+#include "global/global_context.h"
 #include "global/global_init.h"
 #include "common/ceph_argparse.h"
 #include "common/debug.h"
diff --git a/src/test/ObjectMap/test_keyvaluedb_iterators.cc b/src/test/ObjectMap/test_keyvaluedb_iterators.cc
index e5c9089916c..82ac3a979f1 100644
--- a/src/test/ObjectMap/test_keyvaluedb_iterators.cc
+++ b/src/test/ObjectMap/test_keyvaluedb_iterators.cc
@@ -20,6 +20,7 @@
 #include "os/KeyValueDB.h"
 #include "os/LevelDBStore.h"
 #include <sys/types.h>
+#include "global/global_context.h"
 #include "global/global_init.h"
 #include "common/ceph_argparse.h"
 #include "gtest/gtest.h"
diff --git a/src/test/ObjectMap/test_object_map.cc b/src/test/ObjectMap/test_object_map.cc
index e536be3b847..c33d85d7c2d 100644
--- a/src/test/ObjectMap/test_object_map.cc
+++ b/src/test/ObjectMap/test_object_map.cc
@@ -11,6 +11,7 @@
 #include "os/HashIndex.h"
 #include "os/LevelDBStore.h"
 #include <sys/types.h>
+#include "global/global_context.h"
 #include "global/global_init.h"
 #include "common/ceph_argparse.h"
 #include <dirent.h>
diff --git a/src/test/TestSignalHandlers.cc b/src/test/TestSignalHandlers.cc
index ae0bc2ae3e3..5856a3275f6 100644
--- a/src/test/TestSignalHandlers.cc
+++ b/src/test/TestSignalHandlers.cc
@@ -19,8 +19,8 @@
  */
 #include "common/ceph_argparse.h"
 #include "global/global_init.h"
+#include "global/debug.h"
 #include "common/errno.h"
-#include "common/debug.h"
 #include "common/config.h"
 
 #include <errno.h>
diff --git a/src/test/TestTimers.cc b/src/test/TestTimers.cc
index 6e6f47351e6..ffb4920d55b 100644
--- a/src/test/TestTimers.cc
+++ b/src/test/TestTimers.cc
@@ -1,6 +1,7 @@
 #include "common/ceph_argparse.h"
 #include "common/Mutex.h"
 #include "common/Timer.h"
+#include "global/global_context.h"
 #include "global/global_init.h"
 
 #include <iostream>
diff --git a/src/test/bench/filestore_backend.cc b/src/test/bench/filestore_backend.cc
index 44abee98b6b..2f6ee744872 100644
--- a/src/test/bench/filestore_backend.cc
+++ b/src/test/bench/filestore_backend.cc
@@ -1,6 +1,7 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 
 #include "filestore_backend.h"
+#include "global/global_context.h"
 #include "global/global_init.h"
 #include "os/ObjectStore.h"
 
diff --git a/src/test/bench/tp_bench.cc b/src/test/bench/tp_bench.cc
index daee79024ec..cc503a6e11e 100644
--- a/src/test/bench/tp_bench.cc
+++ b/src/test/bench/tp_bench.cc
@@ -20,6 +20,7 @@
 #include "rados_backend.h"
 #include "detailed_stat_collector.h"
 #include "distribution.h"
+#include "global/global_context.h"
 #include "global/global_init.h"
 #include "common/WorkQueue.h"
 #include "common/Semaphore.h"
diff --git a/src/test/bench_log.cc b/src/test/bench_log.cc
index 425f3986ce6..38bbd077737 100644
--- a/src/test/bench_log.cc
+++ b/src/test/bench_log.cc
@@ -3,11 +3,11 @@
 
 #include "include/types.h"
 #include "common/Thread.h"
-#include "common/debug.h"
 #include "common/Clock.h"
 #include "common/config.h"
 #include "common/ceph_argparse.h"
 #include "global/global_init.h"
+#include "global/debug.h"
 
 struct T : public Thread {
   int num;
diff --git a/src/test/filestore/DeterministicOpSequence.cc b/src/test/filestore/DeterministicOpSequence.cc
index c347df3b2a3..855ff7d47b3 100644
--- a/src/test/filestore/DeterministicOpSequence.cc
+++ b/src/test/filestore/DeterministicOpSequence.cc
@@ -21,7 +21,7 @@
 #include "os/FileStore.h"
 #include "common/ceph_argparse.h"
 #include "global/global_init.h"
-#include "common/debug.h"
+#include "global/debug.h"
 #include <boost/scoped_ptr.hpp>
 #include <boost/lexical_cast.hpp>
 
diff --git a/src/test/filestore/FileStoreDiff.cc b/src/test/filestore/FileStoreDiff.cc
index b2419f5e298..e2df7f8d708 100644
--- a/src/test/filestore/FileStoreDiff.cc
+++ b/src/test/filestore/FileStoreDiff.cc
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <map>
 #include <boost/scoped_ptr.hpp>
-#include "common/debug.h"
+#include "global/debug.h"
 #include "os/FileStore.h"
 #include "common/config.h"
 
diff --git a/src/test/filestore/TestFileStoreState.cc b/src/test/filestore/TestFileStoreState.cc
index 728d6e4c0ed..238833097b3 100644
--- a/src/test/filestore/TestFileStoreState.cc
+++ b/src/test/filestore/TestFileStoreState.cc
@@ -19,7 +19,7 @@
 #include "os/FileStore.h"
 #include "common/ceph_argparse.h"
 #include "global/global_init.h"
-#include "common/debug.h"
+#include "global/debug.h"
 #include <boost/scoped_ptr.hpp>
 #include <boost/lexical_cast.hpp>
 #include "TestFileStoreState.h"
diff --git a/src/test/filestore/test_idempotent.cc b/src/test/filestore/test_idempotent.cc
index f49aded6152..9e2d83b5f99 100644
--- a/src/test/filestore/test_idempotent.cc
+++ b/src/test/filestore/test_idempotent.cc
@@ -17,8 +17,8 @@
 #include <boost/scoped_ptr.hpp>
 #include "os/FileStore.h"
 #include "global/global_init.h"
+#include "global/debug.h"
 #include "common/ceph_argparse.h"
-#include "common/debug.h"
 #include "test/common/ObjectContents.h"
 #include "FileStoreTracker.h"
 #include "os/LevelDBStore.h"
diff --git a/src/test/filestore/test_idempotent_sequence.cc b/src/test/filestore/test_idempotent_sequence.cc
index 818a2554c35..94d4d858d1e 100644
--- a/src/test/filestore/test_idempotent_sequence.cc
+++ b/src/test/filestore/test_idempotent_sequence.cc
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include "common/ceph_argparse.h"
 #include "global/global_init.h"
-#include "common/debug.h"
+#include "global/debug.h"
 #include "os/FileStore.h"
 
 #include "DeterministicOpSequence.h"
diff --git a/src/test/filestore/workload_generator.cc b/src/test/filestore/workload_generator.cc
index f97bc66f106..9f8a4692d88 100644
--- a/src/test/filestore/workload_generator.cc
+++ b/src/test/filestore/workload_generator.cc
@@ -23,11 +23,10 @@
 #include "os/FileStore.h"
 #include "common/ceph_argparse.h"
 #include "global/global_init.h"
-#include "common/debug.h"
+#include "global/debug.h"
 #include <boost/scoped_ptr.hpp>
 #include <boost/lexical_cast.hpp>
 #include "workload_generator.h"
-#include "common/debug.h"
 #include "include/assert.h"
 
 #include "TestFileStoreState.h"
diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc
index d02da22a23b..8c7cd482ed0 100644
--- a/src/test/mon/test_mon_workloadgen.cc
+++ b/src/test/mon/test_mon_workloadgen.cc
@@ -31,8 +31,8 @@
 #include "common/ceph_argparse.h"
 #include "global/global_init.h"
 #include "global/signal_handler.h"
+#include "global/debug.h"
 #include "common/config.h"
-#include "common/debug.h"
 #include "common/errno.h"
 #include "common/Cond.h"
 #include "common/Mutex.h"
diff --git a/src/test/osdc/object_cacher_stress.cc b/src/test/osdc/object_cacher_stress.cc
index 74d707686e8..30b71acbc9e 100644
--- a/src/test/osdc/object_cacher_stress.cc
+++ b/src/test/osdc/object_cacher_stress.cc
@@ -13,6 +13,7 @@
 #include "common/config.h"
 #include "common/Mutex.h"
 #include "common/snap_types.h"
+#include "global/global_context.h"
 #include "global/global_init.h"
 #include "include/atomic.h"
 #include "include/buffer.h"
diff --git a/src/test/test_filejournal.cc b/src/test/test_filejournal.cc
index c3af26bc3e4..1131333d8e2 100644
--- a/src/test/test_filejournal.cc
+++ b/src/test/test_filejournal.cc
@@ -3,6 +3,7 @@
 
 #include "common/ceph_argparse.h"
 #include "common/common_init.h"
+#include "global/global_context.h"
 #include "global/global_init.h"
 #include "common/config.h"
 #include "common/Finisher.h"
diff --git a/src/test/test_mutate.cc b/src/test/test_mutate.cc
index f2feda11d48..a9dd891233e 100644
--- a/src/test/test_mutate.cc
+++ b/src/test/test_mutate.cc
@@ -19,6 +19,7 @@
 #include "common/ceph_argparse.h"
 #include "common/debug.h"
 #include "common/config.h"
+#include "global/global_context.h"
 #include "global/global_init.h"
 #include "include/rados/librados.hpp"
 #include "include/types.h"
diff --git a/src/test_trans.cc b/src/test_trans.cc
index 43821c13aec..2c69c7b6581 100644
--- a/src/test_trans.cc
+++ b/src/test_trans.cc
@@ -14,9 +14,9 @@
 
 #include <iostream>
 #include "common/ceph_argparse.h"
-#include "common/debug.h"
 #include "os/FileStore.h"
 #include "global/global_init.h"
+#include "global/debug.h"
 #include "include/assert.h"
 
 #define dout_subsys ceph_subsys_filestore
diff --git a/src/testcrypto.cc b/src/testcrypto.cc
index 0b7a9d54742..b04463c9f92 100644
--- a/src/testcrypto.cc
+++ b/src/testcrypto.cc
@@ -2,7 +2,9 @@
 #include "common/Clock.h"
 
 #include "common/config.h"
-#include "common/debug.h"
+
+#include "global/global_context.h"
+#include "global/debug.h"
 
 #define dout_subsys ceph_subsys_auth
 
diff --git a/src/testkeys.cc b/src/testkeys.cc
index 27c38124ade..2f1e0328e65 100644
--- a/src/testkeys.cc
+++ b/src/testkeys.cc
@@ -1,6 +1,8 @@
 #include "auth/cephx/CephxKeyServer.h"
 #include "common/ceph_argparse.h"
+#include "global/global_context.h"
 #include "global/global_init.h"
+#include "global/debug.h"
 #include "common/config.h"
 
 #define AES_KEY_LEN	16
diff --git a/src/testmsgr.cc b/src/testmsgr.cc
index eb716b9013e..6bc831ce256 100644
--- a/src/testmsgr.cc
+++ b/src/testmsgr.cc
@@ -25,7 +25,9 @@ using namespace std;
 #include "messages/MPing.h"
 
 #include "common/Timer.h"
+#include "global/global_context.h"
 #include "global/global_init.h"
+#include "global/debug.h"
 #include "common/ceph_argparse.h"
 
 #ifndef DARWIN
diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc
index d5300e69bdd..b36bf1d6edf 100644
--- a/src/tools/ceph.cc
+++ b/src/tools/ceph.cc
@@ -29,6 +29,7 @@
 
 #include "common/ceph_argparse.h"
 #include "global/global_init.h"
+#include "global/debug.h"
 #include "common/errno.h"
 #include "common/safe_io.h"
 #include "common/config.h"
diff --git a/src/tools/common.cc b/src/tools/common.cc
index 9a3763a34ae..b51c75523d7 100644
--- a/src/tools/common.cc
+++ b/src/tools/common.cc
@@ -44,7 +44,7 @@ extern "C" {
 #include "common/Mutex.h"
 #include "common/Timer.h"
 #include "global/global_init.h"
-
+#include "global/debug.h"
 
 #include "include/assert.h"