#include <time.h>
#include <ctype.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/date.h>
-
+#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
+#include <lib-sys/unix.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "pgp.h"