Take care of backporting errors

src/wallet/rpcdump.cpp

@@ -173,8 +173,8 @@ UniValue abortrescan(const UniValue& params, bool fHelp)
             + HelpExampleRpc("abortrescan", "")
         );
 
-    if (!pwallet->IsScanning() || pwallet->IsAbortingRescan()) return false;
-    pwallet->AbortRescan();
+    if (!pwalletMain->IsScanning() || pwalletMain->IsAbortingRescan()) return false;
+    pwalletMain->AbortRescan();
     return true;
 }
 

src/wallet/wallet.h

@@ -18,6 +18,7 @@
 #include "wallet/rpcwallet.h"
 
 #include <algorithm>
+#include <atomic>
 #include <map>
 #include <set>
 #include <stdexcept>