#include "config.h"
#endif
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/macros.h>
+#include <stdarg.h>
+
+#include <lib-lib/lib-lib.h>
+
+#include <lib-ui/enter.h>
#include "mutt.h"
-#include "enter.h"
#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))