#include <sys/socket.h>
#include <netinet/in.h>
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
+#include <lib-ui/curses.h>
+#include <lib-sys/mutt_socket.h>
#include "mutt.h"
#include "account.h"
#include "mutt_sasl.h"
-#include <lib-sys/mutt_socket.h>
static int getnameinfo_err (int ret)
{