9 files changed, 37 insertions, 32 deletions
diff --git a/src/test/bench/bencher.h b/src/test/bench/bencher.h
index 9f48835a5d3..817980b6aae 100644
--- a/src/test/bench/bencher.h
+++ b/src/test/bench/bencher.h
@@ -4,14 +4,16 @@
 #define BENCHERH
 
 #include <utility>
-#include "distribution.h"
-#include "stat_collector.h"
-#include "backend.h"
 #include <boost/scoped_ptr.hpp>
+
 #include "common/Mutex.h"
 #include "common/Cond.h"
 #include "common/Thread.h"
 
+#include "distribution.h"
+#include "stat_collector.h"
+#include "backend.h"
+
 class OnWriteApplied;
 class OnWriteCommit;
 class OnReadComplete;
diff --git a/src/test/bench/detailed_stat_collector.h b/src/test/bench/detailed_stat_collector.h
index 60b7cab3cdc..6db8a4d9431 100644
--- a/src/test/bench/detailed_stat_collector.h
+++ b/src/test/bench/detailed_stat_collector.h
@@ -3,16 +3,18 @@
 #ifndef DETAILEDSTATCOLLECTERH
 #define DETAILEDSTATCOLLECTERH
 
-#include "stat_collector.h"
-#include "common/Formatter.h"
-#include <boost/scoped_ptr.hpp>
-#include "common/Mutex.h"
-#include "common/Cond.h"
-#include "include/utime.h"
 #include <list>
 #include <map>
 #include <boost/tuple/tuple.hpp>
 #include <ostream>
+#include <boost/scoped_ptr.hpp>
+
+#include "include/utime.h"
+#include "common/Formatter.h"
+#include "common/Mutex.h"
+#include "common/Cond.h"
+
+#include "stat_collector.h"
 
 class DetailedStatCollector : public StatCollector {
 public:
diff --git a/src/test/bench/dumb_backend.h b/src/test/bench/dumb_backend.h
index bbf8650add9..ae89967c072 100644
--- a/src/test/bench/dumb_backend.h
+++ b/src/test/bench/dumb_backend.h
@@ -3,13 +3,13 @@
 #ifndef DUMBBACKEND
 #define DUMBBACKEND
 
-#include "backend.h"
-#include "include/Context.h"
-#include "os/ObjectStore.h"
+#include <deque>
+
 #include "common/WorkQueue.h"
 #include "common/Semaphore.h"
+#include "os/ObjectStore.h"
 
-#include <deque>
+#include "backend.h"
 
 class DumbBackend : public Backend {
 	const string path;
diff --git a/src/test/bench/filestore_backend.cc b/src/test/bench/filestore_backend.cc
index 2f6ee744872..f49cb255df2 100644
--- a/src/test/bench/filestore_backend.cc
+++ b/src/test/bench/filestore_backend.cc
@@ -1,9 +1,9 @@
 // -*- 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"
+
+#include "filestore_backend.h"
 
 struct C_DeleteTransWrapper : public Context {
   Context *c;
diff --git a/src/test/bench/filestore_backend.h b/src/test/bench/filestore_backend.h
index 71429933860..b778ca0c8cb 100644
--- a/src/test/bench/filestore_backend.h
+++ b/src/test/bench/filestore_backend.h
@@ -4,10 +4,10 @@
 #define FILESTOREBACKENDH
 
 #include "common/Finisher.h"
-#include "backend.h"
-#include "include/Context.h"
 #include "os/ObjectStore.h"
 
+#include "backend.h"
+
 class FileStoreBackend : public Backend {
   ObjectStore *os;
   Finisher finisher;
diff --git a/src/test/bench/rados_backend.h b/src/test/bench/rados_backend.h
index 911d6c7d487..6c32c4e84e4 100644
--- a/src/test/bench/rados_backend.h
+++ b/src/test/bench/rados_backend.h
@@ -3,10 +3,10 @@
 #ifndef RADOSBACKENDH
 #define RADOSBACKENDH
 
-#include "backend.h"
-#include "include/Context.h"
 #include "include/rados/librados.hpp"
 
+#include "backend.h"
+
 class RadosBackend : public Backend {
   librados::IoCtx *ioctx;
 public:
diff --git a/src/test/bench/small_io_bench_dumb.cc b/src/test/bench/small_io_bench_dumb.cc
index 46bdd0f75ca..5c265218fd0 100644
--- a/src/test/bench/small_io_bench_dumb.cc
+++ b/src/test/bench/small_io_bench_dumb.cc
@@ -15,14 +15,14 @@
 #include <iostream>
 
 #include "common/Formatter.h"
+#include "global/global_init.h"
+#include "global/global_context.h"
 
+#include "dumb_backend.h"
 #include "bencher.h"
 #include "rados_backend.h"
 #include "detailed_stat_collector.h"
 #include "distribution.h"
-#include "global/global_init.h"
-#include "os/FileStore.h"
-#include "dumb_backend.h"
 
 namespace po = boost::program_options;
 using namespace std;
diff --git a/src/test/bench/small_io_bench_fs.cc b/src/test/bench/small_io_bench_fs.cc
index 6ce1394298c..0fd538b4a54 100644
--- a/src/test/bench/small_io_bench_fs.cc
+++ b/src/test/bench/small_io_bench_fs.cc
@@ -15,15 +15,16 @@
 #include <iostream>
 
 #include "common/Formatter.h"
+#include "common/perf_counters.h"
+#include "os/FileStore.h"
+#include "global/global_init.h"
+#include "global/global_context.h"
 
-#include "bencher.h"
 #include "rados_backend.h"
+#include "filestore_backend.h"
+#include "bencher.h"
 #include "detailed_stat_collector.h"
 #include "distribution.h"
-#include "global/global_init.h"
-#include "os/FileStore.h"
-#include "filestore_backend.h"
-#include "common/perf_counters.h"
 
 namespace po = boost::program_options;
 using namespace std;
diff --git a/src/test/bench/tp_bench.cc b/src/test/bench/tp_bench.cc
index cc503a6e11e..c14953286b6 100644
--- a/src/test/bench/tp_bench.cc
+++ b/src/test/bench/tp_bench.cc
@@ -15,16 +15,16 @@
 #include <iostream>
 
 #include "common/Formatter.h"
+#include "common/WorkQueue.h"
+#include "common/Semaphore.h"
+#include "common/Finisher.h"
+#include "global/global_context.h"
+#include "global/global_init.h"
 
 #include "bencher.h"
 #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"
-#include "common/Finisher.h"
 
 namespace po = boost::program_options;
 using namespace std;