wibble.

[apps/madmutt.git] / globals.h

diff --git a/globals.h b/globals.h
index 3f3a45c..aaca563 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -9,11 +9,7 @@
 #ifndef _GLOBALS_H
 #define _GLOBALS_H
 
-#include "alias.h"
-
-#include <lib-lib/str.h>
-#include <lib-lib/date.h>
-#include <lib-lib/rx.h>
+#include <lib-lib/lib-lib.h>
 
 #include "lib/list.h"
 
@@ -32,13 +28,10 @@ WHERE char *MuttDotlock;
 WHERE address_t *EnvFrom;
 WHERE address_t *From;
 
-WHERE char *AliasFile;
-WHERE char *AliasFmt;
 WHERE char *AssumedCharset;
 WHERE char *AttachSep;
 WHERE char *Attribution;
 WHERE char *AttachFormat;
-WHERE char *Charset;
 WHERE char *ComposeFormat;
 WHERE char *ConfigCharset;
 WHERE char *ContentType;
@@ -87,7 +80,6 @@ WHERE rx_t Mask;
 WHERE rx_t QuoteRegexp;
 WHERE rx_t ReplyRegexp;
 WHERE rx_t Smileys;
-WHERE rx_t GecosMask;
 WHERE rx_t StripWasRegexp;
 
 WHERE char *Preconnect INITVAL (NULL);
@@ -249,7 +241,6 @@ WHERE SIG_ATOMIC_VOLATILE_T SigWinch INITVAL (0);
 
 WHERE int CurrentMenu;
 
-WHERE alias_t *Aliases INITVAL (0);
 WHERE string_list_t *UserHeader INITVAL (0);
 
 /*-- formerly in pgp.h --*/