#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "recvattach.h"
#include "handler.h"
-#include "mutt_curses.h"
#include "rfc1524.h"
#include "rfc3676.h"
#include "keymap.h"
#include "copy.h"
#include "charset.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
#include "state.h"
#include "attach.h"
#include "lib.h"