From: Max Kellermann <max.kellermann@ionos.com>
Date: Mon, 7 Oct 2024 18:48:32 +0000 (+0200)
Subject: crush: include cleanup
X-Git-Tag: testing/wip-pdonnell-testing-20250225.023119-debug~2^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=938672d5d4f254d9968dc58f045ea90326289987;p=ceph-ci.git

crush: include cleanup

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

diff --git a/src/crush/CrushLocation.cc b/src/crush/CrushLocation.cc
index 901ce4f4643..aae135ee118 100644
--- a/src/crush/CrushLocation.cc
+++ b/src/crush/CrushLocation.cc
@@ -1,19 +1,21 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include <vector>
-#include <boost/algorithm/string/trim.hpp>
-
 #include "CrushLocation.h"
 #include "CrushWrapper.h"
 #include "common/ceph_context.h"
 #include "common/config.h"
 #include "common/debug.h"
 #include "common/errno.h"
+#include "common/SubProcess.h"
 #include "include/common_fwd.h"
 #include "include/compat.h"
 #include "include/str_list.h"
 
+#include <boost/algorithm/string/trim.hpp>
+
+#include <vector>
+
 namespace ceph::crush {
 
 int CrushLocation::update_from_conf()
diff --git a/src/crush/CrushLocation.h b/src/crush/CrushLocation.h
index 189d4f7882b..d92be7832e8 100644
--- a/src/crush/CrushLocation.h
+++ b/src/crush/CrushLocation.h
@@ -7,6 +7,8 @@
 #include <iosfwd>
 #include <map>
 #include <string>
+
+#include <fmt/core.h> // for FMT_VERSION
 #if FMT_VERSION >= 90000
 #include <fmt/ostream.h>
 #endif
diff --git a/src/crush/CrushTester.cc b/src/crush/CrushTester.cc
index 1d659e6a56b..bac21b0e779 100644
--- a/src/crush/CrushTester.cc
+++ b/src/crush/CrushTester.cc
@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <cstdlib>
+#include <iomanip>
 #include <iostream>
 
 #include <boost/lexical_cast.hpp>
diff --git a/src/crush/CrushTreeDumper.h b/src/crush/CrushTreeDumper.h
index a10c0f2c13c..cfba3e872b1 100644
--- a/src/crush/CrushTreeDumper.h
+++ b/src/crush/CrushTreeDumper.h
@@ -18,8 +18,13 @@
 #define CRUSH_TREE_DUMPER_H
 
 #include "CrushWrapper.h"
+#include "common/Formatter.h"
 #include "include/stringify.h"
 
+#include <list>
+#include <map>
+#include <string>
+
 /**
  * CrushTreeDumper:
  * A helper class and functions to dump a crush tree.
diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index 32da5251da4..361903159be 100644
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -1,16 +1,17 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include "CrushWrapper.h"
+#include "CrushTreeDumper.h"
+
 #include "osd/osd_types.h"
+#include "common/ceph_context.h"
 #include "common/debug.h"
 #include "common/Formatter.h"
 #include "common/errno.h"
 #include "common/TextTable.h"
 #include "include/stringify.h"
 
-#include "CrushWrapper.h"
-#include "CrushTreeDumper.h"
-
 #define dout_subsys ceph_subsys_crush
 
 using std::cout;
diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index ef7d2b99765..8026a33571e 100644
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <set>
 #include <string>
+#include <vector>
 
 #include <iosfwd>