diff --git a/src/addresstype.cpp b/src/addresstype.cpp
index c436431dc3..eac79a84f3 100644
--- a/src/addresstype.cpp
+++ b/src/addresstype.cpp
@@ -3,19 +3,22 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php.
 
 #include <addresstype.h>
-#include <script/script.h>
-#include <script/solver.h>
+
+#include <crypto/sha256.h>
 #include <hash.h>
 #include <pubkey.h>
+#include <script/script.h>
+#include <script/solver.h>
 #include <uint256.h>
 #include <util/hash_type.h>
 
+#include <cassert>
 #include <vector>
 
 typedef std::vector<unsigned char> valtype;
 
 ScriptHash::ScriptHash(const CScript& in) : BaseHash(Hash160(in)) {}
-ScriptHash::ScriptHash(const CScriptID& in) : BaseHash(static_cast<uint160>(in)) {}
+ScriptHash::ScriptHash(const CScriptID& in) : BaseHash{in} {}
 // ELEMENTS
 ScriptHash::ScriptHash(const CScript& in, const CPubKey& blinding_pubkey_in) : BaseHash(Hash160(in)), blinding_pubkey(blinding_pubkey_in) {}
 ScriptHash::ScriptHash(const CScriptID& in, const CPubKey& blinding_pubkey_in) : BaseHash(in), blinding_pubkey(blinding_pubkey_in) {}
@@ -27,21 +30,21 @@ PKHash::PKHash(const CPubKey& pubkey, const CPubKey& blinding_pubkey_in) : BaseH
 PKHash::PKHash(const CKeyID& pubkey_id, const CPubKey& blinding_pubkey_in) : BaseHash(pubkey_id), blinding_pubkey(blinding_pubkey_in) {}
 
 WitnessV0KeyHash::WitnessV0KeyHash(const CPubKey& pubkey) : BaseHash(pubkey.GetID()) {}
-WitnessV0KeyHash::WitnessV0KeyHash(const PKHash& pubkey_hash) : BaseHash(static_cast<uint160>(pubkey_hash)) {}
+WitnessV0KeyHash::WitnessV0KeyHash(const PKHash& pubkey_hash) : BaseHash{pubkey_hash} {}
 
 CKeyID ToKeyID(const PKHash& key_hash)
 {
-    return CKeyID{static_cast<uint160>(key_hash)};
+    return CKeyID{uint160{key_hash}};
 }
 
 CKeyID ToKeyID(const WitnessV0KeyHash& key_hash)
 {
-    return CKeyID{static_cast<uint160>(key_hash)};
+    return CKeyID{uint160{key_hash}};
 }
 
 CScriptID ToScriptID(const ScriptHash& script_hash)
 {
-    return CScriptID{static_cast<uint160>(script_hash)};
+    return CScriptID{uint160{script_hash}};
 }
 
 WitnessV0ScriptHash::WitnessV0ScriptHash(const CScript& in)
diff --git a/src/script/solver.cpp b/src/script/solver.cpp
index 222aa6b10a..8f305bc626 100644
--- a/src/script/solver.cpp
+++ b/src/script/solver.cpp
@@ -4,14 +4,15 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <chainparams.h> // ELEMENTS
-#include <script/solver.h>
 #include <pubkey.h>
 #include <script/interpreter.h>
 #include <script/script.h>
+#include <script/solver.h>
 #include <span.h>
 
-#include <string>
 #include <algorithm>
+#include <cassert>
+#include <string>
 
 typedef std::vector<unsigned char> valtype;