common/ceph_context: include cleanup

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
index 20ccb42a42758271d0800a0eb75a80771f9b47d9..60a03d9b1226024ef62d6344950a0479027f7201 100644 (file)
--- a/src/common/ceph_context.cc
+++ b/src/common/ceph_context.cc
@@ -17,6 +17,7 @@
 
 #include <mutex>
 #include <iostream>
+#include <sstream>
 
 #include <pthread.h>
 
@@ -26,6 +27,7 @@
 #include <breakpad/client/linux/handler/exception_handler.h>
 #endif
 
+#include "include/ceph_fs.h" // for CEPH_CRYPTO_NONE
 #include "include/common_fwd.h"
 #include "include/mempool.h"
 #include "include/stringify.h"
@@ -56,6 +58,12 @@
 #include "mon/MonMap.h"
 #endif
 
+#ifdef WITH_CRIMSON
+#include "crimson/common/perf_counters_collection.h"
+#else
+#include "common/perf_counters_collection.h"
+#endif
+
 // for CINIT_FLAGS
 #include "common/common_init.h"
 

diff --git a/src/common/ceph_context.h b/src/common/ceph_context.h
index 2eb0f8025b7628cfb3ceb2ba05c870748982b9ff..0c7ed94ba0e46290d1e22a93f85fb12733a1de7b 100644 (file)
--- a/src/common/ceph_context.h
+++ b/src/common/ceph_context.h
@@ -18,12 +18,12 @@
 #include <atomic>
 #include <map>
 #include <memory>
-#include <mutex>
 #include <set>
 #include <string>
 #include <string_view>
 #include <typeinfo>
 #include <typeindex>
+#include <vector>
 
 #include <boost/intrusive_ptr.hpp>
 
@@ -36,11 +36,9 @@
 #include "msg/msg_types.h"
 #ifdef WITH_CRIMSON
 #include "crimson/common/config_proxy.h"
-#include "crimson/common/perf_counters_collection.h"
 #else
 #include "common/config_proxy.h"
 #include "include/spinlock.h"
-#include "common/perf_counters_collection.h"
 #endif