#include <openssl/err.h>
#include <openssl/rand.h>
-#undef _
-
#include <string.h>
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_socket.h"
#include "mutt_curses.h"
#include "mutt_ssl.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include "lib/debug.h"