# include "config.h"
#endif
+#include <string.h>
+#include <stdlib.h>
+#include <wchar.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include "mutt.h"
#include "charset.h"
-#include "sidebar.h"
#include <imap/imap.h>
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <wchar.h>
+#include <lib-ui/sidebar.h>
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)