diff --git a/common/comopt.c b/common/comopt.c
index 470cdac61..1cfd581b1 100644
--- a/common/comopt.c
+++ b/common/comopt.c
@@ -60,6 +60,8 @@ static gpgrt_opt_t opts[] = {
 };
 
 
+struct gnupg_comopt_s comopt = {NULL};
+
 
 /* Parse the common options in the homedir and etc.  This needs to be
  * called after the gpgrt config directories are set.  MODULE_ID is one of
diff --git a/common/comopt.h b/common/comopt.h
index 2a27fddac..9236afc6b 100644
--- a/common/comopt.h
+++ b/common/comopt.h
@@ -35,13 +35,16 @@
 
 
 /* Common options for all GnuPG components.  */
-struct
+struct gnupg_comopt_s
 {
   char *logfile;     /* Socket used by daemons for logging.  */
   int use_keyboxd;   /* Use the keyboxd as storage backend.  */
   int no_autostart;  /* Do not start gpg-agent.              */
   char *keyboxd_program;  /* Use this as keyboxd program.    */
-} comopt;
+};
+
+
+extern struct gnupg_comopt_s comopt;
 
 
 gpg_error_t parse_comopt (int module_id, int verbose);