diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
--- a/src/rpc/server.cpp
+++ b/src/rpc/server.cpp
@@ -24,8 +24,6 @@
 
 static RecursiveMutex cs_rpcWarmup;
 static std::atomic<bool> g_rpc_running{false};
-static std::once_flag g_rpc_interrupt_flag;
-static std::once_flag g_rpc_stop_flag;
 static bool fRPCInWarmup GUARDED_BY(cs_rpcWarmup) = true;
 static std::string
     rpcWarmupStatus GUARDED_BY(cs_rpcWarmup) = "RPC server started";
@@ -347,6 +345,7 @@
 }
 
 void InterruptRPC() {
+    static std::once_flag g_rpc_interrupt_flag;
     // This function could be called twice if the GUI has been started with
     // -server=1.
     std::call_once(g_rpc_interrupt_flag, []() {
@@ -357,6 +356,7 @@
 }
 
 void StopRPC() {
+    static std::once_flag g_rpc_stop_flag;
     // This function could be called twice if the GUI has been started with
     // -server=1.
     assert(!g_rpc_running);
diff --git a/src/support/lockedpool.h b/src/support/lockedpool.h
--- a/src/support/lockedpool.h
+++ b/src/support/lockedpool.h
@@ -234,8 +234,8 @@
 public:
     /** Return the current instance, or create it once */
     static LockedPoolManager &Instance() {
-        std::call_once(LockedPoolManager::init_flag,
-                       LockedPoolManager::CreateInstance);
+        static std::once_flag init_flag;
+        std::call_once(init_flag, LockedPoolManager::CreateInstance);
         return *LockedPoolManager::_instance;
     }
 
@@ -248,7 +248,6 @@
     static bool LockingFailed();
 
     static LockedPoolManager *_instance;
-    static std::once_flag init_flag;
 };
 
 #endif // BITCOIN_SUPPORT_LOCKEDPOOL_H
diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
--- a/src/support/lockedpool.cpp
+++ b/src/support/lockedpool.cpp
@@ -28,7 +28,6 @@
 #endif
 
 LockedPoolManager *LockedPoolManager::_instance = nullptr;
-std::once_flag LockedPoolManager::init_flag;
 
 /*******************************************************************************/
 // Utilities