Merge #12757: Clarify include guard naming convention

3bcc0059b8 Add lint-include-guards.sh which checks include guard consistency (practicalswift)
8fd6af89a0 Fix missing or inconsistent include guards (practicalswift)
8af65d96f4 Document include guard convention (practicalswift)

Pull request description:

  * **Documentation**: Document include guard convention
  * **Fix**: Fix missing or inconsistent include guards
  * **Regression test**: Add `lint-include-guards.sh` which checks include guard consistency

Tree-SHA512: 8171878f60fd08ccbea943a11e835195750592abb9d7ab74eaa4265ae7fac523b1da9d31ca13d6ab73dd596e49986bfb7593c696e5f39567c93e610165bc2acc
Signed-off-by: pasta <pasta@dashboost.org>

# Conflicts:
#	src/bech32.h
#	src/consensus/merkle.h
#	src/key_io.h
#	src/policy/fees.h
#	src/rpc/server.h
#	src/script/bitcoinconsensus.h
#	src/wallet/coinselection.h

contrib/devtools/lint-include-guards.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Copyright (c) 2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+# Check include guards.
+
+HEADER_ID_PREFIX="BITCOIN_"
+HEADER_ID_SUFFIX="_H"
+
+REGEXP_EXCLUDE_FILES_WITH_PREFIX="src/(crypto/ctaes/|leveldb/|secp256k1/|tinyformat.h|univalue/|ctpl.h|bls/|crypto/sph)"
+
+EXIT_CODE=0
+for HEADER_FILE in $(git ls-files -- "*.h" | grep -vE "^${REGEXP_EXCLUDE_FILES_WITH_PREFIX}")
+do
+    HEADER_ID_BASE=$(cut -f2- -d/ <<< "${HEADER_FILE}" | sed "s/\.h$//g" | tr / _ | tr "[:lower:]" "[:upper:]")
+    HEADER_ID="${HEADER_ID_PREFIX}${HEADER_ID_BASE}${HEADER_ID_SUFFIX}"
+    if [[ $(grep -cE "^#(ifndef|define) ${HEADER_ID}" "${HEADER_FILE}") != 2 ]]; then
+        echo "${HEADER_FILE} seems to be missing the expected include guard:"
+        echo "  #ifndef ${HEADER_ID}"
+        echo "  #define ${HEADER_ID}"
+        echo "  ..."
+        echo "  #endif // ${HEADER_ID}"
+        echo
+        EXIT_CODE=1
+    fi
+done
+exit ${EXIT_CODE}

doc/developer-notes.md

@@ -563,6 +563,16 @@ namespace {
     source file into account. This allows quoted includes to stand out more when
     the location of the source file actually is relevant.
 
+- Use include guards to avoid the problem of double inclusion. The header file
+  `foo/bar.h` should use the include guard identifier `BITCOIN_FOO_BAR_H`, e.g.
+
+```c++
+#ifndef BITCOIN_FOO_BAR_H
+#define BITCOIN_FOO_BAR_H
+...
+#endif // BITCOIN_FOO_BAR_H
+```
+
 GUI
 -----
 

src/batchedlogger.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_BATCHEDLOGGER_H
-#define DASH_BATCHEDLOGGER_H
+#ifndef BITCOIN_BATCHEDLOGGER_H
+#define BITCOIN_BATCHEDLOGGER_H
 
 #include <tinyformat.h>
 
@@ -29,4 +29,4 @@ public:
     void Flush();
 };
 
-#endif//DASH_BATCHEDLOGGER_H
+#endif//BITCOIN_BATCHEDLOGGER_H

src/bench/perf.h

@@ -3,8 +3,8 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 /** Functions for measurement of CPU cycles */
-#ifndef H_PERF
-#define H_PERF
+#ifndef BITCOIN_BENCH_PERF_H
+#define BITCOIN_BENCH_PERF_H
 
 #include <stdint.h>
 
@@ -34,4 +34,4 @@ uint64_t perf_cpucycles(void);
 void perf_init(void);
 void perf_fini(void);
 
-#endif // H_PERF
+#endif // BITCOIN_BENCH_PERF_H

src/bip39.h

@@ -21,8 +21,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifndef DASH_BIP39_H
-#define DASH_BIP39_H
+#ifndef BITCOIN_BIP39_H
+#define BITCOIN_BIP39_H
 
 #include <support/allocators/secure.h>
 
@@ -36,4 +36,4 @@ public:
     static void ToSeed(SecureString mnemonic, SecureString passphrase, SecureVector& seedRet);
 };
 
-#endif
+#endif // BITCOIN_BIP39_H

src/bip39_english.h

@@ -21,6 +21,9 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifndef BITCOIN_BIP39_ENGLISH_H
+#define BITCOIN_BIP39_ENGLISH_H
+
 const char * const wordlist[] = {
 "abandon",
 "ability",
@@ -2072,3 +2075,5 @@ const char * const wordlist[] = {
 "zoo",
 0,
 };
+
+#endif // BITCOIN_BIP39_ENGLISH_H

src/blockencodings.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_BLOCK_ENCODINGS_H
-#define BITCOIN_BLOCK_ENCODINGS_H
+#ifndef BITCOIN_BLOCKENCODINGS_H
+#define BITCOIN_BLOCKENCODINGS_H
 
 #include <primitives/block.h>
 
@@ -209,4 +209,4 @@ public:
     ReadStatus FillBlock(CBlock& block, const std::vector<CTransactionRef>& vtx_missing);
 };
 
-#endif
+#endif // BITCOIN_BLOCKENCODINGS_H

src/cachemap.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef CACHEMAP_H_
-#define CACHEMAP_H_
+#ifndef BITCOIN_CACHEMAP_H
+#define BITCOIN_CACHEMAP_H
 
 #include <map>
 #include <list>
@@ -186,4 +186,4 @@ private:
     }
 };
 
-#endif /* CACHEMAP_H_ */
+#endif // BITCOIN_CACHEMAP_H

src/cachemultimap.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef CACHEMULTIMAP_H_
-#define CACHEMULTIMAP_H_
+#ifndef BITCOIN_CACHEMULTIMAP_H
+#define BITCOIN_CACHEMULTIMAP_H
 
 #include <cstddef>
 #include <map>
@@ -245,4 +245,4 @@ private:
     }
 };
 
-#endif /* CACHEMULTIMAP_H_ */
+#endif // BITCOIN_CACHEMULTIMAP_H

src/chainparamsseeds.h

@@ -1,5 +1,5 @@
-#ifndef DASH_CHAINPARAMSSEEDS_H
-#define DASH_CHAINPARAMSSEEDS_H
+#ifndef BITCOIN_CHAINPARAMSSEEDS_H
+#define BITCOIN_CHAINPARAMSSEEDS_H
 /**
  * List of fixed seed nodes for the dash network
  * AUTOGENERATED by contrib/seeds/generate-seeds.py
@@ -283,4 +283,4 @@ static SeedSpec6 pnSeed6_test[] = {
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd5,0x25,0x01}, 19999},
     {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xb9,0xd5,0x25,0x02}, 19999}
 };
-#endif // DASH_CHAINPARAMSSEEDS_H
+#endif // BITCOIN_CHAINPARAMSSEEDS_H

src/consensus/merkle.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_MERKLE
-#define BITCOIN_MERKLE
+#ifndef BITCOIN_CONSENSUS_MERKLE_H
+#define BITCOIN_CONSENSUS_MERKLE_H
 
 #include <stdint.h>
 #include <vector>
@@ -20,4 +20,4 @@ uint256 ComputeMerkleRoot(std::vector<uint256> hashes, bool* mutated = nullptr);
  */
 uint256 BlockMerkleRoot(const CBlock& block, bool* mutated = nullptr);
 
-#endif
+#endif // BITCOIN_CONSENSUS_MERKLE_H

src/evo/cbtx.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_CBTX_H
-#define DASH_CBTX_H
+#ifndef BITCOIN_EVO_CBTX_H
+#define BITCOIN_EVO_CBTX_H
 
 #include <consensus/validation.h>
 #include <primitives/transaction.h>
@@ -60,4 +60,4 @@ bool CheckCbTxMerkleRoots(const CBlock& block, const CBlockIndex* pindex, CValid
 bool CalcCbTxMerkleRootMNList(const CBlock& block, const CBlockIndex* pindexPrev, uint256& merkleRootRet, CValidationState& state);
 bool CalcCbTxMerkleRootQuorums(const CBlock& block, const CBlockIndex* pindexPrev, uint256& merkleRootRet, CValidationState& state);
 
-#endif //DASH_CBTX_H
+#endif // BITCOIN_EVO_CBTX_H

src/evo/deterministicmns.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_DETERMINISTICMNS_H
-#define DASH_DETERMINISTICMNS_H
+#ifndef BITCOIN_EVO_DETERMINISTICMNS_H
+#define BITCOIN_EVO_DETERMINISTICMNS_H
 
 #include <arith_uint256.h>
 #include <bls/bls.h>
@@ -682,4 +682,4 @@ private:
 
 extern std::unique_ptr<CDeterministicMNManager> deterministicMNManager;
 
-#endif //DASH_DETERMINISTICMNS_H
+#endif // BITCOIN_EVO_DETERMINISTICMNS_H

src/evo/evodb.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_EVODB_H
-#define DASH_EVODB_H
+#ifndef BITCOIN_EVO_EVODB_H
+#define BITCOIN_EVO_EVODB_H
 
 #include <dbwrapper.h>
 #include <sync.h>
@@ -110,4 +110,4 @@ private:
 
 extern std::unique_ptr<CEvoDB> evoDb;
 
-#endif //DASH_EVODB_H
+#endif // BITCOIN_EVO_EVODB_H

src/evo/mnauth.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_MNAUTH_H
-#define DASH_MNAUTH_H
+#ifndef BITCOIN_EVO_MNAUTH_H
+#define BITCOIN_EVO_MNAUTH_H
 
 #include <bls/bls.h>
 #include <serialize.h>
@@ -55,4 +55,4 @@ public:
 };
 
 
-#endif //DASH_MNAUTH_H
+#endif // BITCOIN_EVO_MNAUTH_H

src/evo/providertx.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_PROVIDERTX_H
-#define DASH_PROVIDERTX_H
+#ifndef BITCOIN_EVO_PROVIDERTX_H
+#define BITCOIN_EVO_PROVIDERTX_H
 
 #include <bls/bls.h>
 #include <consensus/validation.h>
@@ -240,4 +240,4 @@ bool CheckProUpServTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVa
 bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 bool CheckProUpRevTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValidationState& state);
 
-#endif //DASH_PROVIDERTX_H
+#endif // BITCOIN_EVO_PROVIDERTX_H

src/evo/simplifiedmns.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_SIMPLIFIEDMNS_H
-#define DASH_SIMPLIFIEDMNS_H
+#ifndef BITCOIN_EVO_SIMPLIFIEDMNS_H
+#define BITCOIN_EVO_SIMPLIFIEDMNS_H
 
 #include <bls/bls.h>
 #include <merkleblock.h>
@@ -147,4 +147,4 @@ public:
 
 bool BuildSimplifiedMNListDiff(const uint256& baseBlockHash, const uint256& blockHash, CSimplifiedMNListDiff& mnListDiffRet, std::string& errorRet);
 
-#endif //DASH_SIMPLIFIEDMNS_H
+#endif // BITCOIN_EVO_SIMPLIFIEDMNS_H

src/evo/specialtx.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_SPECIALTX_H
-#define DASH_SPECIALTX_H
+#ifndef BITCOIN_EVO_SPECIALTX_H
+#define BITCOIN_EVO_SPECIALTX_H
 
 #include <primitives/transaction.h>
 #include <streams.h>
@@ -49,4 +49,4 @@ void SetTxPayload(CMutableTransaction& tx, const T& payload)
 
 uint256 CalcTxInputsHash(const CTransaction& tx);
 
-#endif //DASH_SPECIALTX_H
+#endif // BITCOIN_EVO_SPECIALTX_H

src/flat-database.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef FLAT_DATABASE_H
-#define FLAT_DATABASE_H
+#ifndef BITCOIN_FLAT-DATABASE_H
+#define BITCOIN_FLAT-DATABASE_H
 
 #include <chainparams.h>
 #include <clientversion.h>
@@ -225,4 +225,4 @@ public:
 };
 
 
-#endif
+#endif // BITCOIN_FLAT-DATABASE_H

src/governance/governance-classes.h

@@ -1,8 +1,8 @@
 // Copyright (c) 2014-2020 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#ifndef GOVERNANCE_CLASSES_H
-#define GOVERNANCE_CLASSES_H
+#ifndef BITCOIN_GOVERNANCE_GOVERNANCE-CLASSES_H
+#define BITCOIN_GOVERNANCE_GOVERNANCE-CLASSES_H
 
 #include <base58.h>
 #include <governance/governance.h>
@@ -173,4 +173,4 @@ public:
     bool IsExpired() const;
 };
 
-#endif
+#endif // BITCOIN_GOVERNANCE_GOVERNANCE-CLASSES_H

src/governance/governance-exceptions.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef GOVERNANCE_EXCEPTIONS_H
-#define GOVERNANCE_EXCEPTIONS_H
+#ifndef BITCOIN_GOVERNANCE_GOVERNANCE-EXCEPTIONS_H
+#define BITCOIN_GOVERNANCE_GOVERNANCE-EXCEPTIONS_H
 
 #include <exception>
 #include <iostream>
@@ -97,4 +97,4 @@ public:
     }
 };
 
-#endif
+#endif // BITCOIN_GOVERNANCE_GOVERNANCE-EXCEPTIONS_H

src/governance/governance-object.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef GOVERNANCE_OBJECT_H
-#define GOVERNANCE_OBJECT_H
+#ifndef BITCOIN_GOVERNANCE_GOVERNANCE-OBJECT_H
+#define BITCOIN_GOVERNANCE_GOVERNANCE-OBJECT_H
 
 #include <cachemultimap.h>
 #include <governance/governance-exceptions.h>
@@ -356,4 +356,4 @@ public:
 };
 
 
-#endif
+#endif // BITCOIN_GOVERNANCE_GOVERNANCE-OBJECT_H

src/governance/governance-validators.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef GOVERNANCE_VALIDATORS_H
-#define GOVERNANCE_VALIDATORS_H
+#ifndef BITCOIN_GOVERNANCE_GOVERNANCE-VALIDATORS_H
+#define BITCOIN_GOVERNANCE_GOVERNANCE-VALIDATORS_H
 
 #include <string>
 
@@ -44,4 +44,4 @@ private:
     bool CheckURL(const std::string& strURLIn);
 };
 
-#endif
+#endif // BITCOIN_GOVERNANCE_GOVERNANCE-VALIDATORS_H

src/governance/governance-vote.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef GOVERNANCE_VOTE_H
-#define GOVERNANCE_VOTE_H
+#ifndef BITCOIN_GOVERNANCE_GOVERNANCE-VOTE_H
+#define BITCOIN_GOVERNANCE_GOVERNANCE-VOTE_H
 
 #include <key.h>
 #include <primitives/transaction.h>
@@ -133,4 +133,4 @@ public:
     }
 };
 
-#endif
+#endif // BITCOIN_GOVERNANCE_GOVERNANCE-VOTE_H

src/governance/governance-votedb.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef GOVERNANCE_VOTEDB_H
-#define GOVERNANCE_VOTEDB_H
+#ifndef BITCOIN_GOVERNANCE_GOVERNANCE-VOTEDB_H
+#define BITCOIN_GOVERNANCE_GOVERNANCE-VOTEDB_H
 
 #include <list>
 #include <map>
@@ -92,4 +92,4 @@ private:
     void RebuildIndex();
 };
 
-#endif
+#endif // BITCOIN_GOVERNANCE_GOVERNANCE-VOTEDB_H

src/governance/governance.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef GOVERNANCE_H
-#define GOVERNANCE_H
+#ifndef BITCOIN_GOVERNANCE_GOVERNANCE_H
+#define BITCOIN_GOVERNANCE_GOVERNANCE_H
 
 #include <bloom.h>
 #include <cachemap.h>
@@ -432,4 +432,4 @@ private:
 
 };
 
-#endif
+#endif // BITCOIN_GOVERNANCE_GOVERNANCE_H

src/hdchain.h

@@ -1,7 +1,7 @@
 // Copyright (c) 2014-2019 The Dash Core developers
 // Distributed under the MIT software license, see the accompanying
-#ifndef DASH_HDCHAIN_H
-#define DASH_HDCHAIN_H
+#ifndef BITCOIN_HDCHAIN_H
+#define BITCOIN_HDCHAIN_H
 
 #include <key.h>
 #include <sync.h>
@@ -147,4 +147,4 @@ public:
     std::string GetKeyPath() const;
 };
 
-#endif // DASH_HDCHAIN_H
+#endif // BITCOIN_HDCHAIN_H

src/keepass.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef _KEEPASS_H_
-#define _KEEPASS_H_
+#ifndef BITCOIN_KEEPASS_H
+#define BITCOIN_KEEPASS_H
 
 #include <support/allocators/secure.h>
 
@@ -130,4 +130,4 @@ public:
 
 };
 
-#endif
+#endif // BITCOIN_KEEPASS_H

src/llmq/quorums.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_QUORUMS_H
-#define DASH_QUORUMS_H
+#ifndef BITCOIN_LLMQ_QUORUMS_H
+#define BITCOIN_LLMQ_QUORUMS_H
 
 #include <evo/evodb.h>
 #include <evo/deterministicmns.h>
@@ -117,4 +117,4 @@ extern CQuorumManager* quorumManager;
 
 } // namespace llmq
 
-#endif //DASH_QUORUMS_H
+#endif // BITCOIN_LLMQ_QUORUMS_H

src/llmq/quorums_blockprocessor.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_QUORUMS_BLOCKPROCESSOR_H
-#define DASH_QUORUMS_BLOCKPROCESSOR_H
+#ifndef BITCOIN_LLMQ_QUORUMS_BLOCKPROCESSOR_H
+#define BITCOIN_LLMQ_QUORUMS_BLOCKPROCESSOR_H
 
 #include <llmq/quorums_commitment.h>
 #include <llmq/quorums_utils.h>
@@ -68,4 +68,4 @@ extern CQuorumBlockProcessor* quorumBlockProcessor;
 
 } // namespace llmq
 
-#endif//DASH_QUORUMS_BLOCKPROCESSOR_H
+#endif // BITCOIN_LLMQ_QUORUMS_BLOCKPROCESSOR_H

src/llmq/quorums_chainlocks.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_QUORUMS_CHAINLOCKS_H
-#define DASH_QUORUMS_CHAINLOCKS_H
+#ifndef BITCOIN_LLMQ_QUORUMS_CHAINLOCKS_H
+#define BITCOIN_LLMQ_QUORUMS_CHAINLOCKS_H
 
 #include <llmq/quorums.h>
 #include <llmq/quorums_signing.h>
@@ -125,4 +125,4 @@ extern CChainLocksHandler* chainLocksHandler;
 
 } // namespace llmq
 
-#endif //DASH_QUORUMS_CHAINLOCKS_H
+#endif // BITCOIN_LLMQ_QUORUMS_CHAINLOCKS_H

src/llmq/quorums_commitment.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_QUORUMS_COMMITMENT_H
-#define DASH_QUORUMS_COMMITMENT_H
+#ifndef BITCOIN_LLMQ_QUORUMS_COMMITMENT_H
+#define BITCOIN_LLMQ_QUORUMS_COMMITMENT_H
 
 #include <llmq/quorums_utils.h>
 
@@ -143,4 +143,4 @@ bool CheckLLMQCommitment(const CTransaction& tx, const CBlockIndex* pindexPrev,
 
 } // namespace llmq
 
-#endif //DASH_QUORUMS_COMMITMENT_H
+#endif // BITCOIN_LLMQ_QUORUMS_COMMITMENT_H

src/llmq/quorums_debug.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_QUORUMS_DEBUG_H
-#define DASH_QUORUMS_DEBUG_H
+#ifndef BITCOIN_LLMQ_QUORUMS_DEBUG_H
+#define BITCOIN_LLMQ_QUORUMS_DEBUG_H
 
 #include <consensus/params.h>
 #include <sync.h>
@@ -108,4 +108,4 @@ extern CDKGDebugManager* quorumDKGDebugManager;
 
 } // namespace llmq
 
-#endif //DASH_QUORUMS_DEBUG_H
+#endif // BITCOIN_LLMQ_QUORUMS_DEBUG_H

src/llmq/quorums_dkgsession.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_QUORUMS_DKGSESSION_H
-#define DASH_QUORUMS_DKGSESSION_H
+#ifndef BITCOIN_LLMQ_QUORUMS_DKGSESSION_H
+#define BITCOIN_LLMQ_QUORUMS_DKGSESSION_H
 
 #include <consensus/params.h>
 #include <net.h>
@@ -345,4 +345,4 @@ void SetSimulatedDKGErrorRate(const std::string& type, double rate);
 
 } // namespace llmq
 
-#endif //DASH_QUORUMS_DKGSESSION_H
+#endif // BITCOIN_LLMQ_QUORUMS_DKGSESSION_H

src/llmq/quorums_dkgsessionhandler.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_QUORUMS_DKGSESSIONHANDLER_H
-#define DASH_QUORUMS_DKGSESSIONHANDLER_H
+#ifndef BITCOIN_LLMQ_QUORUMS_DKGSESSIONHANDLER_H
+#define BITCOIN_LLMQ_QUORUMS_DKGSESSIONHANDLER_H
 
 #include <llmq/quorums_dkgsession.h>
 
@@ -145,4 +145,4 @@ private:
 
 } // namespace llmq
 
-#endif //DASH_QUORUMS_DKGSESSIONHANDLER_H
+#endif // BITCOIN_LLMQ_QUORUMS_DKGSESSIONHANDLER_H

src/llmq/quorums_dkgsessionmgr.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_QUORUMS_DKGSESSIONMGR_H
-#define DASH_QUORUMS_DKGSESSIONMGR_H
+#ifndef BITCOIN_LLMQ_QUORUMS_DKGSESSIONMGR_H
+#define BITCOIN_LLMQ_QUORUMS_DKGSESSIONMGR_H
 
 #include <llmq/quorums_dkgsessionhandler.h>
 
@@ -75,4 +75,4 @@ extern CDKGSessionManager* quorumDKGSessionManager;
 
 } // namespace llmq
 
-#endif //DASH_QUORUMS_DKGSESSIONMGR_H
+#endif // BITCOIN_LLMQ_QUORUMS_DKGSESSIONMGR_H

src/llmq/quorums_init.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_QUORUMS_INIT_H
-#define DASH_QUORUMS_INIT_H
+#ifndef BITCOIN_LLMQ_QUORUMS_INIT_H
+#define BITCOIN_LLMQ_QUORUMS_INIT_H
 
 class CDBWrapper;
 class CEvoDB;
@@ -24,4 +24,4 @@ void StopLLMQSystem();
 void InterruptLLMQSystem();
 } // namespace llmq
 
-#endif //DASH_QUORUMS_INIT_H
+#endif // BITCOIN_LLMQ_QUORUMS_INIT_H

src/llmq/quorums_instantsend.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_QUORUMS_INSTANTSEND_H
-#define DASH_QUORUMS_INSTANTSEND_H
+#ifndef BITCOIN_LLMQ_QUORUMS_INSTANTSEND_H
+#define BITCOIN_LLMQ_QUORUMS_INSTANTSEND_H
 
 #include <llmq/quorums_signing.h>
 
@@ -177,4 +177,4 @@ bool IsInstantSendEnabled();
 
 } // namespace llmq
 
-#endif//DASH_QUORUMS_INSTANTSEND_H
+#endif // BITCOIN_LLMQ_QUORUMS_INSTANTSEND_H

src/llmq/quorums_signing.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_QUORUMS_SIGNING_H
-#define DASH_QUORUMS_SIGNING_H
+#ifndef BITCOIN_LLMQ_QUORUMS_SIGNING_H
+#define BITCOIN_LLMQ_QUORUMS_SIGNING_H
 
 #include <llmq/quorums.h>
 
@@ -191,4 +191,4 @@ extern CSigningManager* quorumSigningManager;
 
 } // namespace llmq
 
-#endif //DASH_QUORUMS_SIGNING_H
+#endif // BITCOIN_LLMQ_QUORUMS_SIGNING_H

src/llmq/quorums_signing_shares.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_QUORUMS_SIGNING_SHARES_H
-#define DASH_QUORUMS_SIGNING_SHARES_H
+#ifndef BITCOIN_LLMQ_QUORUMS_SIGNING_SHARES_H
+#define BITCOIN_LLMQ_QUORUMS_SIGNING_SHARES_H
 
 #include <bls/bls.h>
 #include <chainparams.h>
@@ -460,4 +460,4 @@ extern CSigSharesManager* quorumSigSharesManager;
 
 } // namespace llmq
 
-#endif //DASH_QUORUMS_SIGNING_SHARES_H
+#endif // BITCOIN_LLMQ_QUORUMS_SIGNING_SHARES_H

src/llmq/quorums_utils.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_QUORUMS_UTILS_H
-#define DASH_QUORUMS_UTILS_H
+#ifndef BITCOIN_LLMQ_QUORUMS_UTILS_H
+#define BITCOIN_LLMQ_QUORUMS_UTILS_H
 
 #include <consensus/params.h>
 #include <net.h>
@@ -83,4 +83,4 @@ public:
 
 } // namespace llmq
 
-#endif//DASH_QUORUMS_UTILS_H
+#endif // BITCOIN_LLMQ_QUORUMS_UTILS_H

src/masternode/activemasternode.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef ACTIVEMASTERNODE_H
-#define ACTIVEMASTERNODE_H
+#ifndef BITCOIN_MASTERNODE_ACTIVEMASTERNODE_H
+#define BITCOIN_MASTERNODE_ACTIVEMASTERNODE_H
 
 #include <chainparams.h>
 #include <key.h>
@@ -63,4 +63,4 @@ private:
     bool GetLocalAddress(CService& addrRet);
 };
 
-#endif
+#endif // BITCOIN_MASTERNODE_ACTIVEMASTERNODE_H

src/masternode/masternode-meta.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef MASTERNODE_META_H
-#define MASTERNODE_META_H
+#ifndef BITCOIN_MASTERNODE_MASTERNODE-META_H
+#define BITCOIN_MASTERNODE_MASTERNODE-META_H
 
 #include <serialize.h>
 
@@ -158,4 +158,4 @@ public:
 
 extern CMasternodeMetaMan mmetaman;
 
-#endif//MASTERNODE_META_H
+#endif // BITCOIN_MASTERNODE_MASTERNODE-META_H

src/masternode/masternode-payments.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef MASTERNODE_PAYMENTS_H
-#define MASTERNODE_PAYMENTS_H
+#ifndef BITCOIN_MASTERNODE_MASTERNODE-PAYMENTS_H
+#define BITCOIN_MASTERNODE_MASTERNODE-PAYMENTS_H
 
 #include <util.h>
 #include <core_io.h>
@@ -37,4 +37,4 @@ public:
     bool GetMasternodeTxOuts(int nBlockHeight, CAmount blockReward, std::vector<CTxOut>& voutMasternodePaymentsRet) const;
 };
 
-#endif
+#endif // BITCOIN_MASTERNODE_MASTERNODE-PAYMENTS_H

src/masternode/masternode-sync.h

@@ -1,8 +1,8 @@
 // Copyright (c) 2014-2019 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#ifndef MASTERNODE_SYNC_H
-#define MASTERNODE_SYNC_H
+#ifndef BITCOIN_MASTERNODE_MASTERNODE-SYNC_H
+#define BITCOIN_MASTERNODE_MASTERNODE-SYNC_H
 
 #include <chain.h>
 #include <net.h>
@@ -71,4 +71,4 @@ public:
     void DoMaintenance(CConnman &connman);
 };
 
-#endif
+#endif // BITCOIN_MASTERNODE_MASTERNODE-SYNC_H

src/masternode/masternode-utils.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef MASTERNODE_UTILS_H
-#define MASTERNODE_UTILS_H
+#ifndef BITCOIN_MASTERNODE_MASTERNODE-UTILS_H
+#define BITCOIN_MASTERNODE_MASTERNODE-UTILS_H
 
 #include <evo/deterministicmns.h>
 
@@ -16,4 +16,4 @@ public:
     static void DoMaintenance(CConnman &connman);
 };
 
-#endif//MASTERNODE_UTILS_H
+#endif // BITCOIN_MASTERNODE_MASTERNODE-UTILS_H

src/messagesigner.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef MESSAGESIGNER_H
-#define MESSAGESIGNER_H
+#ifndef BITCOIN_MESSAGESIGNER_H
+#define BITCOIN_MESSAGESIGNER_H
 
 #include <key.h>
 
@@ -35,4 +35,4 @@ public:
     static bool VerifyHash(const uint256& hash, const CKeyID& keyID, const std::vector<unsigned char>& vchSig, std::string& strErrorRet);
 };
 
-#endif
+#endif // BITCOIN_MESSAGESIGNER_H

src/netfulfilledman.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef NETFULFILLEDMAN_H
-#define NETFULFILLEDMAN_H
+#ifndef BITCOIN_NETFULFILLEDMAN_H
+#define BITCOIN_NETFULFILLEDMAN_H
 
 #include <netaddress.h>
 #include <serialize.h>
@@ -50,4 +50,4 @@ public:
     void DoMaintenance();
 };
 
-#endif
+#endif // BITCOIN_NETFULFILLEDMAN_H

src/policy/fees.h

@@ -2,8 +2,8 @@
 // Copyright (c) 2009-2015 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#ifndef BITCOIN_POLICYESTIMATOR_H
-#define BITCOIN_POLICYESTIMATOR_H
+#ifndef BITCOIN_POLICY_FEES_H
+#define BITCOIN_POLICY_FEES_H
 
 #include <amount.h>
 #include <policy/feerate.h>
@@ -273,4 +273,4 @@ private:
     unsigned int MaxUsableEstimate() const;
 };
 
-#endif /*BITCOIN_POLICYESTIMATOR_H */
+#endif // BITCOIN_POLICY_FEES_H

src/privatesend/privatesend-client.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PRIVATESENDCLIENT_H
-#define PRIVATESENDCLIENT_H
+#ifndef BITCOIN_PRIVATESEND_PRIVATESEND-CLIENT_H
+#define BITCOIN_PRIVATESEND_PRIVATESEND-CLIENT_H
 
 #include <privatesend/privatesend-util.h>
 #include <privatesend/privatesend.h>
@@ -261,4 +261,4 @@ public:
     void GetJsonInfo(UniValue& obj) const;
 };
 
-#endif
+#endif // BITCOIN_PRIVATESEND_PRIVATESEND-CLIENT_H

src/privatesend/privatesend-server.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PRIVATESENDSERVER_H
-#define PRIVATESENDSERVER_H
+#ifndef BITCOIN_PRIVATESEND_PRIVATESEND-SERVER_H
+#define BITCOIN_PRIVATESEND_PRIVATESEND-SERVER_H
 
 #include <net.h>
 #include <privatesend/privatesend.h>
@@ -82,4 +82,4 @@ public:
     void GetJsonInfo(UniValue& obj) const;
 };
 
-#endif
+#endif // BITCOIN_PRIVATESEND_PRIVATESEND-SERVER_H

src/privatesend/privatesend-util.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PRIVATESENDUTIL_H
-#define PRIVATESENDUTIL_H
+#ifndef BITCOIN_PRIVATESEND_PRIVATESEND-UTIL_H
+#define BITCOIN_PRIVATESEND_PRIVATESEND-UTIL_H
 
 #include <wallet/wallet.h>
 
@@ -34,4 +34,4 @@ public:
     void KeepAll();
     void ReturnAll();
 };
-#endif //PRIVATESENDUTIL_H
+#endif // BITCOIN_PRIVATESEND_PRIVATESEND-UTIL_H

src/privatesend/privatesend.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef PRIVATESEND_H
-#define PRIVATESEND_H
+#ifndef BITCOIN_PRIVATESEND_PRIVATESEND_H
+#define BITCOIN_PRIVATESEND_PRIVATESEND_H
 
 #include <bls/bls.h>
 #include <chain.h>
@@ -475,4 +475,4 @@ public:
 
 };
 
-#endif
+#endif // BITCOIN_PRIVATESEND_PRIVATESEND_H

src/qt/masternodelist.h

@@ -1,5 +1,5 @@
-#ifndef MASTERNODELIST_H
-#define MASTERNODELIST_H
+#ifndef BITCOIN_QT_MASTERNODELIST_H
+#define BITCOIN_QT_MASTERNODELIST_H
 
 #include <qt/platformstyle.h>
 #include <primitives/transaction.h>
@@ -76,4 +76,4 @@ private Q_SLOTS:
     void handleMasternodeListChanged();
     void updateDIP3ListScheduled();
 };
-#endif // MASTERNODELIST_H
+#endif // BITCOIN_QT_MASTERNODELIST_H

src/qt/test/paymentrequestdata.h

@@ -2,6 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#ifndef BITCOIN_QT_TEST_PAYMENTREQUESTDATA_H
+#define BITCOIN_QT_TEST_PAYMENTREQUESTDATA_H
+
 //
 // Data for paymentservertests.cpp
 //
@@ -458,3 +461,5 @@ iEBFUrBDJZU+UEezGwr7/zoECjo5ZY3PmtZcM2sILNjyweJF6XVzGqTxUw6pN6sW\
 XR2T3Gy2LzRvhVA25QgGqpz0/juS2BtmNbsZPkN9gMMwKimgzc+PuCzmEKwPK9cQ\
 YQ==\
 ";
+
+#endif // BITCOIN_QT_TEST_PAYMENTREQUESTDATA_H

src/qt/test/rpcnestedtests.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_QT_TEST_RPC_NESTED_TESTS_H
-#define BITCOIN_QT_TEST_RPC_NESTED_TESTS_H
+#ifndef BITCOIN_QT_TEST_RPCNESTEDTESTS_H
+#define BITCOIN_QT_TEST_RPCNESTEDTESTS_H
 
 #include <QObject>
 #include <QTest>
@@ -19,4 +19,4 @@ class RPCNestedTests : public QObject
     void rpcNestedTests();
 };
 
-#endif // BITCOIN_QT_TEST_RPC_NESTED_TESTS_H
+#endif // BITCOIN_QT_TEST_RPCNESTEDTESTS_H

src/qt/test/trafficgraphdatatests.h

@@ -1,5 +1,5 @@
-#ifndef TRAFFICGRAPHDATATESTS_H
-#define TRAFFICGRAPHDATATESTS_H
+#ifndef BITCOIN_QT_TEST_TRAFFICGRAPHDATATESTS_H
+#define BITCOIN_QT_TEST_TRAFFICGRAPHDATATESTS_H
 
 #include <QObject>
 #include <QTest>
@@ -20,4 +20,4 @@ private Q_SLOTS:
 };
 
 
-#endif // TRAFFICGRAPHDATATESTS_H
+#endif // BITCOIN_QT_TEST_TRAFFICGRAPHDATATESTS_H

src/qt/trafficgraphdata.h

@@ -1,5 +1,5 @@
-#ifndef TRAFFICGRAPHDATA_H
-#define TRAFFICGRAPHDATA_H
+#ifndef BITCOIN_QT_TRAFFICGRAPHDATA_H
+#define BITCOIN_QT_TRAFFICGRAPHDATA_H
 
 #include <QHash>
 #include <QQueue>
@@ -88,4 +88,4 @@ private:
     TrafficGraphData& operator=(TrafficGraphData const&);
 };
 
-#endif // TRAFFICGRAPHDATA_H
+#endif // BITCOIN_QT_TRAFFICGRAPHDATA_H

src/rpc/client.h

@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_RPCCLIENT_H
-#define BITCOIN_RPCCLIENT_H
+#ifndef BITCOIN_RPC_CLIENT_H
+#define BITCOIN_RPC_CLIENT_H
 
 #include <univalue.h>
 
@@ -19,4 +19,4 @@ UniValue RPCConvertNamedValues(const std::string& strMethod, const std::vector<s
  */
 UniValue ParseNonRFCJSONValue(const std::string& strVal);
 
-#endif // BITCOIN_RPCCLIENT_H
+#endif // BITCOIN_RPC_CLIENT_H

src/rpc/protocol.h

@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_RPCPROTOCOL_H
-#define BITCOIN_RPCPROTOCOL_H
+#ifndef BITCOIN_RPC_PROTOCOL_H
+#define BITCOIN_RPC_PROTOCOL_H
 
 #include <fs.h>
 
@@ -104,4 +104,4 @@ void DeleteAuthCookie();
 /** Parse JSON-RPC batch reply into a vector */
 std::vector<UniValue> JSONRPCProcessBatchReply(const UniValue &in, size_t num);
 
-#endif // BITCOIN_RPCPROTOCOL_H
+#endif // BITCOIN_RPC_PROTOCOL_H

src/rpc/register.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_RPCREGISTER_H
-#define BITCOIN_RPCREGISTER_H
+#ifndef BITCOIN_RPC_REGISTER_H
+#define BITCOIN_RPC_REGISTER_H
 
 /** These are in one header file to avoid creating tons of single-function
  * headers for everything under src/rpc/ */
@@ -44,4 +44,4 @@ static inline void RegisterAllCoreRPCCommands(CRPCTable &t)
     RegisterQuorumsRPCCommands(t);
 }
 
-#endif
+#endif // BITCOIN_RPC_REGISTER_H

src/rpc/server.h

@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_RPCSERVER_H
-#define BITCOIN_RPCSERVER_H
+#ifndef BITCOIN_RPC_SERVER_H
+#define BITCOIN_RPC_SERVER_H
 
 #include <amount.h>
 #include <rpc/protocol.h>
@@ -195,4 +195,4 @@ void InterruptRPC();
 void StopRPC();
 std::string JSONRPCExecBatch(const JSONRPCRequest& jreq, const UniValue& vReq);
 
-#endif // BITCOIN_RPCSERVER_H
+#endif // BITCOIN_RPC_SERVER_H

src/saltedhasher.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef SALTEDHASHER_H
-#define SALTEDHASHER_H
+#ifndef BITCOIN_SALTEDHASHER_H
+#define BITCOIN_SALTEDHASHER_H
 
 #include <hash.h>
 #include <uint256.h>
@@ -72,4 +72,4 @@ struct StaticSaltedHasher
     }
 };
 
-#endif//SALTEDHASHER_H
+#endif // BITCOIN_SALTEDHASHER_H

src/script/dashconsensus.h

@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_BITCOINCONSENSUS_H
-#define BITCOIN_BITCOINCONSENSUS_H
+#ifndef BITCOIN_SCRIPT_DASHCONSENSUS_H
+#define BITCOIN_SCRIPT_DASHCONSENSUS_H
 
 #include <stdint.h>
 
@@ -74,4 +74,4 @@ EXPORT_SYMBOL unsigned int dashconsensus_version();
 
 #undef EXPORT_SYMBOL
 
-#endif // BITCOIN_BITCOINCONSENSUS_H
+#endif // BITCOIN_SCRIPT_DASHCONSENSUS_H

src/spork.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef SPORK_H
-#define SPORK_H
+#ifndef BITCOIN_SPORK_H
+#define BITCOIN_SPORK_H
 
 #include <hash.h>
 #include <net.h>
@@ -300,4 +300,4 @@ public:
     std::string ToString() const;
 };
 
-#endif
+#endif // BITCOIN_SPORK_H

src/stacktraces.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_STACKTRACES_H
-#define DASH_STACKTRACES_H
+#ifndef BITCOIN_STACKTRACES_H
+#define BITCOIN_STACKTRACES_H
 
 #include <string>
 #include <sstream>
@@ -39,4 +39,4 @@ inline std::string GetExceptionWhat(const T& e)
 void RegisterPrettyTerminateHander();
 void RegisterPrettySignalHandlers();
 
-#endif//DASH_STACKTRACES_H
+#endif//BITCOIN_STACKTRACES_H

src/unordered_lru_cache.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef DASH_UNORDERED_LRU_CACHE_H
-#define DASH_UNORDERED_LRU_CACHE_H
+#ifndef BITCOIN_UNORDERED_LRU_CACHE_H
+#define BITCOIN_UNORDERED_LRU_CACHE_H
 
 #include <unordered_map>
 
@@ -107,4 +107,4 @@ private:
     }
 };
 
-#endif // DASH_UNORDERED_LRU_CACHE_H
+#endif // BITCOIN_UNORDERED_LRU_CACHE_H

src/versionbits.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_CONSENSUS_VERSIONBITS
-#define BITCOIN_CONSENSUS_VERSIONBITS
+#ifndef BITCOIN_VERSIONBITS_H
+#define BITCOIN_VERSIONBITS_H
 
 #include <chain.h>
 #include <map>
@@ -79,4 +79,4 @@ BIP9Stats VersionBitsStatistics(const CBlockIndex* pindexPrev, const Consensus::
 int VersionBitsStateSinceHeight(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos pos, VersionBitsCache& cache);
 uint32_t VersionBitsMask(const Consensus::Params& params, Consensus::DeploymentPos pos);
 
-#endif
+#endif // BITCOIN_VERSIONBITS_H

src/wallet/test/wallet_test_fixture.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_WALLET_TEST_FIXTURE_H
-#define BITCOIN_WALLET_TEST_FIXTURE_H
+#ifndef BITCOIN_WALLET_TEST_WALLET_TEST_FIXTURE_H
+#define BITCOIN_WALLET_TEST_WALLET_TEST_FIXTURE_H
 
 #include <test/test_dash.h>
 
@@ -20,5 +20,4 @@ struct WalletTestingSetup: public TestingSetup {
     CWallet m_wallet;
 };
 
-#endif
-
+#endif // BITCOIN_WALLET_TEST_WALLET_TEST_FIXTURE_H

src/wallet/walletutil.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_WALLET_UTIL_H
-#define BITCOIN_WALLET_UTIL_H
+#ifndef BITCOIN_WALLET_WALLETUTIL_H
+#define BITCOIN_WALLET_WALLETUTIL_H
 
 #include <chainparamsbase.h>
 #include <util.h>
@@ -11,4 +11,4 @@
 //! Get the path of the wallet directory.
 fs::path GetWalletDir();
 
-#endif // BITCOIN_WALLET_UTIL_H
+#endif // BITCOIN_WALLET_WALLETUTIL_H

src/walletinitinterface.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef WALLETINITINTERFACE_H
-#define WALLETINITINTERFACE_H
+#ifndef BITCOIN_WALLETINITINTERFACE_H
+#define BITCOIN_WALLETINITINTERFACE_H
 
 #include <string>
 
@@ -40,4 +40,4 @@ public:
     virtual ~WalletInitInterface() {}
 };
 
-#endif // WALLETINITINTERFACE_H
+#endif // BITCOIN_WALLETINITINTERFACE_H