From 018906f37fe71d066b5e67cb95d6d5cd399648b6 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Fri, 4 Oct 2024 15:41:09 +0200
Subject: [PATCH] osd/osd_types: include cleanup

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
 src/osd/osd_types.cc |  8 +++++++-
 src/osd/osd_types.h  | 23 ++++++++++++-----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index ab26f2d0c6b..0e9d9e7e78e 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -15,6 +15,9 @@
  *
  */
 
+#include "osd_types.h"
+#include "osd_perf_counters.h"
+
 #include <algorithm>
 #include <list>
 #include <map>
@@ -31,15 +34,18 @@
 #include "include/ceph_features.h"
 #include "include/encoding.h"
 #include "include/stringify.h"
+
+#include "crush/CrushWrapper.h"
 extern "C" {
+#include "crush/crush.h" // for CRUSH_ITEM_NONE
 #include "crush/hash.h"
 }
 
+#include "common/ceph_context.h"
 #include "common/Formatter.h"
 #include "common/StackStringStream.h"
 #include "include/utime_fmt.h"
 #include "OSDMap.h"
-#include "osd_types.h"
 #include "osd_types_fmt.h"
 #include "os/Transaction.h"
 
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index ebc1d359ee2..c654cb71cd6 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -19,38 +19,39 @@
 #define CEPH_OSD_TYPES_H
 
 #include <atomic>
-#include <sstream>
-#include <cstdio>
+#include <cstdint>
+#include <list>
+#include <map>
 #include <memory>
+#include <ostream>
+#include <set>
+#include <string>
 #include <string_view>
 
-#include <boost/scoped_ptr.hpp>
-#include <boost/optional/optional_io.hpp>
 #include <boost/variant.hpp>
+#ifdef WITH_SEASTAR
 #include <boost/smart_ptr/local_shared_ptr.hpp>
+#endif
 
-#include "include/rados/rados_types.hpp"
 #include "include/mempool.h"
 #include "common/fmt_common.h"
 
 #include "msg/msg_types.h"
+#include "include/common_fwd.h" // for CephContext
 #include "include/compat.h"
 #include "include/types.h"
 #include "include/utime.h"
 #include "include/CompatSet.h"
-#include "common/ceph_context.h"
-#include "common/histogram.h"
+#include "common/dout.h"
+#include "common/histogram.h" // for pow2_hist_t
 #include "include/interval_set.h"
 #include "include/inline_memory.h"
 #include "common/Formatter.h"
-#include "common/bloom_filter.hpp"
 #include "common/hobject.h"
 #include "common/snap_types.h"
+#include "common/strtol.h" // for ritoa()
 #include "HitSet.h"
-#include "Watch.h"
 #include "librados/ListObjectImpl.h"
-#include "compressor/Compressor.h"
-#include "osd_perf_counters.h"
 #include "pg_features.h"
 #include "ECTypes.h"
 
-- 
2.39.5