Fix most includes in headers (#1149)

Fixes #1146

src/util/Batching.h

@@ -21,10 +21,9 @@
 
 #include "util/Assert.h"
 
-#include <algorithm>
+#include <cstddef>
 #include <functional>
 #include <iterator>
-#include <ranges>
 
 namespace util {
 

src/util/Concepts.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <concepts>
+#include <type_traits>
 
 namespace util {
 

src/util/Expected.h

@@ -33,8 +33,12 @@
 #pragma once
 
 #include <boost/outcome.hpp>
+#include <boost/outcome/policy/base.hpp>
+#include <boost/outcome/result.hpp>
+#include <boost/outcome/success_failure.hpp>
 #include <ripple/basics/contract.h>
 
+#include <cstddef>
 #include <stdexcept>
 #include <type_traits>
 

src/util/JsonUtils.h

@@ -20,6 +20,7 @@
 #pragma once
 
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
 
 #include <algorithm>
 #include <cctype>

src/util/LedgerUtils.h

@@ -22,6 +22,7 @@
 #include <fmt/core.h>
 #include <ripple/basics/Slice.h>
 #include <ripple/basics/StringUtilities.h>
+#include <ripple/basics/strHex.h>
 #include <ripple/protocol/LedgerFormats.h>
 #include <ripple/protocol/LedgerHeader.h>
 #include <ripple/protocol/jss.h>

src/util/SourceLocation.h

@@ -27,10 +27,12 @@
 // this is used by clang on linux where source_location is still not out of
 // experimental headers
 #include <experimental/source_location>
-#endif
 
-#include <optional>
-#include <string>
+#else
+
+#include <cstddef>
+#include <string_view>
+#endif
 
 namespace util {
 

src/util/Taggable.h

@@ -23,13 +23,17 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/json.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_io.hpp>
 
+#include <atomic>
+#include <functional>
 #include <memory>
 #include <optional>
 #include <ostream>
-#include <string>
+#include <stdexcept>
 
 namespace util {
 namespace detail {

src/util/TxUtils.cpp

@@ -28,7 +28,7 @@
 
 namespace util {
 
-std::unordered_set<std::string> const&
+[[nodiscard]] std::unordered_set<std::string> const&
 getTxTypesInLowercase()
 {
     static std::unordered_set<std::string> const typesKeysInLowercase = []() {

src/util/TxUtils.h

@@ -23,6 +23,6 @@
 #include <unordered_set>
 
 namespace util {
-std::unordered_set<std::string> const&
+[[nodiscard]] std::unordered_set<std::string> const&
 getTxTypesInLowercase();
 }  // namespace util

src/util/config/Config.h

@@ -22,11 +22,20 @@
 #include "util/config/detail/Helpers.h"
 
 #include <boost/json.hpp>
+#include <boost/json/kind.hpp>
+#include <boost/json/object.hpp>
+#include <boost/json/value.hpp>
 
+#include <cstdint>
+#include <exception>
 #include <filesystem>
+#include <functional>
 #include <optional>
+#include <stdexcept>
 #include <string>
 #include <string_view>
+#include <utility>
+#include <vector>
 
 namespace util {
 

src/util/log/Logger.h

@@ -24,8 +24,14 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/json.hpp>
+#include <boost/json/conversion.hpp>
+#include <boost/json/value.hpp>
 #include <boost/log/core/core.hpp>
+#include <boost/log/core/record.hpp>
+#include <boost/log/expressions/keyword.hpp>
 #include <boost/log/expressions/predicates/channel_severity_filter.hpp>
+#include <boost/log/keywords/channel.hpp>
+#include <boost/log/keywords/severity.hpp>
 #include <boost/log/sinks/unlocked_frontend.hpp>
 #include <boost/log/sources/record_ostream.hpp>
 #include <boost/log/sources/severity_channel_logger.hpp>
@@ -37,6 +43,11 @@
 #include <boost/log/utility/setup/file.hpp>
 #include <boost/log/utility/setup/formatter_parser.hpp>
 
+#include <cstddef>
+#include <optional>
+#include <ostream>
+#include <string>
+
 namespace util {
 
 class Config;

src/util/prometheus/Counter.h

@@ -21,8 +21,14 @@
 
 #include "util/Assert.h"
 #include "util/prometheus/MetricBase.h"
+#include "util/prometheus/OStream.h"
 #include "util/prometheus/impl/AnyCounterBase.h"
 
+#include <cstdint>
+#include <string>
+#include <type_traits>
+#include <utility>
+
 namespace util::prometheus {
 
 /**

src/util/prometheus/Gauge.h

@@ -20,8 +20,14 @@
 #pragma once
 
 #include "util/prometheus/MetricBase.h"
+#include "util/prometheus/OStream.h"
 #include "util/prometheus/impl/AnyCounterBase.h"
 
+#include <cstdint>
+#include <string>
+#include <type_traits>
+#include <utility>
+
 namespace util::prometheus {
 
 /**

src/util/prometheus/Histogram.h

@@ -21,8 +21,16 @@
 
 #include "util/Assert.h"
 #include "util/prometheus/MetricBase.h"
+#include "util/prometheus/OStream.h"
 #include "util/prometheus/impl/HistogramImpl.h"
 
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
 namespace util::prometheus {
 
 /**

src/util/prometheus/Http.h

@@ -19,9 +19,11 @@
 
 #pragma once
 
-#include "util/prometheus/Prometheus.h"
-
 #include <boost/beast/http.hpp>
+#include <boost/beast/http/message.hpp>
+#include <boost/beast/http/string_body.hpp>
+
+#include <optional>
 
 namespace util::prometheus {
 

src/util/prometheus/MetricBase.h

@@ -19,10 +19,9 @@
 
 #pragma once
 
-#include "util/prometheus/Label.h"
 #include "util/prometheus/OStream.h"
 
-#include <cstdint>
+#include <string>
 
 namespace util::prometheus {
 

src/util/prometheus/MetricBuilder.h

@@ -21,6 +21,11 @@
 
 #include "util/prometheus/MetricBase.h"
 
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace util::prometheus {
 
 /**

src/util/prometheus/MetricsFamily.h

@@ -19,10 +19,17 @@
 
 #pragma once
 
+#include "util/prometheus/Label.h"
+#include "util/prometheus/MetricBase.h"
 #include "util/prometheus/MetricBuilder.h"
+#include "util/prometheus/OStream.h"
 
+#include <cstdint>
+#include <memory>
 #include <optional>
+#include <string>
 #include <unordered_map>
+#include <vector>
 
 namespace util::prometheus {
 

src/util/prometheus/Prometheus.h

@@ -23,8 +23,17 @@
 #include "util/prometheus/Counter.h"
 #include "util/prometheus/Gauge.h"
 #include "util/prometheus/Histogram.h"
+#include "util/prometheus/Label.h"
+#include "util/prometheus/MetricBase.h"
 #include "util/prometheus/MetricsFamily.h"
 
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
 namespace util::prometheus {
 
 class PrometheusInterface {

src/util/prometheus/impl/AnyCounterBase.h

@@ -22,6 +22,7 @@
 #include "util/prometheus/impl/CounterImpl.h"
 
 #include <memory>
+#include <type_traits>
 
 namespace util::prometheus::detail {
 

src/util/prometheus/impl/CounterImpl.h

@@ -19,11 +19,9 @@
 
 #pragma once
 
-#include "util/Assert.h"
 #include "util/Atomic.h"
 
-#include <atomic>
-#include <concepts>
+#include <type_traits>
 
 namespace util::prometheus::detail {
 

src/util/prometheus/impl/HistogramImpl.h

@@ -23,7 +23,14 @@
 #include "util/Concepts.h"
 #include "util/prometheus/OStream.h"
 
+#include <cstdint>
+#include <limits>
+#include <memory>
 #include <mutex>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
 
 namespace util::prometheus::detail {