# include "config.h"
#endif
+#include <lib-lib/mem.h>
+
#include "mutt.h"
#include "ascii.h"
#include "mutt_sasl.h"
#include "imap_private.h"
#include "auth.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
+#include <lib-lib/macros.h>
#include "lib/debug.h"
#include <sasl/sasl.h>