diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -20,11 +20,6 @@
 #include <util/strencodings.h>
 #include <util/system.h>
 #include <validation.h>
-#ifdef ENABLE_WALLET
-#include <wallet/rpcwallet.h>
-#include <wallet/wallet.h>
-#include <wallet/walletdb.h>
-#endif
 #include <warnings.h>
 
 #include <univalue.h>
@@ -84,9 +79,6 @@
     return ret;
 }
 
-// Needed even with !ENABLE_WALLET, to pass (ignored) pointers around
-class CWallet;
-
 static UniValue createmultisig(const Config &config,
                                const JSONRPCRequest &request) {
     if (request.fHelp || request.params.size() < 2 ||
@@ -541,7 +533,7 @@
     //  ------------------- ------------------------  ----------------------  ----------
     { "control",            "getmemoryinfo",          getmemoryinfo,          {"mode"} },
     { "control",             "logging",                logging,                {"include", "exclude"} },
-    { "util",               "validateaddress",        validateaddress,        {"address"} }, /* uses wallet if enabled */
+    { "util",               "validateaddress",        validateaddress,        {"address"} },
     { "util",               "createmultisig",         createmultisig,         {"nrequired","keys"} },
     { "util",               "verifymessage",          verifymessage,          {"address","signature","message"} },
     { "util",               "signmessagewithprivkey", signmessagewithprivkey, {"privkey","message"} },
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -29,9 +29,6 @@
 #include <util/strencodings.h>
 #include <validation.h>
 #include <validationinterface.h>
-#ifdef ENABLE_WALLET
-#include <wallet/rpcwallet.h>
-#endif
 
 #include <cstdint>
 #include <future>
@@ -941,9 +938,8 @@
                 view.AddCoin(out, Coin(txout, 1, false), true);
             }
 
-            // If redeemScript given and not using the local wallet (private
-            // keys given), add redeemScript to the keystore so it can be
-            // signed:
+            // If redeemScript and private keys were given, add redeemScript to
+            // the keystore so it can be signed
             if (is_temp_keystore && scriptPubKey.IsPayToScriptHash()) {
                 RPCTypeCheckObj(
                     prevOut, {