#include "alias.h"
#include <lib-lib/str.h>
+#include <lib-lib/date.h>
+#include <lib-lib/rx.h>
+
#include "lib/list.h"
-#include "lib/rx.h"
WHERE void (*mutt_error) (const char *, ...);
WHERE void (*mutt_message) (const char *, ...);
#ifdef USE_HCACHE
WHERE char *HeaderCache;
-#if HAVE_GDBM || HAVE_DB4
+#if defined(HAVE_GDBM) || defined(HAVE_DB4)
WHERE char *HeaderCachePageSize;
#endif /* HAVE_GDBM || HAVE_DB4 */
#endif /* USE_HCACHE */
WHERE int CurrentMenu;
-WHERE ALIAS *Aliases INITVAL (0);
+WHERE alias_t *Aliases INITVAL (0);
WHERE LIST *UserHeader INITVAL (0);
/*-- formerly in pgp.h --*/