3 files changed, 12 insertions, 20 deletions
diff --git a/src/test/ObjectMap/KeyValueDBMemory.h b/src/test/ObjectMap/KeyValueDBMemory.h
index baed9de28e0..fae52a6e37a 100644
--- a/src/test/ObjectMap/KeyValueDBMemory.h
+++ b/src/test/ObjectMap/KeyValueDBMemory.h
@@ -5,9 +5,9 @@
 #include <string>
 #include <tr1/memory>
 
-#include "os/KeyValueDB.h"
 #include "include/buffer.h"
 #include "include/Context.h"
+#include "os/KeyValueDB.h"
 
 using std::string;
 
diff --git a/src/test/ObjectMap/test_keyvaluedb_iterators.cc b/src/test/ObjectMap/test_keyvaluedb_iterators.cc
index 82ac3a979f1..9c3a59454a7 100644
--- a/src/test/ObjectMap/test_keyvaluedb_iterators.cc
+++ b/src/test/ObjectMap/test_keyvaluedb_iterators.cc
@@ -10,20 +10,17 @@
 * License version 2.1, as published by the Free Software
 * Foundation. See file COPYING.
 */
-#include <tr1/memory>
-#include <map>
-#include <set>
 #include <deque>
+#include <sys/types.h>
 #include <boost/scoped_ptr.hpp>
+#include "gtest/gtest.h"
 
-#include "test/ObjectMap/KeyValueDBMemory.h"
-#include "os/KeyValueDB.h"
+#include "common/ceph_argparse.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"
+
+#include "KeyValueDBMemory.h"
 
 using namespace std;
 
diff --git a/src/test/ObjectMap/test_object_map.cc b/src/test/ObjectMap/test_object_map.cc
index c33d85d7c2d..a91c58d4872 100644
--- a/src/test/ObjectMap/test_object_map.cc
+++ b/src/test/ObjectMap/test_object_map.cc
@@ -1,23 +1,18 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-#include <tr1/memory>
-#include <map>
-#include <set>
+#include <sys/types.h>
 #include <boost/scoped_ptr.hpp>
+#include "stdlib.h"
+#include <dirent.h>
+#include "gtest/gtest.h"
 
-#include "include/buffer.h"
-#include "test/ObjectMap/KeyValueDBMemory.h"
-#include "os/KeyValueDB.h"
+#include "common/ceph_argparse.h"
 #include "os/DBObjectMap.h"
 #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>
 
-#include "gtest/gtest.h"
-#include "stdlib.h"
+#include "KeyValueDBMemory.h"
 
 using namespace std;