#include <lib-lib/macros.h>
#include <lib-lib/mapping.h>
-#include <lib-ui/curses.h>
-
#include <pop/pop.h>
+#include "curses.h"
+#include "menu.h"
+
#include "mutt.h"
#include "mx.h"
-#include "mutt_menu.h"
#include "sort.h"
#include "recvattach.h"
#include "buffy.h"