diff --git a/.clang-tidy b/.clang-tidy
index 4b08ed4573..3bc91d8ece 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -54,7 +54,6 @@ Checks: >
   -misc-no-recursion,
   -misc-non-private-member-variables-in-classes,
   -misc-use-anonymous-namespace,
-  -misc-include-cleaner,
   modernize-*,
   -modernize-avoid-c-arrays,
   -modernize-use-nodiscard,
diff --git a/cmd/dev/embed_json.cpp b/cmd/dev/embed_json.cpp
index 6405ba4f02..604d560538 100644
--- a/cmd/dev/embed_json.cpp
+++ b/cmd/dev/embed_json.cpp
@@ -14,14 +14,20 @@
    limitations under the License.
 */
 
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
 #include <filesystem>
+#include <fstream>
 #include <iostream>
+#include <iterator>
 #include <regex>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <CLI/CLI.hpp>
-#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/trim.hpp>
 
 namespace fs = std::filesystem;
 
@@ -62,6 +68,7 @@ void to_byte_array(fs::path& in, fs::path& out, const std::string& ns) {
     std::ofstream out_stream{out.string()};
     out_stream << "/* Generated from " << in.filename().string() << " using silkworm embed_json tool */\n";
     out_stream << "#include \"" + var_name + ".hpp\"\n";
+    out_stream << "#include <string_view>\n";
     out_stream << "constexpr char " << var_name << "_data_internal[] = {\n";
 
     auto max{bytes.size()};
diff --git a/cmd/dev/embed_toml.cpp b/cmd/dev/embed_toml.cpp
index 58a61339e4..812aa44791 100644
--- a/cmd/dev/embed_toml.cpp
+++ b/cmd/dev/embed_toml.cpp
@@ -15,9 +15,10 @@
 */
 
 #include <cctype>
+#include <cstddef>
 #include <filesystem>
+#include <fstream>
 #include <iostream>
-#include <map>
 #include <regex>
 #include <string>
 #include <string_view>
diff --git a/conanfile.py b/conanfile.py
index cf32e42e54..f486ede728 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -33,7 +33,7 @@ def requirements(self):
         self.requires('asio-grpc/2.9.2')
         self.requires('benchmark/1.6.1')
         self.requires('boost/1.83.0')
-        self.requires('cli11/2.2.0')
+        self.requires('cli11/2.4.2')
         self.requires('gmp/6.2.1')
         self.requires('grpc/1.54.3')
         self.requires('gtest/1.12.1')
diff --git a/silkworm/core/chain/config.cpp b/silkworm/core/chain/config.cpp
index a74886d66c..18479471a4 100644
--- a/silkworm/core/chain/config.cpp
+++ b/silkworm/core/chain/config.cpp
@@ -20,6 +20,9 @@
 #include <functional>
 #include <set>
 #include <string>
+#include <string_view>
+
+#include <evmc/evmc.h>
 
 #include <silkworm/core/common/overloaded.hpp>
 #include <silkworm/core/types/address.hpp>
@@ -27,6 +30,9 @@
 
 namespace silkworm {
 
+using namespace std::string_view_literals;
+using namespace evmc::literals;
+
 constexpr const char* kTerminalTotalDifficulty{"terminalTotalDifficulty"};
 
 static inline void member_to_json(nlohmann::json& json, const std::string& key, const std::optional<uint64_t>& source) {
diff --git a/silkworm/core/chain/config.hpp b/silkworm/core/chain/config.hpp
index 8ae27df054..53ae59de87 100644
--- a/silkworm/core/chain/config.hpp
+++ b/silkworm/core/chain/config.hpp
@@ -132,6 +132,7 @@ struct ChainConfig {
 
 std::ostream& operator<<(std::ostream& out, const ChainConfig& obj);
 
+using namespace std::string_view_literals;
 using namespace evmc::literals;
 
 inline constexpr evmc::bytes32 kMainnetGenesisHash{0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3_bytes32};
diff --git a/silkworm/core/chain/genesis.cpp b/silkworm/core/chain/genesis.cpp
index 88eaceb174..1cab3d0785 100644
--- a/silkworm/core/chain/genesis.cpp
+++ b/silkworm/core/chain/genesis.cpp
@@ -17,6 +17,7 @@
 #include "genesis.hpp"
 
 #include <bit>
+#include <optional>
 
 #include <silkworm/core/chain/config.hpp>
 #include <silkworm/core/chain/genesis_bor_mainnet.hpp>
diff --git a/silkworm/core/chain/genesis_bor_mainnet.cpp b/silkworm/core/chain/genesis_bor_mainnet.cpp
index e41c960dc6..77bde814f0 100644
--- a/silkworm/core/chain/genesis_bor_mainnet.cpp
+++ b/silkworm/core/chain/genesis_bor_mainnet.cpp
@@ -1,5 +1,6 @@
 /* Generated from genesis_bor_mainnet.json using silkworm embed_json tool */
 #include "genesis_bor_mainnet.hpp"
+#include <string_view>
 constexpr char genesis_bor_mainnet_data_internal[] = {
 0x7b, 0x22, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x22, 0x3a, 0x7b, 0x22, 0x30, 0x30, 0x30, 0x30, 0x30,
 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
diff --git a/silkworm/core/chain/genesis_holesky.cpp b/silkworm/core/chain/genesis_holesky.cpp
index a9a69414ff..7ca08cc5b9 100644
--- a/silkworm/core/chain/genesis_holesky.cpp
+++ b/silkworm/core/chain/genesis_holesky.cpp
@@ -1,5 +1,6 @@
 /* Generated from genesis_holesky.json using silkworm embed_json tool */
 #include "genesis_holesky.hpp"
+#include <string_view>
 constexpr char genesis_holesky_data_internal[] = {
 0x7b, 0x22, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x22, 0x3a, 0x7b, 0x22, 0x30, 0x78, 0x30, 0x30, 0x30,
 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
diff --git a/silkworm/core/chain/genesis_mainnet.cpp b/silkworm/core/chain/genesis_mainnet.cpp
index 18875e1d09..da8b0a8b41 100644
--- a/silkworm/core/chain/genesis_mainnet.cpp
+++ b/silkworm/core/chain/genesis_mainnet.cpp
@@ -1,5 +1,6 @@
 /* Generated from genesis_mainnet.json using silkworm embed_json tool */
 #include "genesis_mainnet.hpp"
+#include <string_view>
 constexpr char genesis_mainnet_data_internal[] = {
 0x7b, 0x22, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x22, 0x3a, 0x7b, 0x22, 0x33, 0x32, 0x38, 0x32, 0x37,
 0x39, 0x31, 0x64, 0x36, 0x66, 0x64, 0x37, 0x31, 0x33, 0x66, 0x31, 0x65, 0x39, 0x34, 0x66, 0x34,
diff --git a/silkworm/core/chain/genesis_mumbai.cpp b/silkworm/core/chain/genesis_mumbai.cpp
index 592e7a5ac6..d1fdedd06b 100644
--- a/silkworm/core/chain/genesis_mumbai.cpp
+++ b/silkworm/core/chain/genesis_mumbai.cpp
@@ -1,5 +1,6 @@
 /* Generated from genesis_mumbai.json using silkworm embed_json tool */
 #include "genesis_mumbai.hpp"
+#include <string_view>
 constexpr char genesis_mumbai_data_internal[] = {
 0x7b, 0x22, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x22, 0x3a, 0x7b, 0x22, 0x30, 0x30, 0x30, 0x30, 0x30,
 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
diff --git a/silkworm/core/chain/genesis_sepolia.cpp b/silkworm/core/chain/genesis_sepolia.cpp
index 77279767fb..681ae11802 100644
--- a/silkworm/core/chain/genesis_sepolia.cpp
+++ b/silkworm/core/chain/genesis_sepolia.cpp
@@ -1,5 +1,6 @@
 /* Generated from genesis_sepolia.json using silkworm embed_json tool */
 #include "genesis_sepolia.hpp"
+#include <string_view>
 constexpr char genesis_sepolia_data_internal[] = {
 0x7b, 0x22, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x22, 0x3a, 0x7b, 0x22, 0x30, 0x78, 0x61, 0x32, 0x41,
 0x36, 0x64, 0x39, 0x33, 0x34, 0x33, 0x39, 0x31, 0x34, 0x34, 0x46, 0x46, 0x45, 0x34, 0x44, 0x32,
diff --git a/silkworm/core/common/base.hpp b/silkworm/core/common/base.hpp
index 16d6a0bf5b..3de7bae29a 100644
--- a/silkworm/core/common/base.hpp
+++ b/silkworm/core/common/base.hpp
@@ -36,8 +36,6 @@
 
 namespace silkworm {
 
-using namespace std::string_view_literals;
-
 template <class T>
 concept UnsignedIntegral = std::unsigned_integral<T> || std::same_as<T, intx::uint128> ||
                            std::same_as<T, intx::uint256> || std::same_as<T, intx::uint512>;
diff --git a/silkworm/core/common/test_util.cpp b/silkworm/core/common/test_util.cpp
index 2e44c0e892..b999202726 100644
--- a/silkworm/core/common/test_util.cpp
+++ b/silkworm/core/common/test_util.cpp
@@ -16,8 +16,11 @@
 
 #include "test_util.hpp"
 
+#include <intx/intx.hpp>
+
 #include <silkworm/core/types/evmc_bytes32.hpp>
 #include <silkworm/core/types/log.hpp>
+#include <silkworm/core/types/receipt.hpp>
 
 namespace silkworm::test {
 
diff --git a/silkworm/core/common/util.cpp b/silkworm/core/common/util.cpp
index 9d7bafae66..dc09c9baf7 100644
--- a/silkworm/core/common/util.cpp
+++ b/silkworm/core/common/util.cpp
@@ -17,10 +17,16 @@
 #include "util.hpp"
 
 #include <algorithm>
+#include <cstdint>
 #include <cstdio>
+#include <cstdlib>
 #include <regex>
 
+#include <intx/intx.hpp>
+
 #include <silkworm/core/common/assert.hpp>
+#include <silkworm/core/common/base.hpp>
+#include <silkworm/core/common/bytes.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/core/crypto/ecdsa.c b/silkworm/core/crypto/ecdsa.c
index e0210c23bd..aba7065850 100644
--- a/silkworm/core/crypto/ecdsa.c
+++ b/silkworm/core/crypto/ecdsa.c
@@ -16,10 +16,12 @@
 
 #include "ecdsa.h"
 
+#include <secp256k1.h>
+#include <stdint.h>
 #include <string.h>
 
+#include <ethash/hash_types.h>
 #include <ethash/keccak.h>
-#include <secp256k1_ecdh.h>
 #include <secp256k1_recovery.h>
 
 //! \brief Tries recover public key used for message signing.
diff --git a/silkworm/core/crypto/ecdsa.h b/silkworm/core/crypto/ecdsa.h
index 10a6601ceb..2a870df1b7 100644
--- a/silkworm/core/crypto/ecdsa.h
+++ b/silkworm/core/crypto/ecdsa.h
@@ -20,7 +20,6 @@
 
 #include <secp256k1.h>
 #include <stdbool.h>
-#include <stddef.h>
 #include <stdint.h>
 
 #if defined(__cplusplus)
diff --git a/silkworm/core/crypto/kzg.cpp b/silkworm/core/crypto/kzg.cpp
index 5adde3528b..dbef9e0385 100644
--- a/silkworm/core/crypto/kzg.cpp
+++ b/silkworm/core/crypto/kzg.cpp
@@ -18,6 +18,8 @@
 
 #include <blst.h>
 
+#include <cstdint>
+
 #include <silkworm/core/crypto/sha256.h>
 #include <silkworm/core/protocol/param.hpp>
 
diff --git a/silkworm/core/crypto/rmd160.c b/silkworm/core/crypto/rmd160.c
index dbe51b6922..bde4ac805a 100644
--- a/silkworm/core/crypto/rmd160.c
+++ b/silkworm/core/crypto/rmd160.c
@@ -36,6 +36,7 @@
 /*  header files */
 #include "rmd160.h"
 
+#include <stdint.h>
 #include <string.h>
 
 /********************************************************************/
diff --git a/silkworm/core/crypto/rmd160.h b/silkworm/core/crypto/rmd160.h
index e6e63526cc..a5f30b659b 100644
--- a/silkworm/core/crypto/rmd160.h
+++ b/silkworm/core/crypto/rmd160.h
@@ -37,7 +37,6 @@
 
 #pragma once
 
-#include <stddef.h>
 #include <stdint.h>
 
 #if defined(__cplusplus)
diff --git a/silkworm/core/crypto/secp256k1n.cpp b/silkworm/core/crypto/secp256k1n.cpp
index 53756ab226..c47145be70 100644
--- a/silkworm/core/crypto/secp256k1n.cpp
+++ b/silkworm/core/crypto/secp256k1n.cpp
@@ -16,6 +16,8 @@
 
 #include "secp256k1n.hpp"
 
+#include <intx/intx.hpp>
+
 namespace silkworm {
 
 bool is_valid_signature(const intx::uint256& r, const intx::uint256& s, bool homestead) noexcept {
diff --git a/silkworm/core/crypto/sha256.c b/silkworm/core/crypto/sha256.c
index abe1aa620e..b0551edc98 100644
--- a/silkworm/core/crypto/sha256.c
+++ b/silkworm/core/crypto/sha256.c
@@ -21,6 +21,7 @@
 
 #include "sha256.h"
 
+#include <stdint.h>
 #include <string.h>
 
 #if defined(__x86_64__)
diff --git a/silkworm/core/execution/call_tracer.cpp b/silkworm/core/execution/call_tracer.cpp
index b7c7a5cf25..a5faabed27 100644
--- a/silkworm/core/execution/call_tracer.cpp
+++ b/silkworm/core/execution/call_tracer.cpp
@@ -16,14 +16,22 @@
 
 #include "call_tracer.hpp"
 
+#include <cstddef>
+#include <cstdint>
+
+#include <evmc/evmc.h>
+#include <evmc/evmc.hpp>
 #include <evmc/hex.hpp>
 #include <evmc/instructions.h>
 #include <evmone/baseline_instruction_table.hpp>
 #include <evmone/execution_state.hpp>
 #include <evmone/instructions.hpp>
+#include <intx/intx.hpp>
 
+#include <silkworm/core/common/assert.hpp>
 #include <silkworm/core/protocol/intrinsic_gas.hpp>
 #include <silkworm/core/types/address.hpp>
+#include <silkworm/core/types/block.hpp>
 
 using namespace evmone;
 using namespace evmone::baseline;
diff --git a/silkworm/core/execution/evm.cpp b/silkworm/core/execution/evm.cpp
index 17455992e8..e9edb817de 100644
--- a/silkworm/core/execution/evm.cpp
+++ b/silkworm/core/execution/evm.cpp
@@ -18,19 +18,26 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cstdint>
 #include <cstring>
+#include <functional>
 #include <iterator>
 #include <memory>
 #include <utility>
+#include <vector>
 
 #include <ethash/keccak.hpp>
+#include <evmc/evmc.h>
 #include <evmone/evmone.h>
 #include <evmone/tracing.hpp>
+#include <intx/intx.hpp>
 
+#include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/empty_hashes.hpp>
 #include <silkworm/core/execution/precompile.hpp>
 #include <silkworm/core/protocol/param.hpp>
 #include <silkworm/core/types/address.hpp>
+#include <silkworm/core/types/log.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/core/execution/precompile.cpp b/silkworm/core/execution/precompile.cpp
index a67d5aa38c..2b03ecad0d 100644
--- a/silkworm/core/execution/precompile.cpp
+++ b/silkworm/core/execution/precompile.cpp
@@ -33,6 +33,7 @@
 #include <libff/common/profiling.hpp>
 #pragma GCC diagnostic pop
 
+#include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/endian.hpp>
 #include <silkworm/core/crypto/blake2b.h>
 #include <silkworm/core/crypto/ecdsa.h>
diff --git a/silkworm/core/execution/processor.cpp b/silkworm/core/execution/processor.cpp
index 9eba65d30d..2f55d1ab6e 100644
--- a/silkworm/core/execution/processor.cpp
+++ b/silkworm/core/execution/processor.cpp
@@ -16,11 +16,16 @@
 
 #include "processor.hpp"
 
+#include <algorithm>
 #include <cassert>
+#include <cstdint>
+
+#include <evmc/evmc.h>
 
 #include <silkworm/core/protocol/intrinsic_gas.hpp>
 #include <silkworm/core/protocol/param.hpp>
 #include <silkworm/core/trie/vector_root.hpp>
+#include <silkworm/core/types/receipt.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/core/execution/processor_test.cpp b/silkworm/core/execution/processor_test.cpp
index 5019040e1d..f7f675b389 100644
--- a/silkworm/core/execution/processor_test.cpp
+++ b/silkworm/core/execution/processor_test.cpp
@@ -16,6 +16,8 @@
 
 #include "processor.hpp"
 
+#include <optional>
+
 #include <catch2/catch_test_macros.hpp>
 #include <evmc/evmc.hpp>
 
diff --git a/silkworm/core/protocol/blockchain.cpp b/silkworm/core/protocol/blockchain.cpp
index 9bd2fe0e8b..0434d6d7fa 100644
--- a/silkworm/core/protocol/blockchain.cpp
+++ b/silkworm/core/protocol/blockchain.cpp
@@ -16,8 +16,15 @@
 
 #include "blockchain.hpp"
 
+#include <optional>
+#include <utility>
+#include <vector>
+
+#include <intx/intx.hpp>
+
 #include <silkworm/core/common/assert.hpp>
 #include <silkworm/core/execution/processor.hpp>
+#include <silkworm/core/types/block.hpp>
 
 namespace silkworm::protocol {
 
diff --git a/silkworm/core/protocol/bor/config.cpp b/silkworm/core/protocol/bor/config.cpp
index 258be9c002..c7afc719ed 100644
--- a/silkworm/core/protocol/bor/config.cpp
+++ b/silkworm/core/protocol/bor/config.cpp
@@ -16,11 +16,20 @@
 
 #include "config.hpp"
 
+#include <optional>
 #include <set>
 #include <string>
+#include <utility>
+#include <vector>
+
+#include <evmc/evmc.hpp>
+#include <nlohmann/json.hpp>
 
 #include <silkworm/core/common/assert.hpp>
+#include <silkworm/core/common/base.hpp>
+#include <silkworm/core/common/bytes.hpp>
 #include <silkworm/core/common/bytes_to_string.hpp>
+#include <silkworm/core/common/small_map.hpp>
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/types/address.hpp>
 
diff --git a/silkworm/core/protocol/bor_rule_set.cpp b/silkworm/core/protocol/bor_rule_set.cpp
index 0de3411a3a..0a7b1ed5b7 100644
--- a/silkworm/core/protocol/bor_rule_set.cpp
+++ b/silkworm/core/protocol/bor_rule_set.cpp
@@ -19,7 +19,9 @@
 #include <silkworm/core/common/assert.hpp>
 #include <silkworm/core/common/bytes_to_string.hpp>
 #include <silkworm/core/crypto/ecdsa.h>
+#include <silkworm/core/types/block.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/core/types/log.hpp>
 
 #include "param.hpp"
 
diff --git a/silkworm/core/protocol/ethash_config.cpp b/silkworm/core/protocol/ethash_config.cpp
index 35c4c20da4..ed8d65d330 100644
--- a/silkworm/core/protocol/ethash_config.cpp
+++ b/silkworm/core/protocol/ethash_config.cpp
@@ -16,6 +16,10 @@
 
 #include "ethash_config.hpp"
 
+#include <optional>
+
+#include <nlohmann/json.hpp>
+
 namespace silkworm::protocol {
 
 nlohmann::json EthashConfig::to_json() const noexcept {
diff --git a/silkworm/core/protocol/ethash_rule_set.cpp b/silkworm/core/protocol/ethash_rule_set.cpp
index ca309d5925..23a7ceb5be 100644
--- a/silkworm/core/protocol/ethash_rule_set.cpp
+++ b/silkworm/core/protocol/ethash_rule_set.cpp
@@ -16,11 +16,23 @@
 
 #include "ethash_rule_set.hpp"
 
+#include <cstddef>
+#include <cstdint>
+#include <ostream>
+#include <vector>
+
+#include <evmc/evmc.h>
+#include <evmone/evmone.h>
+#include <intx/intx.hpp>
+
 #include <silkworm/core/chain/dao.hpp>
+#include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/empty_hashes.hpp>
 #include <silkworm/core/common/endian.hpp>
+#include <silkworm/core/common/util.hpp>
 
 #include "param.hpp"
+#include "rule_set.hpp"
 
 namespace silkworm::protocol {
 
@@ -181,7 +193,7 @@ intx::uint256 EthashRuleSet::difficulty(uint64_t block_number, const uint64_t bl
 
 std::ostream& operator<<(std::ostream& out, const BlockReward& reward) {
     out << "miner_reward: " << intx::to_string(reward.miner) << " ommer_rewards: [";
-    for (std::size_t i{0}; i < reward.ommers.size(); ++i) {
+    for (size_t i{0}; i < reward.ommers.size(); ++i) {
         out << intx::to_string(reward.ommers[i]);
         if (i != reward.ommers.size() - 1) {
             out << " ";
diff --git a/silkworm/core/protocol/rule_set.cpp b/silkworm/core/protocol/rule_set.cpp
index 8fb74fb095..bec048f209 100644
--- a/silkworm/core/protocol/rule_set.cpp
+++ b/silkworm/core/protocol/rule_set.cpp
@@ -17,6 +17,7 @@
 #include "rule_set.hpp"
 
 #include <algorithm>
+#include <utility>
 
 #include <silkworm/core/common/empty_hashes.hpp>
 #include <silkworm/core/common/overloaded.hpp>
diff --git a/silkworm/core/protocol/validation.cpp b/silkworm/core/protocol/validation.cpp
index aca26cfd0e..e0965f08a9 100644
--- a/silkworm/core/protocol/validation.cpp
+++ b/silkworm/core/protocol/validation.cpp
@@ -17,8 +17,10 @@
 #include "validation.hpp"
 
 #include <bit>
+#include <optional>
 
 #include <silkworm/core/common/empty_hashes.hpp>
+#include <silkworm/core/common/util.hpp>
 #include <silkworm/core/crypto/secp256k1n.hpp>
 #include <silkworm/core/rlp/encode_vector.hpp>
 #include <silkworm/core/trie/vector_root.hpp>
diff --git a/silkworm/core/rlp/decode.cpp b/silkworm/core/rlp/decode.cpp
index 0f81fbcefb..9261fc9fed 100644
--- a/silkworm/core/rlp/decode.cpp
+++ b/silkworm/core/rlp/decode.cpp
@@ -17,10 +17,17 @@
 #include "decode.hpp"
 
 #include <cassert>
-#include <tuple>
+#include <cstddef>
+#include <cstdint>
 
+#include <tl/expected.hpp>
+
+#include <silkworm/core/common/bytes.hpp>
+#include <silkworm/core/common/decoding_result.hpp>
 #include <silkworm/core/common/endian.hpp>
 
+#include "header.hpp"
+
 namespace silkworm::rlp {
 
 tl::expected<Header, DecodingError> decode_header(ByteView& from) noexcept {
diff --git a/silkworm/core/rlp/decode.hpp b/silkworm/core/rlp/decode.hpp
index be83a2923a..1e7922176a 100644
--- a/silkworm/core/rlp/decode.hpp
+++ b/silkworm/core/rlp/decode.hpp
@@ -23,12 +23,10 @@
 #include <cstring>
 #include <span>
 
-#include <intx/intx.hpp>
-
-#include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/bytes.hpp>
 #include <silkworm/core/common/decoding_result.hpp>
-#include <silkworm/core/rlp/encode.hpp>
+#include <silkworm/core/common/endian.hpp>
+#include <silkworm/core/rlp/header.hpp>
 
 namespace silkworm::rlp {
 
diff --git a/silkworm/core/rlp/encode.cpp b/silkworm/core/rlp/encode.cpp
index 7b39792125..8760759582 100644
--- a/silkworm/core/rlp/encode.cpp
+++ b/silkworm/core/rlp/encode.cpp
@@ -16,6 +16,16 @@
 
 #include "encode.hpp"
 
+#include <cstddef>
+#include <cstdint>
+
+#include <intx/intx.hpp>
+
+#include <silkworm/core/common/bytes.hpp>
+#include <silkworm/core/common/endian.hpp>
+
+#include "header.hpp"
+
 namespace silkworm::rlp {
 
 void encode_header(Bytes& to, Header header) {
diff --git a/silkworm/core/rlp/encode.hpp b/silkworm/core/rlp/encode.hpp
index bdc32eb98d..5222f10086 100644
--- a/silkworm/core/rlp/encode.hpp
+++ b/silkworm/core/rlp/encode.hpp
@@ -24,14 +24,10 @@
 #include <silkworm/core/common/base.hpp>
 #include <silkworm/core/common/bytes.hpp>
 #include <silkworm/core/common/endian.hpp>
+#include <silkworm/core/rlp/header.hpp>
 
 namespace silkworm::rlp {
 
-struct Header {
-    bool list{false};
-    size_t payload_length{0};
-};
-
 inline constexpr uint8_t kEmptyStringCode{0x80};
 inline constexpr uint8_t kEmptyListCode{0xC0};
 
diff --git a/silkworm/core/rlp/header.hpp b/silkworm/core/rlp/header.hpp
new file mode 100644
index 0000000000..49b7bf2e94
--- /dev/null
+++ b/silkworm/core/rlp/header.hpp
@@ -0,0 +1,28 @@
+/*
+   Copyright 2022 The Silkworm Authors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+#pragma once
+
+#include <cstddef>
+
+namespace silkworm::rlp {
+
+struct Header {
+    bool list{false};
+    size_t payload_length{0};
+};
+
+}  // namespace silkworm::rlp
diff --git a/silkworm/core/state/delta.cpp b/silkworm/core/state/delta.cpp
index 4f83f51579..ffc4a65dfd 100644
--- a/silkworm/core/state/delta.cpp
+++ b/silkworm/core/state/delta.cpp
@@ -18,6 +18,8 @@
 
 #include <utility>
 
+#include <evmc/evmc.hpp>
+
 #include <silkworm/core/state/intra_block_state.hpp>
 
 namespace silkworm::state {
diff --git a/silkworm/core/state/in_memory_state.cpp b/silkworm/core/state/in_memory_state.cpp
index 115e306d90..b4c7490420 100644
--- a/silkworm/core/state/in_memory_state.cpp
+++ b/silkworm/core/state/in_memory_state.cpp
@@ -16,16 +16,28 @@
 
 #include "in_memory_state.hpp"
 
+#include <cstddef>
+#include <cstdint>
 #include <map>
+#include <optional>
+#include <vector>
 
-#include <ethash/keccak.hpp>
+#include <ethash/hash_types.hpp>
+#include <evmc/evmc.hpp>
+#include <intx/intx.hpp>
 
+#include <silkworm/core/common/base.hpp>
+#include <silkworm/core/common/bytes.hpp>
 #include <silkworm/core/common/empty_hashes.hpp>
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/rlp/encode.hpp>
 #include <silkworm/core/trie/hash_builder.hpp>
 #include <silkworm/core/trie/nibbles.hpp>
+#include <silkworm/core/types/account.hpp>
+#include <silkworm/core/types/block.hpp>
+#include <silkworm/core/types/call_traces.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
+#include <silkworm/core/types/receipt.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/core/state/intra_block_state.cpp b/silkworm/core/state/intra_block_state.cpp
index 2b4db6b43a..c0822e87e5 100644
--- a/silkworm/core/state/intra_block_state.cpp
+++ b/silkworm/core/state/intra_block_state.cpp
@@ -17,9 +17,13 @@
 #include "intra_block_state.hpp"
 
 #include <bit>
+#include <cstddef>
+
+#include <evmc/evmc.h>
 
 #include <silkworm/core/common/empty_hashes.hpp>
 #include <silkworm/core/common/util.hpp>
+#include <silkworm/core/types/log.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/core/trie/hash_builder.cpp b/silkworm/core/trie/hash_builder.cpp
index 1a59b4bcd9..514eb1067d 100644
--- a/silkworm/core/trie/hash_builder.cpp
+++ b/silkworm/core/trie/hash_builder.cpp
@@ -26,6 +26,7 @@
 #include <silkworm/core/common/empty_hashes.hpp>
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/rlp/encode.hpp>
+#include <silkworm/core/trie/node.hpp>
 
 namespace silkworm::trie {
 
diff --git a/silkworm/core/trie/nibbles.cpp b/silkworm/core/trie/nibbles.cpp
index 22047836ba..8528493e6b 100644
--- a/silkworm/core/trie/nibbles.cpp
+++ b/silkworm/core/trie/nibbles.cpp
@@ -16,6 +16,11 @@
 
 #include "nibbles.hpp"
 
+#include <cstddef>
+#include <cstdint>
+
+#include <silkworm/core/common/bytes.hpp>
+
 namespace silkworm::trie {
 
 Bytes pack_nibbles(ByteView unpacked) {
diff --git a/silkworm/core/trie/node.cpp b/silkworm/core/trie/node.cpp
index 28995f0a26..bd698508d0 100644
--- a/silkworm/core/trie/node.cpp
+++ b/silkworm/core/trie/node.cpp
@@ -17,9 +17,19 @@
 #include "node.hpp"
 
 #include <bit>
+#include <cstdint>
+#include <cstring>
+#include <optional>
 #include <utility>
+#include <vector>
+
+#include <evmc/evmc.hpp>
+#include <tl/expected.hpp>
 
 #include <silkworm/core/common/assert.hpp>
+#include <silkworm/core/common/base.hpp>
+#include <silkworm/core/common/bytes.hpp>
+#include <silkworm/core/common/decoding_result.hpp>
 #include <silkworm/core/common/endian.hpp>
 
 namespace silkworm::trie {
diff --git a/silkworm/core/trie/prefix_set.cpp b/silkworm/core/trie/prefix_set.cpp
index e99413a0be..1eae9de1bc 100644
--- a/silkworm/core/trie/prefix_set.cpp
+++ b/silkworm/core/trie/prefix_set.cpp
@@ -17,8 +17,12 @@
 #include "prefix_set.hpp"
 
 #include <algorithm>
+#include <cstddef>
+#include <cstring>
 #include <utility>
 
+#include <silkworm/core/common/bytes.hpp>
+
 namespace silkworm::trie {
 
 void PrefixSet::insert(ByteView key, bool marker) { insert(Bytes(key), marker); }
diff --git a/silkworm/core/types/account.cpp b/silkworm/core/types/account.cpp
index f61b79f7b5..ca3fd027dc 100644
--- a/silkworm/core/types/account.cpp
+++ b/silkworm/core/types/account.cpp
@@ -16,9 +16,19 @@
 
 #include "account.hpp"
 
+#include <cstdint>
+#include <cstring>
+
+#include <intx/intx.hpp>
+#include <tl/expected.hpp>
+
+#include <silkworm/core/common/base.hpp>
+#include <silkworm/core/common/bytes.hpp>
+#include <silkworm/core/common/decoding_result.hpp>
 #include <silkworm/core/common/empty_hashes.hpp>
 #include <silkworm/core/common/endian.hpp>
 #include <silkworm/core/rlp/encode.hpp>
+#include <silkworm/core/rlp/header.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
 
 namespace silkworm {
diff --git a/silkworm/core/types/address.cpp b/silkworm/core/types/address.cpp
index 97cd283db8..b67c190fb1 100644
--- a/silkworm/core/types/address.cpp
+++ b/silkworm/core/types/address.cpp
@@ -16,11 +16,21 @@
 
 #include "address.hpp"
 
+#include <algorithm>
+#include <cstddef>
+#include <cstring>
+#include <optional>
+#include <string_view>
+
 #include <ethash/keccak.hpp>
+#include <evmc/evmc.hpp>
 
 #include <silkworm/core/common/assert.hpp>
+#include <silkworm/core/common/base.hpp>
+#include <silkworm/core/common/bytes.hpp>
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/rlp/encode.hpp>
+#include <silkworm/core/rlp/header.hpp>
 
 namespace silkworm {
 
diff --git a/silkworm/core/types/log.cpp b/silkworm/core/types/log.cpp
index d74e90e8b1..2b891afeb0 100644
--- a/silkworm/core/types/log.cpp
+++ b/silkworm/core/types/log.cpp
@@ -16,7 +16,13 @@
 
 #include "log.hpp"
 
+#include <cstddef>
+
+#include <silkworm/core/common/base.hpp>
+#include <silkworm/core/common/bytes.hpp>
+#include <silkworm/core/rlp/encode.hpp>
 #include <silkworm/core/rlp/encode_vector.hpp>
+#include <silkworm/core/rlp/header.hpp>
 #include <silkworm/core/types/address.hpp>
 #include <silkworm/core/types/evmc_bytes32.hpp>
 
diff --git a/silkworm/core/types/receipt.cpp b/silkworm/core/types/receipt.cpp
index 8ba3e23e5c..5cac177220 100644
--- a/silkworm/core/types/receipt.cpp
+++ b/silkworm/core/types/receipt.cpp
@@ -16,8 +16,13 @@
 
 #include "receipt.hpp"
 
-#include <silkworm/core/common/util.hpp>
+#include <cstdint>
+
+#include <silkworm/core/common/bytes.hpp>
 #include <silkworm/core/rlp/encode_vector.hpp>
+#include <silkworm/core/rlp/header.hpp>
+
+#include "transaction.hpp"
 
 namespace silkworm::rlp {
 
diff --git a/silkworm/core/types/transaction.cpp b/silkworm/core/types/transaction.cpp
index 05b4ace0be..4dc84af3d5 100644
--- a/silkworm/core/types/transaction.cpp
+++ b/silkworm/core/types/transaction.cpp
@@ -16,10 +16,13 @@
 
 #include "transaction.hpp"
 
+#include <algorithm>
 #include <bit>
 
 #include <ethash/keccak.hpp>
+#include <tl/expected.hpp>
 
+#include <silkworm/core/common/assert.hpp>
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/crypto/ecdsa.h>
 #include <silkworm/core/protocol/param.hpp>
diff --git a/silkworm/core/types/withdrawal.cpp b/silkworm/core/types/withdrawal.cpp
index 8f57435f90..abf1afb773 100644
--- a/silkworm/core/types/withdrawal.cpp
+++ b/silkworm/core/types/withdrawal.cpp
@@ -16,8 +16,14 @@
 
 #include "withdrawal.hpp"
 
+#include <cstddef>
+
+#include <silkworm/core/common/bytes.hpp>
+#include <silkworm/core/common/decoding_result.hpp>
+#include <silkworm/core/rlp/decode.hpp>
 #include <silkworm/core/rlp/decode_vector.hpp>
 #include <silkworm/core/rlp/encode.hpp>
+#include <silkworm/core/rlp/header.hpp>
 #include <silkworm/core/types/address.hpp>
 
 namespace silkworm::rlp {
diff --git a/silkworm/core/types/y_parity_and_chain_id.cpp b/silkworm/core/types/y_parity_and_chain_id.cpp
index 4a8aa9163d..7a1dab1062 100644
--- a/silkworm/core/types/y_parity_and_chain_id.cpp
+++ b/silkworm/core/types/y_parity_and_chain_id.cpp
@@ -16,6 +16,11 @@
 
 #include "y_parity_and_chain_id.hpp"
 
+#include <cstdint>
+#include <optional>
+
+#include <intx/intx.hpp>
+
 namespace silkworm {
 
 intx::uint256 y_parity_and_chain_id_to_v(bool odd, const std::optional<intx::uint256>& chain_id) noexcept {
diff --git a/silkworm/node/stagedsync/stages/stage_interhashes/_test.cpp b/silkworm/node/stagedsync/stages/stage_interhashes/_test.cpp
index 2cd8a641b4..ddd01b33be 100644
--- a/silkworm/node/stagedsync/stages/stage_interhashes/_test.cpp
+++ b/silkworm/node/stagedsync/stages/stage_interhashes/_test.cpp
@@ -17,6 +17,7 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include <silkworm/core/common/empty_hashes.hpp>
+#include <silkworm/core/rlp/encode.hpp>
 #include <silkworm/core/trie/hash_builder.hpp>
 #include <silkworm/core/trie/nibbles.hpp>
 #include <silkworm/core/types/account.hpp>
diff --git a/silkworm/node/stagedsync/stages/stage_interhashes/trie_loader.cpp b/silkworm/node/stagedsync/stages/stage_interhashes/trie_loader.cpp
index 44de8a391d..7b48a0bf6a 100644
--- a/silkworm/node/stagedsync/stages/stage_interhashes/trie_loader.cpp
+++ b/silkworm/node/stagedsync/stages/stage_interhashes/trie_loader.cpp
@@ -19,6 +19,7 @@
 #include <stdexcept>
 
 #include <silkworm/core/common/empty_hashes.hpp>
+#include <silkworm/core/rlp/encode.hpp>
 #include <silkworm/core/trie/nibbles.hpp>
 #include <silkworm/core/types/account.hpp>
 #include <silkworm/db/tables.hpp>
diff --git a/silkworm/rpc/core/account_dumper.cpp b/silkworm/rpc/core/account_dumper.cpp
index c8b4f199f7..53527e20c6 100644
--- a/silkworm/rpc/core/account_dumper.cpp
+++ b/silkworm/rpc/core/account_dumper.cpp
@@ -20,6 +20,7 @@
 
 #include <silkworm/core/common/decoding_result.hpp>
 #include <silkworm/core/common/empty_hashes.hpp>
+#include <silkworm/core/rlp/encode.hpp>
 #include <silkworm/core/trie/hash_builder.hpp>
 #include <silkworm/core/trie/nibbles.hpp>
 #include <silkworm/core/types/address.hpp>
diff --git a/silkworm/rpc/core/evm_executor.cpp b/silkworm/rpc/core/evm_executor.cpp
index 63650185fd..6ee379b952 100644
--- a/silkworm/rpc/core/evm_executor.cpp
+++ b/silkworm/rpc/core/evm_executor.cpp
@@ -16,6 +16,7 @@
 
 #include "evm_executor.hpp"
 
+#include <algorithm>
 #include <optional>
 #include <string>
 #include <utility>
diff --git a/silkworm/rpc/json/log.cpp b/silkworm/rpc/json/log.cpp
index abf981b1c1..8b25a24bb3 100644
--- a/silkworm/rpc/json/log.cpp
+++ b/silkworm/rpc/json/log.cpp
@@ -22,7 +22,6 @@
 
 #include <silkworm/core/common/util.hpp>
 #include <silkworm/core/types/address.hpp>
-#include <silkworm/core/types/evmc_bytes32.hpp>
 #include <silkworm/rpc/common/util.hpp>
 #include <silkworm/rpc/json/types.hpp>
 
diff --git a/silkworm/rpc/types/log.cpp b/silkworm/rpc/types/log.cpp
index 92262d342a..6329bc41cf 100644
--- a/silkworm/rpc/types/log.cpp
+++ b/silkworm/rpc/types/log.cpp
@@ -18,7 +18,6 @@
 
 #include <iomanip>
 
-#include <silkworm/core/types/evmc_bytes32.hpp>
 #include <silkworm/rpc/common/util.hpp>
 
 namespace silkworm::rpc {