# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "mx.h"
#include "buffy.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
#include "lib/str.h"
#include <string.h>