# include "config.h"
#endif
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include <lib-ui/menu.h>
+#include <lib-ui/sidebar.h>
#include "mutt.h"
#include "sort.h"
#include "mx.h"
-#include "sidebar.h"
#include <imap/imap_private.h>