Fix most includes in headers (#1149)

Fixes #1146

src/data/BackendCounters.h

@@ -19,14 +19,17 @@
 
 #pragma once
 
-#include "util/prometheus/Prometheus.h"
+#include "util/prometheus/Counter.h"
+#include "util/prometheus/Gauge.h"
+#include "util/prometheus/Histogram.h"
 
 #include <boost/json/object.hpp>
 
-#include <atomic>
+#include <chrono>
+#include <cstdint>
 #include <functional>
 #include <memory>
-#include <utility>
+#include <string>
 
 namespace data {
 

src/data/BackendFactory.h

@@ -21,10 +21,16 @@
 
 #include "data/BackendInterface.h"
 #include "data/CassandraBackend.h"
+#include "data/cassandra/SettingsProvider.h"
 #include "util/config/Config.h"
 #include "util/log/Logger.h"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+
+#include <memory>
+#include <stdexcept>
+#include <string>
 
 namespace data {
 

src/data/BackendInterface.h

@@ -22,16 +22,29 @@
 #include "data/DBHelpers.h"
 #include "data/LedgerCache.h"
 #include "data/Types.h"
-#include "util/config/Config.h"
 #include "util/log/Logger.h"
 
+#include <boost/asio/executor_work_guard.hpp>
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/spawn.hpp>
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
+#include <boost/utility/result_of.hpp>
+#include <ripple/basics/base_uint.h>
+#include <ripple/protocol/AccountID.h>
 #include <ripple/protocol/Fees.h>
 #include <ripple/protocol/LedgerHeader.h>
 
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <exception>
+#include <optional>
+#include <shared_mutex>
+#include <string>
 #include <thread>
 #include <type_traits>
+#include <vector>
 
 namespace data {
 

src/data/CassandraBackend.h

@@ -20,10 +20,13 @@
 #pragma once
 
 #include "data/BackendInterface.h"
+#include "data/DBHelpers.h"
+#include "data/Types.h"
 #include "data/cassandra/Concepts.h"
 #include "data/cassandra/Handle.h"
 #include "data/cassandra/Schema.h"
 #include "data/cassandra/SettingsProvider.h"
+#include "data/cassandra/Types.h"
 #include "data/cassandra/impl/ExecutionStrategy.h"
 #include "util/Assert.h"
 #include "util/LedgerUtils.h"
@@ -31,9 +34,28 @@
 #include "util/log/Logger.h"
 
 #include <boost/asio/spawn.hpp>
+#include <boost/json/object.hpp>
+#include <cassandra.h>
+#include <ripple/basics/Blob.h>
+#include <ripple/basics/base_uint.h>
+#include <ripple/basics/strHex.h>
+#include <ripple/protocol/AccountID.h>
 #include <ripple/protocol/LedgerHeader.h>
 #include <ripple/protocol/nft.h>
 
+#include <atomic>
+#include <chrono>
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
+#include <limits>
+#include <optional>
+#include <stdexcept>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+
 namespace data::cassandra {
 
 /**

src/data/DBHelpers.h

@@ -20,16 +20,25 @@
 /** @file */
 #pragma once
 
-#include "data/Types.h"
 #include "util/Assert.h"
 
 #include <boost/container/flat_set.hpp>
+#include <ripple/basics/Blob.h>
 #include <ripple/basics/Log.h>
 #include <ripple/basics/StringUtilities.h>
+#include <ripple/basics/base_uint.h>
+#include <ripple/protocol/AccountID.h>
 #include <ripple/protocol/SField.h>
 #include <ripple/protocol/STAccount.h>
+#include <ripple/protocol/STLedgerEntry.h>
+#include <ripple/protocol/Serializer.h>
 #include <ripple/protocol/TxMeta.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <optional>
+#include <string>
+
 /**
  * @brief Struct used to keep track of what to write to account_transactions/account_tx tables.
  */

src/data/LedgerCache.h

@@ -20,16 +20,22 @@
 #pragma once
 
 #include "data/Types.h"
+#include "util/prometheus/Counter.h"
+#include "util/prometheus/Label.h"
 #include "util/prometheus/Prometheus.h"
 
 #include <ripple/basics/base_uint.h>
 #include <ripple/basics/hardened_hash.h>
 
+#include <atomic>
 #include <condition_variable>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <map>
-#include <mutex>
+#include <optional>
 #include <shared_mutex>
-#include <utility>
+#include <unordered_set>
 #include <vector>
 
 namespace data {

src/data/Types.h

@@ -22,9 +22,10 @@
 #include <ripple/basics/base_uint.h>
 #include <ripple/protocol/AccountID.h>
 
+#include <cstdint>
 #include <optional>
-#include <string>
 #include <string_view>
+#include <tuple>
 #include <utility>
 #include <vector>
 

src/data/cassandra/Concepts.h

@@ -21,13 +21,18 @@
 
 #include "data/cassandra/Types.h"
 
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/spawn.hpp>
 #include <boost/json.hpp>
+#include <boost/json/object.hpp>
 
 #include <chrono>
 #include <concepts>
+#include <cstdint>
 #include <optional>
 #include <string>
+#include <utility>
+#include <vector>
 
 namespace data::cassandra {
 

src/data/cassandra/Error.h

@@ -21,6 +21,8 @@
 
 #include <cassandra.h>
 
+#include <cstdint>
+#include <ostream>
 #include <string>
 #include <utility>
 

src/data/cassandra/Handle.h

@@ -28,13 +28,11 @@
 #include "data/cassandra/impl/Result.h"
 #include "data/cassandra/impl/Session.h"
 #include "data/cassandra/impl/Statement.h"
-#include "util/Expected.h"
 
 #include <cassandra.h>
 
-#include <chrono>
-#include <compare>
-#include <iterator>
+#include <functional>
+#include <string_view>
 #include <vector>
 
 namespace data::cassandra {

src/data/cassandra/Schema.h

@@ -21,14 +21,17 @@
 
 #include "data/cassandra/Concepts.h"
 #include "data/cassandra/Handle.h"
-#include "data/cassandra/SettingsProvider.h"
 #include "data/cassandra/Types.h"
-#include "util/Expected.h"
-#include "util/config/Config.h"
 #include "util/log/Logger.h"
 
 #include <fmt/compile.h>
 
+#include <functional>
+#include <memory>
+#include <string>
+#include <string_view>
+#include <vector>
+
 namespace data::cassandra {
 
 template <SomeSettingsProvider SettingsProviderType>

src/data/cassandra/SettingsProvider.h

@@ -21,10 +21,13 @@
 
 #include "data/cassandra/Handle.h"
 #include "data/cassandra/Types.h"
-#include "util/Expected.h"
 #include "util/config/Config.h"
 #include "util/log/Logger.h"
 
+#include <cstdint>
+#include <optional>
+#include <string>
+
 namespace data::cassandra {
 
 /**

src/data/cassandra/Types.h

@@ -21,7 +21,7 @@
 
 #include "util/Expected.h"
 
-#include <string>
+#include <cstdint>
 
 namespace data::cassandra {
 

src/data/cassandra/impl/AsyncExecutor.h

@@ -23,13 +23,16 @@
 #include "data/cassandra/Handle.h"
 #include "data/cassandra/Types.h"
 #include "data/cassandra/impl/RetryPolicy.h"
-#include "util/Expected.h"
 #include "util/log/Logger.h"
 
 #include <boost/asio.hpp>
+#include <boost/asio/io_context.hpp>
 
 #include <functional>
 #include <memory>
+#include <mutex>
+#include <optional>
+#include <utility>
 
 namespace data::cassandra::detail {
 

src/data/cassandra/impl/Batch.h

@@ -24,6 +24,8 @@
 
 #include <cassandra.h>
 
+#include <vector>
+
 namespace data::cassandra::detail {
 
 struct Batch : public ManagedObject<CassBatch> {

src/data/cassandra/impl/Collection.h

@@ -24,8 +24,11 @@
 #include <cassandra.h>
 #include <ripple/basics/base_uint.h>
 
+#include <cstdint>
+#include <stdexcept>
 #include <string>
 #include <string_view>
+#include <vector>
 
 namespace data::cassandra::detail {
 

src/data/cassandra/impl/ExecutionStrategy.h

@@ -26,19 +26,28 @@
 #include "data/cassandra/impl/AsyncExecutor.h"
 #include "util/Assert.h"
 #include "util/Batching.h"
-#include "util/Expected.h"
 #include "util/log/Logger.h"
 
 #include <boost/asio.hpp>
+#include <boost/asio/associated_executor.hpp>
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/io_service.hpp>
 #include <boost/asio/spawn.hpp>
+#include <boost/json/object.hpp>
 
 #include <atomic>
+#include <chrono>
 #include <condition_variable>
+#include <cstddef>
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <mutex>
 #include <optional>
+#include <stdexcept>
 #include <thread>
+#include <type_traits>
+#include <vector>
 
 namespace data::cassandra::detail {
 

src/data/cassandra/impl/Future.h

@@ -24,6 +24,9 @@
 
 #include <cassandra.h>
 
+#include <functional>
+#include <memory>
+
 namespace data::cassandra::detail {
 
 struct Future : public ManagedObject<CassFuture> {

src/data/cassandra/impl/ManagedObject.h

@@ -20,6 +20,7 @@
 #pragma once
 
 #include <memory>
+#include <stdexcept>
 
 namespace data::cassandra::detail {
 

src/data/cassandra/impl/Result.h

@@ -21,15 +21,23 @@
 
 #include "data/cassandra/impl/ManagedObject.h"
 #include "data/cassandra/impl/Tuple.h"
-#include "util/Expected.h"
 
 #include <cassandra.h>
 #include <ripple/basics/base_uint.h>
 #include <ripple/protocol/AccountID.h>
 
-#include <compare>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
 #include <iterator>
+#include <optional>
+#include <stdexcept>
+#include <string>
+#include <string_view>
 #include <tuple>
+#include <type_traits>
+#include <utility>
+#include <vector>
 
 namespace data::cassandra::detail {
 

src/data/cassandra/impl/Statement.h

@@ -23,16 +23,21 @@
 #include "data/cassandra/impl/Collection.h"
 #include "data/cassandra/impl/ManagedObject.h"
 #include "data/cassandra/impl/Tuple.h"
-#include "util/Expected.h"
 
 #include <cassandra.h>
 #include <fmt/core.h>
 #include <ripple/basics/base_uint.h>
+#include <ripple/protocol/AccountID.h>
 #include <ripple/protocol/STAccount.h>
 
-#include <chrono>
-#include <compare>
-#include <iterator>
+#include <cstddef>
+#include <cstdint>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <tuple>
+#include <type_traits>
+#include <vector>
 
 namespace data::cassandra::detail {
 

src/data/cassandra/impl/Tuple.h

@@ -24,10 +24,14 @@
 #include <cassandra.h>
 #include <ripple/basics/base_uint.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <functional>
+#include <stdexcept>
 #include <string>
 #include <string_view>
 #include <tuple>
+#include <type_traits>
 
 namespace data::cassandra::detail {