It was already required to be able to successfully include imapc-storage.h.
#include "imap-utf7.h"
#include "mailbox-tree.h"
#include "mailbox-list-subscriptions.h"
-#include "imapc-client.h"
#include "imapc-storage.h"
#include "imapc-list.h"
#include "imap-quote.h"
#include "imap-bodystructure.h"
#include "imap-resp-code.h"
-#include "imapc-client.h"
#include "imapc-mail.h"
#include "imapc-storage.h"
#include "imap-envelope.h"
#include "imapc-msgmap.h"
#include "imapc-mail.h"
-#include "imapc-client.h"
#include "imapc-storage.h"
static bool imapc_mail_get_cached_guid(struct mail *_mail);
#include "imap-arg.h"
#include "imap-seqset.h"
#include "imap-util.h"
-#include "imapc-client.h"
#include "imapc-mail.h"
#include "imapc-msgmap.h"
#include "imapc-search.h"
#include "imap-util.h"
#include "index-mail.h"
#include "mail-copy.h"
-#include "imapc-client.h"
#include "mailbox-list-private.h"
#include "imapc-storage.h"
#include "imapc-sync.h"
#include "imap-seqset.h"
#include "imap-util.h"
#include "mail-search.h"
-#include "imapc-client.h"
#include "imapc-storage.h"
#include "imapc-search.h"
#include "imap-arg.h"
#include "imap-resp-code.h"
#include "mailbox-tree.h"
-#include "imapc-client.h"
#include "imapc-connection.h"
#include "imapc-msgmap.h"
#include "imapc-mail.h"
#include "index-storage.h"
#include "imapc-settings.h"
+#include "imapc-client.h"
#define IMAPC_STORAGE_NAME "imapc"
#define IMAPC_LIST_ESCAPE_CHAR '%'
#include "mail-cache.h"
#include "mail-index-modseq.h"
#include "index-sync-private.h"
-#include "imapc-client.h"
#include "imapc-msgmap.h"
#include "imapc-list.h"
#include "imapc-storage.h"