diff --git a/src/util/system.cpp b/src/util/system.cpp
--- a/src/util/system.cpp
+++ b/src/util/system.cpp
@@ -1030,15 +1030,16 @@
         }
         if (use_conf_file) {
             std::string chain_id = GetChainName();
-            std::vector<std::string> includeconf(GetArgs("-includeconf"));
+            std::vector<std::string> conf_file_names(GetArgs("-includeconf"));
             {
                 // We haven't set m_network yet (that happens in
                 // SelectParams()), so manually check for network.includeconf
                 // args.
                 std::vector<std::string> includeconf_net(
                     GetArgs(std::string("-") + chain_id + ".includeconf"));
-                includeconf.insert(includeconf.end(), includeconf_net.begin(),
-                                   includeconf_net.end());
+                conf_file_names.insert(conf_file_names.end(),
+                                       includeconf_net.begin(),
+                                       includeconf_net.end());
             }
 
             // Remove -includeconf from configuration, so we can warn about
@@ -1050,46 +1051,47 @@
                                     ".includeconf");
             }
 
-            for (const std::string &to_include : includeconf) {
-                fsbridge::ifstream include_config(GetConfigFile(to_include));
-                if (include_config.good()) {
-                    if (!ReadConfigStream(include_config, to_include, error,
-                                          ignore_invalid_keys)) {
+            for (const std::string &conf_file_name : conf_file_names) {
+                fsbridge::ifstream conf_file_stream(
+                    GetConfigFile(conf_file_name));
+                if (conf_file_stream.good()) {
+                    if (!ReadConfigStream(conf_file_stream, conf_file_name,
+                                          error, ignore_invalid_keys)) {
                         return false;
                     }
                     LogPrintf("Included configuration file %s\n",
-                              to_include.c_str());
+                              conf_file_name);
                 } else {
-                    error =
-                        "Failed to include configuration file " + to_include;
+                    error = "Failed to include configuration file " +
+                            conf_file_name;
                     return false;
                 }
             }
 
             // Warn about recursive -includeconf
-            includeconf = GetArgs("-includeconf");
+            conf_file_names = GetArgs("-includeconf");
             {
                 std::vector<std::string> includeconf_net(
                     GetArgs(std::string("-") + chain_id + ".includeconf"));
-                includeconf.insert(includeconf.end(), includeconf_net.begin(),
-                                   includeconf_net.end());
+                conf_file_names.insert(conf_file_names.end(),
+                                       includeconf_net.begin(),
+                                       includeconf_net.end());
                 std::string chain_id_final = GetChainName();
                 if (chain_id_final != chain_id) {
                     // Also warn about recursive includeconf for the chain that
                     // was specified in one of the includeconfs
                     includeconf_net = GetArgs(std::string("-") +
                                               chain_id_final + ".includeconf");
-                    includeconf.insert(includeconf.end(),
-                                       includeconf_net.begin(),
-                                       includeconf_net.end());
+                    conf_file_names.insert(conf_file_names.end(),
+                                           includeconf_net.begin(),
+                                           includeconf_net.end());
                 }
             }
-            for (const std::string &to_include : includeconf) {
-                tfm::format(
-                    std::cerr,
-                    "warning: -includeconf cannot be used from included "
-                    "files; ignoring -includeconf=%s\n",
-                    to_include.c_str());
+            for (const std::string &conf_file_name : conf_file_names) {
+                tfm::format(std::cerr,
+                            "warning: -includeconf cannot be used from "
+                            "included files; ignoring -includeconf=%s\n",
+                            conf_file_name);
             }
         }
     }