--- a/src/imap/imap-client.h	Fri May 19 16:34:29 2017 +0300
+++ b/src/imap/imap-client.h	Fri May 19 17:44:30 2017 +0300
@@ -105,7 +105,7 @@
 	struct client_command_stats stats;
 	struct client_command_stats_start stats_start;
 
-	struct client_sync_context *sync;
+	struct imap_client_sync_context *sync;
 
 	unsigned int uid:1; /* used UID command */
 	unsigned int cancel:1; /* command is wanted to be cancelled */

--- a/src/imap/imap-sync-private.h	Fri May 19 16:34:29 2017 +0300
+++ b/src/imap/imap-sync-private.h	Fri May 19 17:44:30 2017 +0300
@@ -3,6 +3,15 @@
 
 #include "imap-sync.h"
 
+struct imap_client_sync_context {
+	/* if multiple commands are in progress, we may need to wait for them
+	   to finish before syncing mailbox. */
+	unsigned int counter;
+	enum mailbox_sync_flags flags;
+	enum imap_sync_flags imap_flags;
+	const char *tagline;
+};
+
 struct imap_sync_context {
 	struct client *client;
 	struct mailbox *box;

--- a/src/imap/imap-sync.c	Fri May 19 16:34:29 2017 +0300
+++ b/src/imap/imap-sync.c	Fri May 19 17:44:30 2017 +0300
@@ -13,15 +13,6 @@
 #include "imap-commands.h"
 #include "imap-sync-private.h"
 
-struct client_sync_context {
-	/* if multiple commands are in progress, we may need to wait for them
-	   to finish before syncing mailbox. */
-	unsigned int counter;
-	enum mailbox_sync_flags flags;
-	enum imap_sync_flags imap_flags;
-	const char *tagline;
-};
-
 static void uids_to_seqs(struct mailbox *box, ARRAY_TYPE(seq_range) *uids)
 {
 	T_BEGIN {
@@ -755,7 +746,7 @@
 	}
 	cmd->tagline_reply = p_strdup(cmd->pool, tagline);
 
-	cmd->sync = p_new(cmd->pool, struct client_sync_context, 1);
+	cmd->sync = p_new(cmd->pool, struct imap_client_sync_context, 1);
 	cmd->sync->counter = client->sync_counter;
 	cmd->sync->flags = flags;
 	cmd->sync->imap_flags = imap_flags;