MERGE-FIX: Fix compilation errors

Author: stevenroose

src/assetsdir.cpp

@@ -6,7 +6,7 @@
 #include <chainparams.h>
 
 #include <tinyformat.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>

src/blind.cpp

@@ -9,7 +9,7 @@
 #include <primitives/confidential.h>
 #include <issuance.h>
 #include <random.h>
-#include <util.h>
+#include <util/system.h>
 
 static secp256k1_context* secp256k1_blind_context = NULL;
 

src/init.cpp

@@ -45,7 +45,7 @@
 #include <ui_interface.h>
 #include <util/system.h>
 #include <util/moneystr.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <validation.h>
 #include <validationinterface.h>
 #include <warnings.h>

src/mainchainrpc.cpp

@@ -1,8 +1,8 @@
 #include <mainchainrpc.h>
 
 #include <chainparamsbase.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <rpc/protocol.h>
 
 #include <support/events.h>

src/pegins.cpp

@@ -19,7 +19,7 @@
 #include <script/interpreter.h>
 #include <script/standard.h>
 #include <streams.h>
-#include <util.h>
+#include <util/system.h>
 
 //
 // ELEMENTS

src/primitives/bitcoin/block.cpp

@@ -7,7 +7,7 @@
 
 #include <hash.h>
 #include <tinyformat.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <crypto/common.h>
 
 namespace Sidechain {

src/primitives/bitcoin/merkleblock.cpp

@@ -7,7 +7,7 @@
 
 #include <hash.h>
 #include <consensus/consensus.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 namespace Sidechain {
 namespace Bitcoin {

src/primitives/bitcoin/transaction.cpp

@@ -7,7 +7,7 @@
 
 #include <hash.h>
 #include <tinyformat.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 namespace Sidechain {
 namespace Bitcoin {

src/primitives/confidential.h

@@ -8,7 +8,7 @@
 #include <serialize.h>
 #include <span.h>
 #include <uint256.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 extern bool g_con_elementsmode;
 

src/qt/bitcoinamountfield.cpp

@@ -66,7 +66,7 @@ class AmountSpinBox: public QAbstractSpinBox
         if(valid)
         {
             val = qBound(m_min_amount, val, m_max_amount);
-            input = GUIUtil::formatAssetAmount(current_asset, val, false, currentUnit, BitcoinUnits::separatorAlways, false);
+            input = GUIUtil::formatAssetAmount(current_asset, val, currentUnit, BitcoinUnits::separatorAlways, false);
             lineEdit()->setText(input);
         }
     }