diff --git a/cmdline.c b/cmdline.c
index b8db3c46..aa8cfda4 100644
--- a/cmdline.c
+++ b/cmdline.c
@@ -146,9 +146,11 @@ static bool cmdline_check_unavailable(int flag, const char *p)
 static bool seen_hostname_argument = false;
 static bool seen_port_argument = false;
 static bool seen_verbose_option = false;
+static bool loaded_session = false;
 bool cmdline_verbose(void) { return seen_verbose_option; }
 bool cmdline_seat_verbose(Seat *seat) { return cmdline_verbose(); }
 bool cmdline_lp_verbose(LogPolicy *lp) { return cmdline_verbose(); }
+bool cmdline_loaded_session(void) { return loaded_session; }
 
 int cmdline_process_param(const char *p, char *value,
                           int need_save, Conf *conf)
diff --git a/pscp.c b/pscp.c
index 240ffff0..dc9ebb8d 100644
--- a/pscp.c
+++ b/pscp.c
@@ -302,7 +302,7 @@ static void do_cmd(char *host, char *user, char *cmd)
      * If we haven't loaded session details already (e.g., from -load),
      * try looking for a session called "host".
      */
-    if (!loaded_session) {
+    if (!cmdline_loaded_session()) {
         /* Try to load settings for `host' into a temporary config */
         Conf *conf2 = conf_new();
         conf_set_str(conf2, CONF_host, "");
@@ -2236,7 +2236,6 @@ int psftp_main(int argc, char *argv[])
     /* Load Default Settings before doing anything else. */
     conf = conf_new();
     do_defaults(NULL, conf);
-    loaded_session = false;
 
     for (i = 1; i < argc; i++) {
         int ret;
diff --git a/psftp.c b/psftp.c
index a47599e3..0567144f 100644
--- a/psftp.c
+++ b/psftp.c
@@ -2568,7 +2568,7 @@ static int psftp_connect(char *userhost, char *user, int portnumber)
      * If we haven't loaded session details already (e.g., from -load),
      * try looking for a session called "host".
      */
-    if (!loaded_session) {
+    if (!cmdline_loaded_session()) {
         /* Try to load settings for `host' into a temporary config */
         Conf *conf2 = conf_new();
         conf_set_str(conf2, CONF_host, "");
@@ -2772,7 +2772,6 @@ int psftp_main(int argc, char *argv[])
     /* Load Default Settings before doing anything else. */
     conf = conf_new();
     do_defaults(NULL, conf);
-    loaded_session = false;
 
     for (i = 1; i < argc; i++) {
         int ret;
diff --git a/putty.h b/putty.h
index 07b38842..b1d0d30b 100644
--- a/putty.h
+++ b/putty.h
@@ -586,11 +586,6 @@ extern const char *const appname;
 GLOBAL int default_protocol;
 GLOBAL int default_port;
 
-/*
- * This is set true by cmdline.c iff a session is loaded with "-load".
- */
-GLOBAL bool loaded_session;
-
 /*
  * Mechanism for getting text strings such as usernames and passwords
  * from the front-end.
@@ -1958,6 +1953,7 @@ void cmdline_cleanup(void);
 int cmdline_get_passwd_input(prompts_t *p);
 bool cmdline_host_ok(Conf *);
 bool cmdline_verbose(void);
+bool cmdline_loaded_session(void);
 
 /*
  * Here we have a flags word provided by each tool, which describes
diff --git a/unix/uxplink.c b/unix/uxplink.c
index c5b3eb96..0d555a70 100644
--- a/unix/uxplink.c
+++ b/unix/uxplink.c
@@ -615,7 +615,6 @@ int main(int argc, char **argv)
      */
     conf = conf_new();
     do_defaults(NULL, conf);
-    loaded_session = false;
     default_protocol = conf_get_int(conf, CONF_protocol);
     default_port = conf_get_int(conf, CONF_port);
     errors = false;
diff --git a/windows/winplink.c b/windows/winplink.c
index cac38ddb..d9b2020d 100644
--- a/windows/winplink.c
+++ b/windows/winplink.c
@@ -260,7 +260,6 @@ int main(int argc, char **argv)
      */
     conf = conf_new();
     do_defaults(NULL, conf);
-    loaded_session = false;
     default_protocol = conf_get_int(conf, CONF_protocol);
     default_port = conf_get_int(conf, CONF_port);
     errors = false;