#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/buffer.h>
+#include <lib-lib/debug.h>
+
+#include <lib-ui/curses.h>
#include "mutt.h"
-#include "mutt_curses.h"
#include "imap_private.h"
#include "message.h"
#include "mx.h"
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
-#include "lib/debug.h"
#if HAVE_STDINT_H
#include <stdint.h>