# include "config.h"
#endif
-#include <lib-lib/mem.h>
-
-#include "mutt.h"
-#include "account.h"
-#include "mutt_sasl.h"
-#include "mutt_socket.h"
-
-#include "lib/debug.h"
-
#include <errno.h>
#include <netdb.h>
#include <sasl/sasl.h>
-
#include <sys/socket.h>
#include <netinet/in.h>
+#include <lib-lib/mem.h>
+#include <lib-lib/debug.h>
+
+#include "mutt.h"
+#include "account.h"
+#include "mutt_sasl.h"
+#include <lib-sys/mutt_socket.h>
+
static int getnameinfo_err (int ret)
{
int err;