diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c
index 27be3d3f8..dc87a2ba9 100644
--- a/plugins/sudoers/sudoreplay.c
+++ b/plugins/sudoers/sudoreplay.c
@@ -101,10 +101,6 @@
 extern char *optarg;
 extern int optind;
 
-int Argc;
-char **Argv;
-const char *session_dir = _PATH_SUDO_TRANSCRIPT;
-
 union io_fd {
     FILE *f;
 #ifdef HAVE_ZLIB
@@ -165,6 +161,8 @@ struct search_node {
 static struct search_node *node_stack[32];
 static int stack_top;
 
+static const char *session_dir = _PATH_SUDO_TRANSCRIPT;
+
 static union io_fd io_fds[IOFD_MAX];
 static const char *io_fnames[IOFD_MAX] = {
     "/stdin",
@@ -212,8 +210,9 @@ main(int argc, char *argv[])
     size_t len, nread, off;
     ssize_t nwritten;
 
-    Argc = argc;
-    Argv = argv;
+#if !defined(HAVE_GETPROGNAME) && !defined(HAVE___PROGNAME)
+    setprogname(argc > 0 argv[0] ? "sudoreplay");
+#endif
 
     while ((ch = getopt(argc, argv, "d:lm:s:V")) != -1) {
 	switch(ch) {
diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c
index 331655ac8..5cdee2306 100644
--- a/plugins/sudoers/testsudoers.c
+++ b/plugins/sudoers/testsudoers.c
@@ -100,8 +100,8 @@ extern struct passwd *getpwuid(uid_t);
 /*
  * Globals
  */
-int  Argc, NewArgc;
-char **Argv, **NewArgv;
+int  NewArgc;
+char **NewArgv;
 int num_interfaces;
 struct interface *interfaces;
 struct sudo_user sudo_user;
@@ -137,8 +137,9 @@ main(int argc, char *argv[])
     yydebug = 1;
 #endif
 
-    Argv = argv;
-    Argc = argc;
+#if !defined(HAVE_GETPROGNAME) && !defined(HAVE___PROGNAME)
+    setprogname(argc > 0 argv[0] ? "testsudoers");
+#endif
 
     dflag = 0;
     grfile = pwfile = runas_group = runas_user = NULL;
diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index 1d049f8bd..d843ed439 100644
--- a/plugins/sudoers/visudo.c
+++ b/plugins/sudoers/visudo.c
@@ -131,8 +131,6 @@ extern int optind;
 /*
  * Globals
  */
-int Argc;
-char **Argv;
 int num_interfaces;
 struct interface *interfaces;
 struct sudo_user sudo_user;
@@ -154,8 +152,10 @@ main(int argc, char *argv[])
     malloc_options = "AFGJPR";
 #endif
 
-    Argv = argv;
-    if ((Argc = argc) < 1)
+#if !defined(HAVE_GETPROGNAME) && !defined(HAVE___PROGNAME)
+    setprogname(argc > 0 argv[0] ? "visudo");
+#endif
+    if (argc < 1)
 	usage();
 
     /*