From 36aae820e91fa740a2461cdddca2f2cb4c80544e Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Wed, 30 Oct 2024 12:19:36 +0100
Subject: [PATCH] mds/MetricsHandler: include cleanup

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
 src/mds/MetricsHandler.cc |  6 +++++-
 src/mds/MetricsHandler.h  | 24 ++++++++++++++++++------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/mds/MetricsHandler.cc b/src/mds/MetricsHandler.cc
index d9c09e06b270d..2899a1cc5980c 100644
--- a/src/mds/MetricsHandler.cc
+++ b/src/mds/MetricsHandler.cc
@@ -1,14 +1,18 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include "MetricsHandler.h"
+
 #include "common/debug.h"
 #include "common/errno.h"
+#include "include/cephfs/metrics/Types.h"
 
+#include "messages/MClientMetrics.h"
 #include "messages/MMDSMetrics.h"
+#include "messages/MMDSPing.h"
 
 #include "MDSRank.h"
 #include "SessionMap.h"
-#include "MetricsHandler.h"
 
 #define dout_context g_ceph_context
 #define dout_subsys ceph_subsys_mds
diff --git a/src/mds/MetricsHandler.h b/src/mds/MetricsHandler.h
index 25ee208aa9562..f6ce02882cd5a 100644
--- a/src/mds/MetricsHandler.h
+++ b/src/mds/MetricsHandler.h
@@ -4,21 +4,33 @@
 #ifndef CEPH_MDS_METRICS_HANDLER_H
 #define CEPH_MDS_METRICS_HANDLER_H
 
+#include <map>
 #include <thread>
 #include <utility>
-#include <boost/variant.hpp>
 
 #include "msg/Dispatcher.h"
 #include "common/ceph_mutex.h"
-#include "include/common_fwd.h"
-#include "include/cephfs/metrics/Types.h"
-
-#include "messages/MMDSPing.h"
-#include "messages/MClientMetrics.h"
 
 #include "MDSPerfMetricTypes.h"
 
+#include <boost/optional.hpp>
+#include <boost/variant/static_visitor.hpp>
+
+struct CapInfoPayload;
+struct ReadLatencyPayload;
+struct WriteLatencyPayload;
+struct MetadataLatencyPayload;
+struct DentryLeasePayload;
+struct OpenedFilesPayload;
+struct PinnedIcapsPayload;
+struct OpenedInodesPayload;
+struct ReadIoSizesPayload;
+struct WriteIoSizesPayload;
+struct UnknownPayload;
+class MClientMetrics;
+class MDSMap;
 class MDSRank;
+class MMDSPing;
 class Session;
 
 class MetricsHandler : public Dispatcher {
-- 
2.39.5