#include <lib-lib/file.h>
#include <lib-lib/mapping.h>
+#include <lib-ui/curses.h>
+#include <lib-ui/enter.h>
+#include <lib-ui/menu.h>
+
#include "mutt.h"
-#include "enter.h"
#include "mx.h"
-#include "mutt_curses.h"
-#include "mutt_menu.h"
#include "buffy.h"
#include "sort.h"
#include "browser.h"