# include "config.h"
#endif
+#include <wctype.h>
+#include <wchar.h>
+
#include <lib-lib/mem.h>
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include "curses.h"
+#include "enter.h"
+#include "menu.h"
#include "mutt.h"
-#include "mutt_menu.h"
+#include "alias.h"
#include "keymap.h"
#include "history.h"
#include "buffy.h"
-
-#include <string.h>
-
/* redraw flags for mutt_enter_string() */
enum {
M_REDRAW_INIT = 1, /* go to end of line and redraw */