msg/Message: include cleanup

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

diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index 50af00db28dd6244cc79d1213a60dbde9afc6d8e..e0af298231ff07c574bffe3f4cdab5f5bc3abe66 100644 (file)
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -1,6 +1,8 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
 // vim: ts=8 sw=2 smarttab
 
+#include "Message.h"
+
 #ifdef ENCODE_DUMP
 # include <typeinfo>
 # include <cxxabi.h>
@@ -12,8 +14,6 @@
 
 #include "global/global_context.h"
 
-#include "Message.h"
-
 #include "messages/MPGStats.h"
 
 #include "messages/MGenericMessage.h"
@@ -205,7 +205,9 @@
 #include "messages/MTimeCheck.h"
 #include "messages/MTimeCheck2.h"
 
+#include "common/ceph_context.h"
 #include "common/config.h"
+#include "common/debug.h"
 
 #include "messages/MOSDPGPush.h"
 #include "messages/MOSDPGPushReply.h"

diff --git a/src/msg/Message.h b/src/msg/Message.h
index 80d2295c89f6973b7927267eeeae106b46bfbd1c..2088e2a858ec33a8de0cb6550102e4727e9cc604 100644 (file)
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -18,9 +18,12 @@
 #include <concepts>
 #include <cstdlib>
 #include <ostream>
+#include <sstream>
 #include <string_view>
 
 #include <boost/intrusive/list.hpp>
+
+#include <fmt/core.h> // for FMT_VERSION
 #if FMT_VERSION >= 90000
 #include <fmt/ostream.h>
 #endif
@@ -30,7 +33,6 @@
 #include "common/ThrottleInterface.h"
 #include "common/config.h"
 #include "common/ref.h"
-#include "common/debug.h"
 #include "common/zipkin_trace.h"
 #include "common/tracer.h"
 #include "include/ceph_assert.h" // Because intrusive_ptr clobbers our assert...