diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 3681baeff..329423512 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1320,7 +1320,7 @@ main (int argc, char **argv )
           log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
     }
 
-  gpgrt_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
+  gnupg_argparse (NULL, &pargs, NULL);  /* Release internal state.  */
 
   if (!last_configname)
     config_filename = make_filename (gnupg_homedir (),
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 7f5eafa4d..015b08900 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -592,7 +592,7 @@ static struct
    * header lines and such.  This is suitable to be passed to
    * gpgrt_argparser.  Will be filled in by
    * retrieve_options_from_program. */
-  gpgrt_opt_t *opt_table;
+  gnupg_opt_t *opt_table;
 
   /* The full table including data from OPT_TABLE.  The end of the
    * table is marked by NULL entry for NAME.  Will be filled in by
@@ -1538,7 +1538,7 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
   gnupg_argparse_t pargs;
   int dummy_argc;
   char *twopartconfig_name = NULL;
-  gpgrt_opt_t *opt_table = NULL;      /* A malloced option table.    */
+  gnupg_opt_t *opt_table = NULL;      /* A malloced option table.    */
   size_t opt_table_used = 0;          /* Its current length.         */
   size_t opt_table_size = 0;          /* Its allocated length.       */
   gc_option_t *opt_info = NULL;       /* A malloced options table.  */
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index 2b9a5552a..a426c2481 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -1042,7 +1042,7 @@ static void
 show_version_gnupg (estream_t fp, const char *prefix)
 {
   es_fprintf (fp, "%s%sGnuPG %s (%s)\n%s%s\n", prefix, *prefix?"":"* ",
-              strusage (13), BUILD_REVISION, prefix, gpgrt_strusage (17));
+              strusage (13), BUILD_REVISION, prefix, strusage (17));
 #ifdef HAVE_W32_SYSTEM
   {
     OSVERSIONINFO osvi = { sizeof (osvi) };