diff --git a/src/keystore.h b/src/keystore.h
--- a/src/keystore.h
+++ b/src/keystore.h
@@ -42,16 +42,16 @@
     virtual bool HaveWatchOnly() const = 0;
 };
 
-typedef std::map<CKeyID, CKey> KeyMap;
-typedef std::map<CKeyID, CPubKey> WatchKeyMap;
-typedef std::map<CScriptID, CScript> ScriptMap;
-typedef std::set<CScript> WatchOnlySet;
-
 /** Basic key store, that keeps keys in an address->secret map */
 class CBasicKeyStore : public CKeyStore {
 protected:
     mutable CCriticalSection cs_KeyStore;
 
+    using KeyMap = std::map<CKeyID, CKey>;
+    using WatchKeyMap = std::map<CKeyID, CPubKey>;
+    using ScriptMap = std::map<CScriptID, CScript>;
+    using WatchOnlySet = std::set<CScript>;
+
     KeyMap mapKeys GUARDED_BY(cs_KeyStore);
     WatchKeyMap mapWatchKeys GUARDED_BY(cs_KeyStore);
     ScriptMap mapScripts GUARDED_BY(cs_KeyStore);
@@ -79,10 +79,6 @@
     bool HaveWatchOnly() const override;
 };
 
-typedef std::vector<uint8_t, secure_allocator<uint8_t>> CKeyingMaterial;
-typedef std::map<CKeyID, std::pair<CPubKey, std::vector<uint8_t>>>
-    CryptedKeyMap;
-
 /**
  * Return the CKeyID of the key involved in a script (if there is a unique one).
  */
diff --git a/src/wallet/crypter.h b/src/wallet/crypter.h
--- a/src/wallet/crypter.h
+++ b/src/wallet/crypter.h
@@ -126,6 +126,9 @@
     bool fDecryptionThoroughlyChecked;
 
 protected:
+    using CryptedKeyMap =
+        std::map<CKeyID, std::pair<CPubKey, std::vector<uint8_t>>>;
+
     bool SetCrypted();
 
     //! will encrypt previously unencrypted keys