From f44e18f71324b9e3d87f0b631225e37fd7bb9071 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Sun, 27 Oct 2024 13:59:04 +0100
Subject: [PATCH] osd/PeeringState: include cleanup

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
 src/osd/PeeringState.cc |  8 ++++++--
 src/osd/PeeringState.h  | 14 ++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 53ed29de8a0..607c23f335b 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -1,10 +1,14 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include "PeeringState.h"
 #include "PGPeeringEvent.h"
+#include "osd_perf_counters.h"
 #include "common/ceph_releases.h"
-#include "common/dout.h"
-#include "PeeringState.h"
+#include "common/debug.h"
+#include "common/ostream_temp.h"
+#include "crush/crush.h" // for CRUSH_ITEM_NONE
+#include "crush/CrushWrapper.h"
 
 #include "messages/MOSDPGRemove.h"
 #include "messages/MBackfillReserve.h"
diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h
index 586261dd140..b2cfd93c12d 100644
--- a/src/osd/PeeringState.h
+++ b/src/osd/PeeringState.h
@@ -5,13 +5,16 @@
 
 #include <boost/statechart/custom_reaction.hpp>
 #include <boost/statechart/event.hpp>
-#include <boost/statechart/simple_state.hpp>
 #include <boost/statechart/state.hpp>
 #include <boost/statechart/state_machine.hpp>
 #include <boost/statechart/transition.hpp>
 #include <boost/statechart/event_base.hpp>
 #include <string>
 #include <atomic>
+#include <map>
+#include <optional>
+#include <ostream>
+#include <vector>
 
 #include "include/ceph_assert.h"
 #include "include/common_fwd.h"
@@ -20,13 +23,16 @@
 #include "PGStateUtils.h"
 #include "PGPeeringEvent.h"
 #include "osd_types.h"
-#include "osd_types_fmt.h"
 #include "os/ObjectStore.h"
 #include "OSDMap.h"
 #include "MissingLoc.h"
-#include "osd/osd_perf_counters.h"
+#include "msg/Message.h"
+#include "msg/MessageRef.h"
+#include "common/ceph_mutex.h"
 #include "common/config_cacher.h"
-#include "common/ostream_temp.h"
+#include "common/snap_types.h" // for class SnapContext
+
+class OstreamTemp;
 
 struct PGPool {
   epoch_t cached_epoch;
-- 
2.39.5