#include <pwd.h>
#include <grp.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
+#include <lib-ui/sidebar.h>
#include "mutt.h"
#include "mx.h"
#ifdef USE_NNTP
#include "nntp.h"
#endif
-#include "sidebar.h"
#include "lib/list.h"