#include <lib-lib/mem.h>
#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
+#include <lib-lib/buffer.h>
#include "mutt.h"
-#include "buffer.h"
#include "mutt_curses.h"
#include "imap_private.h"
#include "message.h"
#endif
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "lib/debug.h"
#if HAVE_STDINT_H