4 files changed, 27 insertions, 33 deletions
diff --git a/src/tools/ceph.cc b/src/tools/ceph.cc
index b36bf1d6edf..ae767f19083 100644
--- a/src/tools/ceph.cc
+++ b/src/tools/ceph.cc
@@ -27,16 +27,16 @@
 #include <unistd.h>
 #include <string.h>
 
+#include "include/compat.h"
+#include "include/assert.h"
 #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"
-#include "tools/common.h"
+#include "global/global_init.h"
+#include "global/debug.h"
 
-#include "include/compat.h"
-#include "include/assert.h"
+#include "common.h"
 
 using std::vector;
 
diff --git a/src/tools/common.cc b/src/tools/common.cc
index b51c75523d7..031d2e3a507 100644
--- a/src/tools/common.cc
+++ b/src/tools/common.cc
@@ -12,41 +12,35 @@
  * 
  */
 
+#include "acconfig.h"
+
 #include <sys/stat.h>
 #include <iostream>
 #include <string>
-using namespace std;
+#include <memory>
+#include <sys/types.h>
+#include <fcntl.h>
 
 #if !defined(DARWIN) && !defined(__FreeBSD__)
 #include <envz.h>
 #endif // DARWIN
 
-#include <memory>
-#include <sys/types.h>
-#include <fcntl.h>
-
 extern "C" {
 #include <histedit.h>
 }
 
-#include "acconfig.h"
-#include "messages/MMonCommand.h"
-#include "messages/MMonCommandAck.h"
-#include "messages/MLog.h"
-#include "mon/MonClient.h"
+#include "include/assert.h"
+#include "common/errno.h"
 #include "mon/MonMap.h"
-#include "osd/OSDMap.h"
 #include "msg/SimpleMessenger.h"
-#include "tools/common.h"
-
-#include "common/errno.h"
-#include "common/Cond.h"
-#include "common/Mutex.h"
-#include "common/Timer.h"
 #include "global/global_init.h"
 #include "global/debug.h"
 
-#include "include/assert.h"
+#include "messages/MMonCommand.h"
+
+#include "common.h"
+
+using namespace std;
 
 #define dout_subsys ceph_subsys_
 
diff --git a/src/tools/common.h b/src/tools/common.h
index 2a303675a15..cb0a1b43856 100644
--- a/src/tools/common.h
+++ b/src/tools/common.h
@@ -3,28 +3,28 @@
 #ifndef CEPH_TOOLS_COMMON_DOT_H
 #define CEPH_TOOLS_COMMON_DOT_H
 
+#include "mon/mon_types.h"
+
 #include <iosfwd>
 #include <stdint.h>
 #include <map>
 
 #include "common/Cond.h"
 #include "common/Mutex.h"
+#include "common/Timer.h"
+#include "common/LogEntry.h"
 #include "mon/MonClient.h"
 #include "mon/PGMap.h"
 #include "mds/MDSMap.h"
 #include "osd/OSDMap.h"
-#include "common/Timer.h"
+#include "global/global_context.h"
 
-
-#include "common/LogEntry.h"
-#include "mon/mon_types.h"
 #include "messages/MOSDMap.h"
 #include "messages/MLog.h"
 #include "messages/MCommand.h"
 #include "messages/MCommandReply.h"
 #include "messages/MMonCommandAck.h"
 
-
 #define OSD_MON_UPDATE	    (1<<0)
 #define MDS_MON_UPDATE	    (1<<1)
 #define PG_MON_UPDATE	    (1<<2)
diff --git a/src/tools/rest_bench.cc b/src/tools/rest_bench.cc
index a57e9a8688d..049b30a861e 100644
--- a/src/tools/rest_bench.cc
+++ b/src/tools/rest_bench.cc
@@ -13,22 +13,22 @@
  */
 
 #include "include/types.h"
-#include "include/atomic.h"
 
+#include <deque>
+#include <errno.h>
+
+#include "include/atomic.h"
 #include "common/obj_bencher.h"
 #include "common/config.h"
 #include "common/ceph_argparse.h"
 #include "common/WorkQueue.h"
 #include "msg/Message.h"
 #include "global/global_init.h"
+#include "global/global_context.h"
 #include "global/debug.h"
 
 #include "libs3.h"
 
-#include <deque>
-
-#include <errno.h>
-
 #define DEFAULT_USER_AGENT "rest-bench"
 #define DEFAULT_BUCKET "rest-bench-bucket"