diff --git a/src/consensus/activation.cpp b/src/consensus/activation.cpp --- a/src/consensus/activation.cpp +++ b/src/consensus/activation.cpp @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "activation.h" +#include -#include "chain.h" -#include "chainparams.h" -#include "config.h" -#include "util.h" +#include +#include +#include +#include static bool IsUAHFenabled(const Config &config, int nHeight) { return nHeight >= config.GetChainParams().GetConsensus().uahfHeight; diff --git a/src/consensus/merkle.h b/src/consensus/merkle.h --- a/src/consensus/merkle.h +++ b/src/consensus/merkle.h @@ -8,9 +8,9 @@ #include #include -#include "primitives/block.h" -#include "primitives/transaction.h" -#include "uint256.h" +#include +#include +#include uint256 ComputeMerkleRoot(std::vector hashes, bool *mutated = nullptr); diff --git a/src/consensus/merkle.cpp b/src/consensus/merkle.cpp --- a/src/consensus/merkle.cpp +++ b/src/consensus/merkle.cpp @@ -2,9 +2,9 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "merkle.h" -#include "hash.h" -#include "utilstrencodings.h" +#include +#include +#include /* WARNING! If you're reading this because you're learning about crypto and/or designing a new system that will use merkle trees, keep in mind diff --git a/src/consensus/params.h b/src/consensus/params.h --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -6,7 +6,7 @@ #ifndef BITCOIN_CONSENSUS_PARAMS_H #define BITCOIN_CONSENSUS_PARAMS_H -#include "uint256.h" +#include #include #include diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp --- a/src/consensus/tx_verify.cpp +++ b/src/consensus/tx_verify.cpp @@ -2,17 +2,17 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "tx_verify.h" - -#include "chain.h" -#include "coins.h" -#include "consensus/activation.h" -#include "consensus/consensus.h" -#include "consensus/validation.h" -#include "primitives/transaction.h" -#include "script/script_flags.h" -#include "utilmoneystr.h" // For FormatMoney -#include "version.h" // For PROTOCOL_VERSION +#include + +#include +#include +#include +#include +#include +#include +#include