#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "alias.h"
#include "recvattach.h"
#include "sort.h"
#include "charset.h"
-#include "mx.h"
#include "buffy.h"
#ifdef MIXMASTER
#endif
#ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
#endif
static const char *There_are_no_attachments = N_("There are no attachments.");