From b992ef63d1f0bbdd07c7ffa4380575473b4e8080 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Tue, 14 Apr 2026 18:13:59 +0200
Subject: [PATCH] tools: add missing includes

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
 src/tools/ceph-dencoder/denc_registry.h | 1 +
 src/tools/ceph_monstore_tool.cc         | 1 +
 src/tools/cephfs/Dumper.cc              | 1 +
 src/tools/cephfs/MDSUtility.cc          | 1 +
 src/tools/cephfs/Resetter.cc            | 1 +
 src/tools/cephfs_mirror/PeerReplayer.h  | 7 +++++++
 src/tools/cephfs_mirror/Types.cc        | 2 ++
 src/tools/cephfs_mirror/Types.h         | 4 +++-
 src/tools/monmaptool.cc                 | 1 +
 src/tools/rbd_mirror/ImageReplayer.cc   | 1 +
 10 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/tools/ceph-dencoder/denc_registry.h b/src/tools/ceph-dencoder/denc_registry.h
index 6b152a4b234..1b6496ab3a4 100644
--- a/src/tools/ceph-dencoder/denc_registry.h
+++ b/src/tools/ceph-dencoder/denc_registry.h
@@ -9,6 +9,7 @@
 #include <string_view>
 
 #include "include/buffer_fwd.h"
+#include "global/global_context.h" // for g_ceph_context
 #include "msg/Message.h"
 
 namespace ceph {
diff --git a/src/tools/ceph_monstore_tool.cc b/src/tools/ceph_monstore_tool.cc
index 31ed80882d3..a84639aedd7 100644
--- a/src/tools/ceph_monstore_tool.cc
+++ b/src/tools/ceph_monstore_tool.cc
@@ -37,6 +37,7 @@
 #include "osd/OSDMap.h"
 #include "crush/CrushCompiler.h"
 #include "mon/CreatingPGs.h"
+#include "mon/mon_types.h" // for CEPH_MON_ONDISK_MAGIC
 
 namespace po = boost::program_options;
 
diff --git a/src/tools/cephfs/Dumper.cc b/src/tools/cephfs/Dumper.cc
index cf4dbf2d876..ce823050dd0 100644
--- a/src/tools/cephfs/Dumper.cc
+++ b/src/tools/cephfs/Dumper.cc
@@ -17,6 +17,7 @@
 
 #include "include/compat.h"
 #include "include/fs_types.h"
+#include "common/Cond.h"
 #include "common/debug.h"
 #include "common/entity_name.h"
 #include "common/errno.h"
diff --git a/src/tools/cephfs/MDSUtility.cc b/src/tools/cephfs/MDSUtility.cc
index 2790d3e1fab..62acb065994 100644
--- a/src/tools/cephfs/MDSUtility.cc
+++ b/src/tools/cephfs/MDSUtility.cc
@@ -14,6 +14,7 @@
 
 #include "MDSUtility.h"
 #include "mon/MonClient.h"
+#include "common/Cond.h"
 #include "common/debug.h"
 
 #define dout_context g_ceph_context
diff --git a/src/tools/cephfs/Resetter.cc b/src/tools/cephfs/Resetter.cc
index 3d51dbe8a8a..46ea8e86be9 100644
--- a/src/tools/cephfs/Resetter.cc
+++ b/src/tools/cephfs/Resetter.cc
@@ -16,6 +16,7 @@
 #include "Resetter.h"
 
 #include <memory>
+#include "common/Cond.h"
 #include "common/debug.h"
 #include "common/errno.h"
 #include "osdc/Journaler.h"
diff --git a/src/tools/cephfs_mirror/PeerReplayer.h b/src/tools/cephfs_mirror/PeerReplayer.h
index 7339df9e7bf..60cd81239df 100644
--- a/src/tools/cephfs_mirror/PeerReplayer.h
+++ b/src/tools/cephfs_mirror/PeerReplayer.h
@@ -11,8 +11,15 @@
 #include "Types.h"
 #include "json_spirit/json_spirit.h"
 
+#include <deque>
+#include <functional>
+#include <map>
+#include <queue>
 #include <set>
 #include <stack>
+#include <string>
+#include <vector>
+
 #include <boost/optional.hpp>
 
 namespace cephfs {
diff --git a/src/tools/cephfs_mirror/Types.cc b/src/tools/cephfs_mirror/Types.cc
index 651e3632b6e..ffc8ed0de38 100644
--- a/src/tools/cephfs_mirror/Types.cc
+++ b/src/tools/cephfs_mirror/Types.cc
@@ -3,6 +3,8 @@
 
 #include "Types.h"
 
+#include <iostream>
+
 namespace cephfs {
 namespace mirror {
 
diff --git a/src/tools/cephfs_mirror/Types.h b/src/tools/cephfs_mirror/Types.h
index 8c6fda4efa7..5f51e69cd2f 100644
--- a/src/tools/cephfs_mirror/Types.h
+++ b/src/tools/cephfs_mirror/Types.h
@@ -4,8 +4,10 @@
 #ifndef CEPHFS_MIRROR_TYPES_H
 #define CEPHFS_MIRROR_TYPES_H
 
+#include <map>
 #include <set>
-#include <iostream>
+#include <iosfwd>
+#include <string>
 #include <string_view>
 #include <variant>
 
diff --git a/src/tools/monmaptool.cc b/src/tools/monmaptool.cc
index 8e56b7c4fe7..069869bd5c1 100644
--- a/src/tools/monmaptool.cc
+++ b/src/tools/monmaptool.cc
@@ -23,6 +23,7 @@
 #include "global/global_init.h"
 #include "include/str_list.h"
 #include "mon/MonMap.h"
+#include "mon/mon_types.h" // for ceph::features::mon::*
 
 using std::cerr;
 using std::cout;
diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc
index 9aee9a96b4d..56a91712202 100644
--- a/src/tools/rbd_mirror/ImageReplayer.cc
+++ b/src/tools/rbd_mirror/ImageReplayer.cc
@@ -4,6 +4,7 @@
 #include "include/compat.h"
 #include "common/Formatter.h"
 #include "common/admin_socket.h"
+#include "common/Cond.h"
 #include "common/debug.h"
 #include "common/errno.h"
 #include "include/stringify.h"
-- 
2.47.3