diff --git a/src/main.c b/src/main.c
index 6e2163e..c956b9d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
-/* -*- C -*-
+/*
   mboxgrep - scan mailbox for messages matching a regular expression
-  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006  Daniel Spiljar
+  Copyright (C) 2000 - 2004, 2006, 2023  Daniel Spiljar
 
   Mboxgrep is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
   along with mboxgrep; if not, write to the Free Software Foundation, 
   Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-  $Id: main.c,v 1.41 2006-10-22 23:34:49 dspiljar Exp $ */
+*/
 
 #include <config.h>
 
@@ -44,6 +44,9 @@
 #include <dmalloc.h>
 #endif /* HAVE_LIBDMALLOC */
 
+option_t config;
+runtime_t runtime;
+
 int
 main (int argc, char **argv)
      /* {{{  */
diff --git a/src/mboxgrep.h b/src/mboxgrep.h
index 36d0e67..d49e01c 100644
--- a/src/mboxgrep.h
+++ b/src/mboxgrep.h
@@ -1,6 +1,6 @@
-/* -*- C -*- 
+/*
   mboxgrep - scan mailbox for messages matching a regular expression
-  Copyright (C) 2000, 2001, 2002, 2003, 2006  Daniel Spiljar
+  Copyright (C) 2000 - 2003, 2006, 2023  Daniel Spiljar
 
   Mboxgrep is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
   along with mboxgrep; if not, write to the Free Software Foundation, 
   Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-  $Id: mboxgrep.h,v 1.31 2006-10-22 23:34:49 dspiljar Exp $ */
+*/
 
 #ifndef MBOXGREP_H
 #define MBOXGREP_H
@@ -118,7 +118,7 @@ typedef struct
   format_t format;
   lockmethod_t lock;
 }
-  option_t;
+option_t;
 
 typedef struct
 {
@@ -128,9 +128,9 @@ typedef struct
   /* mbox_t *tmp_mbox; */
   void *tmp_mbox;
 }
-  runtime_t;
+runtime_t;
 
-option_t config;
-runtime_t runtime;
+extern option_t config;
+extern runtime_t runtime;
 
 #endif /* MBOXGREP_H */