diff --git a/include/email.h b/include/email.h
index 5800265..130a262 100644
--- a/include/email.h
+++ b/include/email.h
@@ -60,11 +60,11 @@ struct addr {
 typedef enum { GPG_SIG=0x01, GPG_ENC=0x02 } GpgCallType;
 
 
-/* Globally defined vars */
-dhash table;
-char *conf_file;
+/* Globally declared vars */
+extern dhash table;
+extern char *conf_file;
 
-struct mailer_options {
+extern struct mailer_options {
 	bool verbose;
 	bool encoding;
 	short html;
diff --git a/src/email.c b/src/email.c
index 524e9be..a22cf44 100644
--- a/src/email.c
+++ b/src/email.c
@@ -40,6 +40,11 @@
 #include "error.h"
 #include "mimeutils.h"
 
+/* Globally defined vars */
+dhash table;
+char *conf_file;
+struct mailer_options Mopts;
+
 static void
 defaultDestr(void *ptr)
 {