#include <sys/time.h>
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-hash/hash.h>
#include <lib-mime/mime.h>
h->env = envelope_new();
restore_envelope (h->env, d, &off);
- h->content = mutt_new_body ();
+ h->content = body_new();
restore_body (h->content, d, &off);
restore_char (&h->maildir_flags, d, &off);