Fixes after all the merged branches

src/gtest/test_timedata.cpp

@@ -8,6 +8,7 @@
 #include "timedata.h"
 #include "random.h"
 #include "netbase.h"
+#include "utiltime.h"
 
 using ::testing::StrictMock;
 

src/mempool_limit.cpp

@@ -7,6 +7,8 @@
 #include "random.h"
 #include "serialize.h"
 #include "timedata.h"
+#include "util.h"
+#include "utiltime.h"
 #include "version.h"
 
 const CAmount DEFAULT_FEE = 10000;

src/miner.h

@@ -11,6 +11,8 @@
 #include <stdint.h>
 #include <variant>
 
+#include <boost/shared_ptr.hpp>
+
 class CBlockIndex;
 class CChainParams;
 class CScript;

src/policy/policy.h

@@ -43,8 +43,8 @@ static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY
 static const unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS;
 
 // Sanity check the magic numbers when we change them
-BOOST_STATIC_ASSERT(DEFAULT_BLOCK_MAX_SIZE <= MAX_BLOCK_SIZE);
-BOOST_STATIC_ASSERT(DEFAULT_BLOCK_PRIORITY_SIZE <= DEFAULT_BLOCK_MAX_SIZE);
+static_assert(DEFAULT_BLOCK_MAX_SIZE <= MAX_BLOCK_SIZE);
+static_assert(DEFAULT_BLOCK_PRIORITY_SIZE <= DEFAULT_BLOCK_MAX_SIZE);
 
 bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType);
     /**

src/transaction_builder.cpp

@@ -13,6 +13,7 @@
 #include "zcash/Note.hpp"
 
 #include <librustzcash.h>
+#include <sodium.h>
 
 SpendDescriptionInfo::SpendDescriptionInfo(
     libzcash::SaplingExpandedSpendingKey expsk,

src/utiltest.cpp

@@ -9,6 +9,8 @@
 
 #include <array>
 
+#include <sodium.h>
+
 // Sprout
 CMutableTransaction GetValidSproutReceiveTransaction(
                                 const libzcash::SproutSpendingKey& sk,

src/wallet/asyncrpcoperation_mergetoaddress.h

@@ -19,6 +19,7 @@
 #include <tuple>
 #include <unordered_map>
 
+#include <sodium.h>
 #include <univalue.h>
 
 // Default transaction fee if caller does not specify one.

src/wallet/asyncrpcoperation_sendmany.h

@@ -19,6 +19,7 @@
 #include <unordered_map>
 #include <tuple>
 
+#include <sodium.h>
 #include <univalue.h>
 
 // Default transaction fee if caller does not specify one.

src/wallet/asyncrpcoperation_shieldcoinbase.h

@@ -17,6 +17,7 @@
 #include <unordered_map>
 #include <tuple>
 
+#include <sodium.h>
 #include <univalue.h>
 
 // Default transaction fee if caller does not specify one.

src/wallet/paymentdisclosure.cpp

@@ -7,6 +7,8 @@
 #include "key_io.h"
 #include "util.h"
 
+#include <sodium.h>
+
 std::string PaymentDisclosureInfo::ToString() const {
     KeyIO keyIO(Params());
     return strprintf("PaymentDisclosureInfo(version=%d, esk=%s, joinSplitPrivKey=<omitted>, address=%s)",

src/wallet/rpcdisclosure.cpp

@@ -23,6 +23,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
+#include <sodium.h>
 #include <univalue.h>
 
 #include "zcash/Note.hpp"

src/zcash/Note.cpp

@@ -10,6 +10,8 @@
 #include "zcash/util.h"
 #include "librustzcash.h"
 
+#include <boost/thread/exceptions.hpp>
+
 using namespace libzcash;
 
 SproutNote::SproutNote() {