#include "alias.h"
-#include "lib/str.h"
+#include <lib-lib/str.h>
#include "lib/list.h"
#include "lib/rx.h"
WHERE char *MailcapPath;
WHERE char *Maildir;
-#if USE_HCACHE
+#ifdef USE_HCACHE
WHERE char *HeaderCache;
#if HAVE_GDBM || HAVE_DB4
WHERE char *HeaderCachePageSize;
WHERE short SmimeTimeout;
WHERE char *SmimeCertificates;
WHERE char *SmimeKeys;
-WHERE char *SmimeCryptAlg;
WHERE char *SmimeCALocation;
WHERE char *SmimeVerifyCommand;
WHERE char *SmimeVerifyOpaqueCommand;
extern const char *Months[];
#endif
-#ifdef MAIN_C
-/* so that global vars get included
- * FIXME WTF IS THIS?!?!???!?!??!?!??
- */
-#include "mx.h"
-#include "buffy.h"
-#include "sort.h"
-#include "mutt_crypt.h"
-#endif /* MAIN_C */
-
#endif /* !_GLOBALS_H */