From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Sun, 5 Jun 2016 11:37:11 +0000 (+0300)
Subject: global: unsigned int:1 -> bool:1
X-Git-Tag: 2.3.0.rc1~3532
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0dffa25d211be541ee3c953b23566a1a990789df;p=thirdparty%2Fdovecot%2Fcore.git

global: unsigned int:1 -> bool:1

perl -i -pe 's/unsigned int ([^,:;]+):1;/bool $1:1;/' **/*.[ch]
---

diff --git a/src/anvil/anvil-connection.c b/src/anvil/anvil-connection.c
index ae30d22f79..40fd9c4d1b 100644
--- a/src/anvil/anvil-connection.c
+++ b/src/anvil/anvil-connection.c
@@ -25,10 +25,10 @@ struct anvil_connection {
 	struct ostream *output;
 	struct io *io;
 
-	unsigned int version_received:1;
-	unsigned int handshaked:1;
-	unsigned int master:1;
-	unsigned int fifo:1;
+	bool version_received:1;
+	bool handshaked:1;
+	bool master:1;
+	bool fifo:1;
 };
 
 static struct anvil_connection *anvil_connections = NULL;
diff --git a/src/anvil/penalty.c b/src/anvil/penalty.c
index 0d0ba10616..7f7452ed45 100644
--- a/src/anvil/penalty.c
+++ b/src/anvil/penalty.c
@@ -31,7 +31,7 @@ struct penalty_rec {
 
 	unsigned int penalty:16;
 	unsigned int last_update:LAST_UPDATE_BITS; /* last_penalty + n */
-	unsigned int checksum_is_pointer:1;
+	bool checksum_is_pointer:1;
 	/* we use value up to two different checksums.
 	   after that switch to pointer. */
 	union {
diff --git a/src/auth/auth-client-connection.h b/src/auth/auth-client-connection.h
index 93a906d2ca..a42ec72415 100644
--- a/src/auth/auth-client-connection.h
+++ b/src/auth/auth-client-connection.h
@@ -18,9 +18,9 @@ struct auth_client_connection {
 	uint8_t cookie[MASTER_AUTH_COOKIE_SIZE];
 	struct auth_request_handler *request_handler;
 
-	unsigned int login_requests:1;
-	unsigned int version_received:1;
-	unsigned int token_auth:1;
+	bool login_requests:1;
+	bool version_received:1;
+	bool token_auth:1;
 };
 
 void auth_client_connection_create(struct auth *auth, int fd,
diff --git a/src/auth/auth-master-connection.h b/src/auth/auth-master-connection.h
index 90756ae566..d59c6a613f 100644
--- a/src/auth/auth-master-connection.h
+++ b/src/auth/auth-master-connection.h
@@ -20,9 +20,9 @@ struct auth_master_connection {
 	   this uid. Don't allow LIST/PASS lookups. */
 	uid_t userdb_restricted_uid;
 
-	unsigned int version_received:1;
-	unsigned int destroyed:1;
-	unsigned int userdb_only:1;
+	bool version_received:1;
+	bool destroyed:1;
+	bool userdb_only:1;
 };
 
 struct auth_master_connection *
diff --git a/src/auth/auth-penalty.c b/src/auth/auth-penalty.c
index 3506040ce7..a9a7b37a5f 100644
--- a/src/auth/auth-penalty.c
+++ b/src/auth/auth-penalty.c
@@ -24,7 +24,7 @@ struct auth_penalty_request {
 struct auth_penalty {
 	struct anvil_client *client;
 
-	unsigned int disabled:1;
+	bool disabled:1;
 };
 
 struct auth_penalty *auth_penalty_init(const char *path)
diff --git a/src/auth/auth-postfix-connection.c b/src/auth/auth-postfix-connection.c
index db3a1d97f6..a270218058 100644
--- a/src/auth/auth-postfix-connection.c
+++ b/src/auth/auth-postfix-connection.c
@@ -29,7 +29,7 @@ struct auth_postfix_connection {
 	struct ostream *output;
 	struct io *io;
 
-	unsigned int destroyed:1;
+	bool destroyed:1;
 };
 
 static void postfix_input(struct auth_postfix_connection *conn);
diff --git a/src/auth/auth-request-handler.c b/src/auth/auth-request-handler.c
index b42f490ed0..c1af5c1fff 100644
--- a/src/auth/auth-request-handler.c
+++ b/src/auth/auth-request-handler.c
@@ -32,8 +32,8 @@ struct auth_request_handler {
 
 	auth_master_request_callback_t *master_callback;
 
-	unsigned int destroyed:1;
-	unsigned int token_auth:1;
+	bool destroyed:1;
+	bool token_auth:1;
 };
 
 static ARRAY(struct auth_request *) auth_failures_arr;
diff --git a/src/auth/auth-request.h b/src/auth/auth-request.h
index d2778ef4ef..dcb9e2148f 100644
--- a/src/auth/auth-request.h
+++ b/src/auth/auth-request.h
@@ -96,53 +96,53 @@ struct auth_request {
 
 	/* this is a lookup on auth socket (not login socket).
 	   skip any proxying stuff if enabled. */
-	unsigned int auth_only:1;
+	bool auth_only:1;
 	/* we're doing a userdb lookup now (we may have done passdb lookup
 	   earlier) */
-	unsigned int userdb_lookup:1;
+	bool userdb_lookup:1;
 	/* DIGEST-MD5 kludge */
-	unsigned int domain_is_realm:1;
+	bool domain_is_realm:1;
 	/* auth_debug is enabled for this request */
-	unsigned int debug:1;
+	bool debug:1;
 
 	/* flags received from auth client: */
-	unsigned int secured:1;
-	unsigned int final_resp_ok:1;
-	unsigned int no_penalty:1;
-	unsigned int valid_client_cert:1;
-	unsigned int cert_username:1;
-	unsigned int request_auth_token:1;
+	bool secured:1;
+	bool final_resp_ok:1;
+	bool no_penalty:1;
+	bool valid_client_cert:1;
+	bool cert_username:1;
+	bool request_auth_token:1;
 
 	/* success/failure states: */
-	unsigned int successful:1;
-	unsigned int failed:1; /* overrides any other success */
-	unsigned int internal_failure:1;
-	unsigned int passdbs_seen_user_unknown:1;
-	unsigned int passdbs_seen_internal_failure:1;
-	unsigned int userdbs_seen_internal_failure:1;
+	bool successful:1;
+	bool failed:1; /* overrides any other success */
+	bool internal_failure:1;
+	bool passdbs_seen_user_unknown:1;
+	bool passdbs_seen_internal_failure:1;
+	bool userdbs_seen_internal_failure:1;
 
 	/* current state: */
-	unsigned int accept_cont_input:1;
-	unsigned int skip_password_check:1;
-	unsigned int prefer_plain_credentials:1;
-	unsigned int in_delayed_failure_queue:1;
-	unsigned int removed_from_handler:1;
-	unsigned int snapshot_have_userdb_prefetch_set:1;
+	bool accept_cont_input:1;
+	bool skip_password_check:1;
+	bool prefer_plain_credentials:1;
+	bool in_delayed_failure_queue:1;
+	bool removed_from_handler:1;
+	bool snapshot_have_userdb_prefetch_set:1;
 	/* each passdb lookup can update the current success-status using the
 	   result_* rules. the authentication succeeds only if this is TRUE
 	   at the end. mechanisms that don't require passdb, but do a passdb
 	   lookup anyway (e.g. GSSAPI) need to set this to TRUE by default. */
-	unsigned int passdb_success:1;
+	bool passdb_success:1;
 	/* userdb equivalent of passdb_success */
-	unsigned int userdb_success:1;
+	bool userdb_success:1;
 	/* the last userdb lookup failed either due to "tempfail" extra field
 	   or because one of the returned uid/gid fields couldn't be translated
 	   to a number */
-	unsigned int userdb_lookup_tempfailed:1;
+	bool userdb_lookup_tempfailed:1;
 	/* userdb_* fields have been set by the passdb lookup, userdb prefetch
 	   will work. */
-	unsigned int userdb_prefetch_set:1;
-	unsigned int stats_sent:1;
+	bool userdb_prefetch_set:1;
+	bool stats_sent:1;
 
 	/* ... mechanism specific data ... */
 };
diff --git a/src/auth/auth-worker-client.c b/src/auth/auth-worker-client.c
index 5c909d29a4..eb49c33a59 100644
--- a/src/auth/auth-worker-client.c
+++ b/src/auth/auth-worker-client.c
@@ -34,9 +34,9 @@ struct auth_worker_client {
 	struct timeout *to_idle;
 	time_t cmd_start;
 
-	unsigned int version_received:1;
-	unsigned int dbhash_received:1;
-	unsigned int error_sent:1;
+	bool version_received:1;
+	bool dbhash_received:1;
+	bool error_sent:1;
 };
 
 struct auth_worker_list_context {
diff --git a/src/auth/auth-worker-server.c b/src/auth/auth-worker-server.c
index 49453cb240..60ed192045 100644
--- a/src/auth/auth-worker-server.c
+++ b/src/auth/auth-worker-server.c
@@ -48,11 +48,11 @@ struct auth_worker_connection {
 	struct auth_worker_request *request;
 	unsigned int id_counter;
 
-	unsigned int received_error:1;
-	unsigned int restart:1;
-	unsigned int shutdown:1;
-	unsigned int timeout_pending_resume:1;
-	unsigned int resuming:1;
+	bool received_error:1;
+	bool restart:1;
+	bool shutdown:1;
+	bool timeout_pending_resume:1;
+	bool resuming:1;
 };
 
 static ARRAY(struct auth_worker_connection *) connections = ARRAY_INIT;
diff --git a/src/auth/db-checkpassword.c b/src/auth/db-checkpassword.c
index 5c984cdf98..79ba1373fc 100644
--- a/src/auth/db-checkpassword.c
+++ b/src/auth/db-checkpassword.c
@@ -38,7 +38,7 @@ struct chkpw_auth_request {
 	unsigned int output_pos, output_len;
 
 	int exit_status;
-	unsigned int exited:1;
+	bool exited:1;
 };
 
 struct db_checkpassword {
diff --git a/src/auth/db-passwd-file.h b/src/auth/db-passwd-file.h
index a137ee17e1..ca41790efc 100644
--- a/src/auth/db-passwd-file.h
+++ b/src/auth/db-passwd-file.h
@@ -38,10 +38,10 @@ struct db_passwd_file {
 	HASH_TABLE(char *, struct passwd_file *) files;
         struct passwd_file *default_file;
 
-	unsigned int vars:1;
-	unsigned int userdb:1;
-	unsigned int userdb_warn_missing:1;
-	unsigned int debug:1;
+	bool vars:1;
+	bool userdb:1;
+	bool userdb_warn_missing:1;
+	bool debug:1;
 };
 
 struct passwd_user *
diff --git a/src/auth/db-sql.h b/src/auth/db-sql.h
index 3bd6a1a0fa..e985f1d5e5 100644
--- a/src/auth/db-sql.h
+++ b/src/auth/db-sql.h
@@ -24,11 +24,11 @@ struct sql_connection {
 	struct sql_settings set;
 	struct sql_db *db;
 
-	unsigned int default_password_query:1;
-	unsigned int default_user_query:1;
-	unsigned int default_update_query:1;
-	unsigned int default_iterate_query:1;
-	unsigned int userdb_used:1;
+	bool default_password_query:1;
+	bool default_user_query:1;
+	bool default_update_query:1;
+	bool default_iterate_query:1;
+	bool userdb_used:1;
 };
 
 struct sql_connection *db_sql_init(const char *config_path, bool userdb);
diff --git a/src/auth/mech-digest-md5.c b/src/auth/mech-digest-md5.c
index 9d7db62a97..cedd06273f 100644
--- a/src/auth/mech-digest-md5.c
+++ b/src/auth/mech-digest-md5.c
@@ -47,7 +47,7 @@ struct digest_auth_request {
 	char *authzid; /* may be NULL, authorization ID */
 	unsigned char response[32];
 	unsigned long maxbuf;
-	unsigned int nonce_found:1;
+	bool nonce_found:1;
 
 	/* final reply: */
 	char *rspauth;
diff --git a/src/auth/passdb-pam.c b/src/auth/passdb-pam.c
index f00eb50d87..9824431b29 100644
--- a/src/auth/passdb-pam.c
+++ b/src/auth/passdb-pam.c
@@ -42,9 +42,9 @@ struct pam_passdb_module {
 	const char *service_name, *pam_cache_key;
 	unsigned int requests_left;
 
-	unsigned int pam_setcred:1;
-	unsigned int pam_session:1;
-	unsigned int failure_show_msg:1;
+	bool pam_setcred:1;
+	bool pam_session:1;
+	bool failure_show_msg:1;
 };
 
 struct pam_conv_context {
diff --git a/src/auth/userdb-passwd.c b/src/auth/userdb-passwd.c
index e6f9b802be..f50bcba18f 100644
--- a/src/auth/userdb-passwd.c
+++ b/src/auth/userdb-passwd.c
@@ -21,7 +21,7 @@ struct passwd_userdb_module {
 	struct userdb_template *tmpl;
 
 	unsigned int fast_count, slow_count;
-	unsigned int slow_warned:1;
+	bool slow_warned:1;
 };
 
 struct passwd_userdb_iterate_context {
diff --git a/src/auth/userdb-sql.c b/src/auth/userdb-sql.c
index 80d6fa887c..7bdd6b111c 100644
--- a/src/auth/userdb-sql.c
+++ b/src/auth/userdb-sql.c
@@ -24,8 +24,8 @@ struct userdb_sql_request {
 struct sql_userdb_iterate_context {
 	struct userdb_iterate_context ctx;
 	struct sql_result *result;
-	unsigned int freed:1;
-	unsigned int call_iter:1;
+	bool freed:1;
+	bool call_iter:1;
 };
 
 static void userdb_sql_iterate_next(struct userdb_iterate_context *_ctx);
diff --git a/src/auth/userdb-static.c b/src/auth/userdb-static.c
index 9181e22966..bf8c9af093 100644
--- a/src/auth/userdb-static.c
+++ b/src/auth/userdb-static.c
@@ -18,7 +18,7 @@ struct static_userdb_module {
 	struct userdb_module module;
 	struct userdb_template *tmpl;
 
-	unsigned int allow_all_users:1;
+	bool allow_all_users:1;
 };
 
 static void static_lookup_real(struct auth_request *auth_request,
diff --git a/src/config/config-connection.c b/src/config/config-connection.c
index 7df5b0e1ea..b09ebea573 100644
--- a/src/config/config-connection.c
+++ b/src/config/config-connection.c
@@ -27,8 +27,8 @@ struct config_connection {
 	struct ostream *output;
 	struct io *io;
 
-	unsigned int version_received:1;
-	unsigned int handshaked:1;
+	bool version_received:1;
+	bool handshaked:1;
 };
 
 static struct config_connection *config_connections = NULL;
diff --git a/src/config/config-parser-private.h b/src/config/config-parser-private.h
index 8c18abdd80..da58a550c6 100644
--- a/src/config/config-parser-private.h
+++ b/src/config/config-parser-private.h
@@ -56,8 +56,8 @@ struct config_parser_context {
 
 	HASH_TABLE(const char *, const char *) seen_settings;
 	struct config_filter_context *filter;
-	unsigned int expand_values:1;
-	unsigned int hide_errors:1;
+	bool expand_values:1;
+	bool hide_errors:1;
 };
 
 extern void (*hook_config_parser_begin)(struct config_parser_context *ctx);
diff --git a/src/config/doveconf.c b/src/config/doveconf.c
index 152333ca35..a07a289248 100644
--- a/src/config/doveconf.c
+++ b/src/config/doveconf.c
@@ -38,7 +38,7 @@ struct config_dump_human_context {
 	ARRAY_TYPE(const_string) errors;
 	struct config_export_context *export_ctx;
 
-	unsigned int list_prefix_sent:1;
+	bool list_prefix_sent:1;
 };
 
 #define LIST_KEY_PREFIX "\001"
diff --git a/src/dict/dict-connection.h b/src/dict/dict-connection.h
index 2f9149c0f0..6fd55b86a4 100644
--- a/src/dict/dict-connection.h
+++ b/src/dict/dict-connection.h
@@ -31,7 +31,7 @@ struct dict_connection {
 	ARRAY(struct dict_connection_transaction) transactions;
 	ARRAY(struct dict_connection_cmd *) cmds;
 
-	unsigned int destroyed:1;
+	bool destroyed:1;
 };
 
 struct dict_connection *dict_connection_create(int fd);
diff --git a/src/director/director-connection.c b/src/director/director-connection.c
index 5121758ecd..84d711573c 100644
--- a/src/director/director-connection.c
+++ b/src/director/director-connection.c
@@ -116,19 +116,19 @@ struct director_connection {
 	/* set during command execution */
 	const char *cur_cmd, *cur_line;
 
-	unsigned int in:1;
-	unsigned int connected:1;
-	unsigned int version_received:1;
-	unsigned int me_received:1;
-	unsigned int handshake_received:1;
-	unsigned int ignore_host_events:1;
-	unsigned int handshake_sending_hosts:1;
-	unsigned int ping_waiting:1;
-	unsigned int synced:1;
-	unsigned int wrong_host:1;
-	unsigned int verifying_left:1;
-	unsigned int users_unsorted:1;
-	unsigned int done_pending:1;
+	bool in:1;
+	bool connected:1;
+	bool version_received:1;
+	bool me_received:1;
+	bool handshake_received:1;
+	bool ignore_host_events:1;
+	bool handshake_sending_hosts:1;
+	bool ping_waiting:1;
+	bool synced:1;
+	bool wrong_host:1;
+	bool verifying_left:1;
+	bool users_unsorted:1;
+	bool done_pending:1;
 };
 
 static void director_connection_disconnected(struct director_connection **conn,
diff --git a/src/director/director-host.h b/src/director/director-host.h
index 08c1020da3..936d6b7631 100644
--- a/src/director/director-host.h
+++ b/src/director/director-host.h
@@ -31,8 +31,8 @@ struct director_host {
 	time_t last_network_failure;
 	time_t last_protocol_failure;
 	/* we are this director */
-	unsigned int self:1;
-	unsigned int removed:1;
+	bool self:1;
+	bool removed:1;
 };
 
 struct director_host *
diff --git a/src/director/director.h b/src/director/director.h
index a2e5c5469f..ef3e6cb6eb 100644
--- a/src/director/director.h
+++ b/src/director/director.h
@@ -90,11 +90,11 @@ struct director {
 
 	/* director ring handshaking is complete.
 	   director can start serving clients. */
-	unsigned int ring_handshaked:1;
-	unsigned int ring_handshake_warning_sent:1;
-	unsigned int ring_synced:1;
-	unsigned int sync_frozen:1;
-	unsigned int sync_pending:1;
+	bool ring_handshaked:1;
+	bool ring_handshake_warning_sent:1;
+	bool ring_synced:1;
+	bool sync_frozen:1;
+	bool sync_pending:1;
 };
 
 extern bool director_debug;
diff --git a/src/director/doveadm-connection.c b/src/director/doveadm-connection.c
index 0b93885e52..79a9e750d1 100644
--- a/src/director/doveadm-connection.c
+++ b/src/director/doveadm-connection.c
@@ -34,7 +34,7 @@ struct doveadm_connection {
 	struct ostream *output;
 	struct director *dir;
 
-	unsigned int handshaked:1;
+	bool handshaked:1;
 };
 
 static struct doveadm_connection *doveadm_connections;
diff --git a/src/director/login-connection.c b/src/director/login-connection.c
index d57c912b17..f6b7459d21 100644
--- a/src/director/login-connection.c
+++ b/src/director/login-connection.c
@@ -31,8 +31,8 @@ struct login_connection {
 	struct auth_connection *auth;
 	struct director *dir;
 
-	unsigned int handshaked:1;
-	unsigned int destroyed:1;
+	bool handshaked:1;
+	bool destroyed:1;
 };
 
 struct login_host_request {
diff --git a/src/director/mail-host.h b/src/director/mail-host.h
index 76521a6357..1ae1418ca6 100644
--- a/src/director/mail-host.h
+++ b/src/director/mail-host.h
@@ -20,7 +20,7 @@ struct mail_host {
 	struct mail_tag *tag;
 
 	/* host was recently changed and ring hasn't synced yet since */
-	unsigned int desynced:1;
+	bool desynced:1;
 };
 ARRAY_DEFINE_TYPE(mail_host, struct mail_host *);
 
diff --git a/src/director/user-directory.h b/src/director/user-directory.h
index b643cf5f86..cbcd4a6934 100644
--- a/src/director/user-directory.h
+++ b/src/director/user-directory.h
@@ -45,7 +45,7 @@ struct user {
 	/* TRUE, if the user's timestamp was close to being expired and we're
 	   now doing a ring-wide sync for this user to make sure we don't
 	   assign conflicting hosts to it */
-	unsigned int weak:1;
+	bool weak:1;
 };
 
 /* Create a new directory. Users are dropped if their time gets older
diff --git a/src/doveadm/client-connection.h b/src/doveadm/client-connection.h
index 1daf8fd7a8..f1546cd68a 100644
--- a/src/doveadm/client-connection.h
+++ b/src/doveadm/client-connection.h
@@ -15,8 +15,8 @@ struct client_connection {
 	in_port_t local_port, remote_port;
 	const struct doveadm_settings *set;
 
-	unsigned int handshaked:1;
-	unsigned int authenticated:1;
+	bool handshaked:1;
+	bool authenticated:1;
 };
 
 struct client_connection *
diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
index f77c76d36a..0a5afb119f 100644
--- a/src/doveadm/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -90,19 +90,19 @@ struct dsync_cmd_context {
 
 	unsigned int lock_timeout;
 
-	unsigned int lock:1;
-	unsigned int purge_remote:1;
-	unsigned int sync_visible_namespaces:1;
-	unsigned int default_replica_location:1;
-	unsigned int oneway:1;
-	unsigned int backup:1;
-	unsigned int reverse_backup:1;
-	unsigned int remote_user_prefix:1;
-	unsigned int no_mail_sync:1;
-	unsigned int no_mailbox_renames:1;
-	unsigned int local_location_from_arg:1;
-	unsigned int replicator_notify:1;
-	unsigned int exited:1;
+	bool lock:1;
+	bool purge_remote:1;
+	bool sync_visible_namespaces:1;
+	bool default_replica_location:1;
+	bool oneway:1;
+	bool backup:1;
+	bool reverse_backup:1;
+	bool remote_user_prefix:1;
+	bool no_mail_sync:1;
+	bool no_mailbox_renames:1;
+	bool local_location_from_arg:1;
+	bool replicator_notify:1;
+	bool exited:1;
 };
 
 static bool legacy_dsync = FALSE;
diff --git a/src/doveadm/doveadm-mail-index.c b/src/doveadm/doveadm-mail-index.c
index b0e1207a81..d0c6216d5d 100644
--- a/src/doveadm/doveadm-mail-index.c
+++ b/src/doveadm/doveadm-mail-index.c
@@ -22,8 +22,8 @@ struct index_cmd_context {
 
 	int queue_fd;
 	unsigned int max_recent_msgs;
-	unsigned int queue:1;
-	unsigned int have_wildcards:1;
+	bool queue:1;
+	bool have_wildcards:1;
 };
 
 static int cmd_index_box_precache(struct mailbox *box)
diff --git a/src/doveadm/doveadm-mail-mailbox-status.c b/src/doveadm/doveadm-mail-mailbox-status.c
index 36606944c2..19edba82ec 100644
--- a/src/doveadm/doveadm-mail-mailbox-status.c
+++ b/src/doveadm/doveadm-mail-mailbox-status.c
@@ -30,7 +30,7 @@ struct status_cmd_context {
 	struct mailbox_status total_status;
 	struct mailbox_metadata total_metadata;
 
-	unsigned int total_sum:1;
+	bool total_sum:1;
 };
 
 static void status_parse_fields(struct status_cmd_context *ctx,
diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h
index fce8204fdc..1450f876ba 100644
--- a/src/doveadm/doveadm-mail.h
+++ b/src/doveadm/doveadm-mail.h
@@ -92,13 +92,13 @@ struct doveadm_mail_cmd_context {
 	int exit_code;
 
 	/* This command is being called by a remote doveadm client. */
-	unsigned int proxying:1;
+	bool proxying:1;
 	/* We're handling only a single user */
-	unsigned int iterate_single_user:1;
+	bool iterate_single_user:1;
 	/* We're going through all users (not set for wildcard usernames) */
-	unsigned int iterate_all_users:1;
+	bool iterate_all_users:1;
 	/* Running from CLI doveadm (not doveadm-server) */
-	unsigned int cli:1;
+	bool cli:1;
 };
 
 struct doveadm_mail_cmd {
diff --git a/src/doveadm/doveadm-print-flow.c b/src/doveadm/doveadm-print-flow.c
index 9b0c51f38b..f2a6ebee34 100644
--- a/src/doveadm/doveadm-print-flow.c
+++ b/src/doveadm/doveadm-print-flow.c
@@ -15,7 +15,7 @@ struct doveadm_print_flow_context {
 	ARRAY(struct doveadm_print_flow_header) headers;
 	unsigned int header_idx;
 
-	unsigned int streaming:1;
+	bool streaming:1;
 };
 
 static struct doveadm_print_flow_context *ctx;
diff --git a/src/doveadm/doveadm-print-pager.c b/src/doveadm/doveadm-print-pager.c
index 3a10997267..12852a9b8f 100644
--- a/src/doveadm/doveadm-print-pager.c
+++ b/src/doveadm/doveadm-print-pager.c
@@ -14,8 +14,8 @@ struct doveadm_print_pager_context {
 	ARRAY(struct doveadm_print_pager_header) headers;
 	unsigned int header_idx;
 
-	unsigned int streaming:1;
-	unsigned int first_page:1;
+	bool streaming:1;
+	bool first_page:1;
 };
 
 static struct doveadm_print_pager_context *ctx;
diff --git a/src/doveadm/doveadm-print-tab.c b/src/doveadm/doveadm-print-tab.c
index e6b241172b..2d5059a0dc 100644
--- a/src/doveadm/doveadm-print-tab.c
+++ b/src/doveadm/doveadm-print-tab.c
@@ -8,7 +8,7 @@
 struct doveadm_print_tab_context {
 	unsigned int header_idx, header_count;
 
-	unsigned int header_written:1;
+	bool header_written:1;
 };
 
 static struct doveadm_print_tab_context ctx;
diff --git a/src/doveadm/doveadm-print-table.c b/src/doveadm/doveadm-print-table.c
index 0c0c0b4dcd..5cadd53244 100644
--- a/src/doveadm/doveadm-print-table.c
+++ b/src/doveadm/doveadm-print-table.c
@@ -30,7 +30,7 @@ struct doveadm_print_table_context {
 	unsigned int hdr_idx;
 	unsigned int columns;
 
-	unsigned int lengths_set:1;
+	bool lengths_set:1;
 };
 
 static struct doveadm_print_table_context *ctx;
diff --git a/src/doveadm/doveadm-stats.c b/src/doveadm/doveadm-stats.c
index 6a7470e78e..c9f5bd1ef5 100644
--- a/src/doveadm/doveadm-stats.c
+++ b/src/doveadm/doveadm-stats.c
@@ -22,7 +22,7 @@ struct top_line {
 	/* [headers_count] */
 	const char **prev_values, **cur_values;
 
-	unsigned int flip:1;
+	bool flip:1;
 };
 
 struct top_context {
@@ -43,7 +43,7 @@ struct top_context {
 	unsigned int last_update_idx, user_idx;
 	unsigned int sort_idx1, sort_idx2;
 
-	unsigned int flip:1;
+	bool flip:1;
 };
 
 static struct top_context *sort_ctx = NULL;
diff --git a/src/doveadm/dsync/dsync-brain-private.h b/src/doveadm/dsync/dsync-brain-private.h
index bba7184186..67e9e9cac4 100644
--- a/src/doveadm/dsync/dsync-brain-private.h
+++ b/src/doveadm/dsync/dsync-brain-private.h
@@ -97,23 +97,23 @@ struct dsync_brain {
 
 	enum mail_error mail_error;
 
-	unsigned int master_brain:1;
-	unsigned int mail_requests:1;
-	unsigned int backup_send:1;
-	unsigned int backup_recv:1;
-	unsigned int purge:1;
-	unsigned int debug:1;
-	unsigned int sync_visible_namespaces:1;
-	unsigned int no_mail_sync:1;
-	unsigned int no_backup_overwrite:1;
-	unsigned int no_mail_prefetch:1;
-	unsigned int no_mailbox_renames:1;
-	unsigned int changes_during_sync:1;
-	unsigned int require_full_resync:1;
-	unsigned int verbose_proctitle:1;
-	unsigned int no_notify:1;
-	unsigned int hdr_hash_v2:1;
-	unsigned int failed:1;
+	bool master_brain:1;
+	bool mail_requests:1;
+	bool backup_send:1;
+	bool backup_recv:1;
+	bool purge:1;
+	bool debug:1;
+	bool sync_visible_namespaces:1;
+	bool no_mail_sync:1;
+	bool no_backup_overwrite:1;
+	bool no_mail_prefetch:1;
+	bool no_mailbox_renames:1;
+	bool changes_during_sync:1;
+	bool require_full_resync:1;
+	bool verbose_proctitle:1;
+	bool no_notify:1;
+	bool hdr_hash_v2:1;
+	bool failed:1;
 };
 
 extern const char *dsync_box_state_names[DSYNC_BOX_STATE_DONE+1];
diff --git a/src/doveadm/dsync/dsync-ibc-private.h b/src/doveadm/dsync/dsync-ibc-private.h
index 62112c0e9c..b274360b3a 100644
--- a/src/doveadm/dsync/dsync-ibc-private.h
+++ b/src/doveadm/dsync/dsync-ibc-private.h
@@ -85,8 +85,8 @@ struct dsync_ibc {
 	io_callback_t *io_callback;
 	void *io_context;
 
-	unsigned int failed:1;
-	unsigned int timeout:1;
+	bool failed:1;
+	bool timeout:1;
 };
 
 #endif
diff --git a/src/doveadm/dsync/dsync-ibc-stream.c b/src/doveadm/dsync/dsync-ibc-stream.c
index 74ac62e4b2..f4b23f9249 100644
--- a/src/doveadm/dsync/dsync-ibc-stream.c
+++ b/src/doveadm/dsync/dsync-ibc-stream.c
@@ -160,15 +160,15 @@ struct dsync_ibc_stream {
 	char value_output_last;
 
 	enum item_type last_recv_item, last_sent_item;
-	unsigned int last_recv_item_eol:1;
-	unsigned int last_sent_item_eol:1;
-
-	unsigned int version_received:1;
-	unsigned int handshake_received:1;
-	unsigned int has_pending_data:1;
-	unsigned int finish_received:1;
-	unsigned int done_received:1;
-	unsigned int stopped:1;
+	bool last_recv_item_eol:1;
+	bool last_sent_item_eol:1;
+
+	bool version_received:1;
+	bool handshake_received:1;
+	bool has_pending_data:1;
+	bool finish_received:1;
+	bool done_received:1;
+	bool stopped:1;
 };
 
 static const char *dsync_ibc_stream_get_state(struct dsync_ibc_stream *ibc)
diff --git a/src/doveadm/dsync/dsync-mailbox-export.c b/src/doveadm/dsync/dsync-mailbox-export.c
index 0267f86f2a..32f89d360e 100644
--- a/src/doveadm/dsync/dsync-mailbox-export.c
+++ b/src/doveadm/dsync/dsync-mailbox-export.c
@@ -57,13 +57,13 @@ struct dsync_mailbox_exporter {
 	const char *error;
 	enum mail_error mail_error;
 
-	unsigned int body_search_initialized:1;
-	unsigned int auto_export_mails:1;
-	unsigned int mails_have_guids:1;
-	unsigned int minimal_dmail_fill:1;
-	unsigned int return_all_mails:1;
-	unsigned int export_received_timestamps:1;
-	unsigned int no_hdr_hashes:1;
+	bool body_search_initialized:1;
+	bool auto_export_mails:1;
+	bool mails_have_guids:1;
+	bool minimal_dmail_fill:1;
+	bool return_all_mails:1;
+	bool export_received_timestamps:1;
+	bool no_hdr_hashes:1;
 };
 
 static int dsync_mail_error(struct dsync_mailbox_exporter *exporter,
diff --git a/src/doveadm/dsync/dsync-mailbox-import.c b/src/doveadm/dsync/dsync-mailbox-import.c
index c64f6bd114..877305cd5a 100644
--- a/src/doveadm/dsync/dsync-mailbox-import.c
+++ b/src/doveadm/dsync/dsync-mailbox-import.c
@@ -39,11 +39,11 @@ struct importer_new_mail {
 	/* UID for the mail in the virtual \All mailbox */
 	uint32_t virtual_all_uid;
 
-	unsigned int uid_in_local:1;
-	unsigned int uid_is_usable:1;
-	unsigned int skip:1;
-	unsigned int expunged:1;
-	unsigned int copy_failed:1;
+	bool uid_in_local:1;
+	bool uid_is_usable:1;
+	bool skip:1;
+	bool expunged:1;
+	bool copy_failed:1;
 };
 
 /* for quickly testing that two-way sync doesn't actually do any unexpected
@@ -107,21 +107,21 @@ struct dsync_mailbox_importer {
 
 	enum mail_error mail_error;
 
-	unsigned int failed:1;
-	unsigned int require_full_resync:1;
-	unsigned int debug:1;
-	unsigned int stateful_import:1;
-	unsigned int last_common_uid_found:1;
-	unsigned int cur_uid_has_change:1;
-	unsigned int cur_mail_skip:1;
-	unsigned int local_expunged_guids_set:1;
-	unsigned int new_uids_assigned:1;
-	unsigned int want_mail_requests:1;
-	unsigned int master_brain:1;
-	unsigned int revert_local_changes:1;
-	unsigned int mails_have_guids:1;
-	unsigned int mails_use_guid128:1;
-	unsigned int delete_mailbox:1;
+	bool failed:1;
+	bool require_full_resync:1;
+	bool debug:1;
+	bool stateful_import:1;
+	bool last_common_uid_found:1;
+	bool cur_uid_has_change:1;
+	bool cur_mail_skip:1;
+	bool local_expunged_guids_set:1;
+	bool new_uids_assigned:1;
+	bool want_mail_requests:1;
+	bool master_brain:1;
+	bool revert_local_changes:1;
+	bool mails_have_guids:1;
+	bool mails_use_guid128:1;
+	bool delete_mailbox:1;
 };
 
 static const char *dsync_mail_change_type_names[] = {
diff --git a/src/doveadm/dsync/dsync-mailbox-tree.h b/src/doveadm/dsync/dsync-mailbox-tree.h
index d317aaa34f..454790c636 100644
--- a/src/doveadm/dsync/dsync-mailbox-tree.h
+++ b/src/doveadm/dsync/dsync-mailbox-tree.h
@@ -60,11 +60,11 @@ struct dsync_mailbox_node {
 	/* last time the subscription state was changed, 0 if not known */
 	time_t last_subscription_change;
 	/* is this mailbox or directory subscribed? */
-	unsigned int subscribed:1;
+	bool subscribed:1;
 
 	/* Internal syncing flags: */
-	unsigned int sync_delayed_guid_change:1;
-	unsigned int sync_temporary_name:1;
+	bool sync_delayed_guid_change:1;
+	bool sync_temporary_name:1;
 };
 ARRAY_DEFINE_TYPE(dsync_mailbox_node, struct dsync_mailbox_node *);
 
diff --git a/src/doveadm/server-connection.c b/src/doveadm/server-connection.c
index 979a5622f8..59562715da 100644
--- a/src/doveadm/server-connection.c
+++ b/src/doveadm/server-connection.c
@@ -51,9 +51,9 @@ struct server_connection {
 
 	enum server_reply_state state;
 
-	unsigned int handshaked:1;
-	unsigned int authenticated:1;
-	unsigned int streaming:1;
+	bool handshaked:1;
+	bool authenticated:1;
+	bool streaming:1;
 };
 
 static struct server_connection *printing_conn = NULL;
diff --git a/src/imap-login/imap-login-client.h b/src/imap-login/imap-login-client.h
index 19c8739b93..6589c1f781 100644
--- a/src/imap-login/imap-login-client.h
+++ b/src/imap-login/imap-login-client.h
@@ -34,15 +34,15 @@ struct imap_client {
 	const char *cmd_tag, *cmd_name;
 	struct imap_client_cmd_id *cmd_id;
 
-	unsigned int cmd_finished:1;
-	unsigned int proxy_sasl_ir:1;
-	unsigned int proxy_logindisabled:1;
-	unsigned int proxy_seen_banner:1;
-	unsigned int skip_line:1;
-	unsigned int id_logged:1;
-	unsigned int proxy_capability_request_sent:1;
-	unsigned int client_ignores_capability_resp_code:1;
-	unsigned int auth_mech_name_parsed:1;
+	bool cmd_finished:1;
+	bool proxy_sasl_ir:1;
+	bool proxy_logindisabled:1;
+	bool proxy_seen_banner:1;
+	bool skip_line:1;
+	bool id_logged:1;
+	bool proxy_capability_request_sent:1;
+	bool client_ignores_capability_resp_code:1;
+	bool auth_mech_name_parsed:1;
 };
 
 bool client_skip_line(struct imap_client *client);
diff --git a/src/imap-urlauth/imap-urlauth-client.h b/src/imap-urlauth/imap-urlauth-client.h
index cb440dcbd6..41b905606a 100644
--- a/src/imap-urlauth/imap-urlauth-client.h
+++ b/src/imap-urlauth/imap-urlauth-client.h
@@ -27,7 +27,7 @@ struct client {
 
 	enum imap_urlauth_worker_state worker_state;
 
-	unsigned int disconnected:1;
+	bool disconnected:1;
 };
 
 extern struct client *imap_urlauth_clients;
diff --git a/src/imap-urlauth/imap-urlauth-login.c b/src/imap-urlauth/imap-urlauth-login.c
index f8153b6894..8a7713b119 100644
--- a/src/imap-urlauth/imap-urlauth-login.c
+++ b/src/imap-urlauth/imap-urlauth-login.c
@@ -21,7 +21,7 @@ struct imap_urlauth_client {
 
 	const struct imap_urlauth_login_settings *set;
 
-	unsigned int version_received:1;
+	bool version_received:1;
 };
 
 static void
diff --git a/src/imap-urlauth/imap-urlauth-worker.c b/src/imap-urlauth/imap-urlauth-worker.c
index c508f224af..7f5553b257 100644
--- a/src/imap-urlauth/imap-urlauth-worker.c
+++ b/src/imap-urlauth/imap-urlauth-worker.c
@@ -71,12 +71,12 @@ struct client {
 	const struct imap_urlauth_worker_settings *set;
 	const struct mail_storage_settings *mail_set;
 
-	unsigned int debug:1;
-	unsigned int finished:1;
-	unsigned int waiting_input:1;
-	unsigned int version_received:1;
-	unsigned int access_received:1;
-	unsigned int access_anonymous:1;
+	bool debug:1;
+	bool finished:1;
+	bool waiting_input:1;
+	bool version_received:1;
+	bool access_received:1;
+	bool access_anonymous:1;
 };
 
 static bool verbose_proctitle = FALSE;
diff --git a/src/imap/cmd-append.c b/src/imap/cmd-append.c
index 2718734201..f0093113db 100644
--- a/src/imap/cmd-append.c
+++ b/src/imap/cmd-append.c
@@ -41,10 +41,10 @@ struct cmd_append_context {
 	struct mail_save_context *save_ctx;
 	unsigned int count;
 
-	unsigned int message_input:1;
-	unsigned int binary_input:1;
-	unsigned int catenate:1;
-	unsigned int failed:1;
+	bool message_input:1;
+	bool binary_input:1;
+	bool catenate:1;
+	bool failed:1;
 };
 
 static void cmd_append_finish(struct cmd_append_context *ctx);
diff --git a/src/imap/cmd-idle.c b/src/imap/cmd-idle.c
index 921ba2beba..917326a8d4 100644
--- a/src/imap/cmd-idle.c
+++ b/src/imap/cmd-idle.c
@@ -16,8 +16,8 @@ struct cmd_idle_context {
 	struct imap_sync_context *sync_ctx;
 	struct timeout *keepalive_to, *to_hibernate;
 
-	unsigned int manual_cork:1;
-	unsigned int sync_pending:1;
+	bool manual_cork:1;
+	bool sync_pending:1;
 };
 
 static void idle_add_keepalive_timeout(struct cmd_idle_context *ctx);
diff --git a/src/imap/cmd-list.c b/src/imap/cmd-list.c
index 39f47fd5eb..e338ec2094 100644
--- a/src/imap/cmd-list.c
+++ b/src/imap/cmd-list.c
@@ -21,10 +21,10 @@ struct cmd_list_context {
 
 	struct mailbox_list_iterate_context *list_iter;
 
-	unsigned int lsub:1;
-	unsigned int lsub_no_unsubscribed:1;
-	unsigned int used_listext:1;
-	unsigned int used_status:1;
+	bool lsub:1;
+	bool lsub_no_unsubscribed:1;
+	bool used_listext:1;
+	bool used_status:1;
 };
 
 static void
diff --git a/src/imap/cmd-select.c b/src/imap/cmd-select.c
index 7558e23f81..d1d01e2235 100644
--- a/src/imap/cmd-select.c
+++ b/src/imap/cmd-select.c
@@ -24,7 +24,7 @@ struct imap_select_context {
 	ARRAY_TYPE(uint32_t) qresync_sample_seqset;
 	ARRAY_TYPE(uint32_t) qresync_sample_uidset;
 
-	unsigned int condstore:1;
+	bool condstore:1;
 };
 
 static int select_qresync_get_uids(struct imap_select_context *ctx,
diff --git a/src/imap/cmd-urlfetch.c b/src/imap/cmd-urlfetch.c
index 50299f2478..bb22fa8570 100644
--- a/src/imap/cmd-urlfetch.c
+++ b/src/imap/cmd-urlfetch.c
@@ -19,10 +19,10 @@ struct cmd_urlfetch_context {
 	struct imap_urlauth_fetch *ufetch;
 	struct istream *input;
 
-	unsigned int failed:1;
-	unsigned int finished:1;
-	unsigned int extended:1;
-	unsigned int in_io_handler:1;
+	bool failed:1;
+	bool finished:1;
+	bool extended:1;
+	bool in_io_handler:1;
 };
 
 struct cmd_urlfetch_url {
diff --git a/src/imap/imap-client.h b/src/imap/imap-client.h
index 9b5415e26f..52ed2d8750 100644
--- a/src/imap/imap-client.h
+++ b/src/imap/imap-client.h
@@ -91,14 +91,14 @@ struct client_command_context {
 
 	struct client_sync_context *sync;
 
-	unsigned int uid:1; /* used UID command */
-	unsigned int cancel:1; /* command is wanted to be cancelled */
-	unsigned int param_error:1;
-	unsigned int search_save_result:1; /* search result is being updated */
-	unsigned int search_save_result_used:1; /* command uses search save */
-	unsigned int temp_executed:1; /* temporary execution state tracking */
-	unsigned int tagline_sent:1;
-	unsigned int executing:1;
+	bool uid:1; /* used UID command */
+	bool cancel:1; /* command is wanted to be cancelled */
+	bool param_error:1;
+	bool search_save_result:1; /* search result is being updated */
+	bool search_save_result_used:1; /* command uses search save */
+	bool temp_executed:1; /* temporary execution state tracking */
+	bool tagline_sent:1;
+	bool executing:1;
 };
 
 struct imap_client_vfuncs {
@@ -183,25 +183,25 @@ struct client {
 
 	/* syncing marks this TRUE when it sees \Deleted flags. this is by
 	   EXPUNGE for Outlook-workaround. */
-	unsigned int sync_seen_deletes:1;
-	unsigned int disconnected:1;
-	unsigned int destroyed:1;
-	unsigned int handling_input:1;
-	unsigned int syncing:1;
-	unsigned int id_logged:1;
-	unsigned int mailbox_examined:1;
-	unsigned int anvil_sent:1;
-	unsigned int tls_compression:1;
-	unsigned int input_skip_line:1; /* skip all the data until we've
+	bool sync_seen_deletes:1;
+	bool disconnected:1;
+	bool destroyed:1;
+	bool handling_input:1;
+	bool syncing:1;
+	bool id_logged:1;
+	bool mailbox_examined:1;
+	bool anvil_sent:1;
+	bool tls_compression:1;
+	bool input_skip_line:1; /* skip all the data until we've
 					   found a new line */
-	unsigned int modseqs_sent_since_sync:1;
-	unsigned int notify_immediate_expunges:1;
-	unsigned int notify_count_changes:1;
-	unsigned int notify_flag_changes:1;
-	unsigned int imap_metadata_enabled:1;
-	unsigned int nonpermanent_modseqs:1;
-	unsigned int state_import_bad_idle_done:1;
-	unsigned int state_import_idle_continue:1;
+	bool modseqs_sent_since_sync:1;
+	bool notify_immediate_expunges:1;
+	bool notify_count_changes:1;
+	bool notify_flag_changes:1;
+	bool imap_metadata_enabled:1;
+	bool nonpermanent_modseqs:1;
+	bool state_import_bad_idle_done:1;
+	bool state_import_idle_continue:1;
 };
 
 struct imap_module_register {
diff --git a/src/imap/imap-fetch-body.c b/src/imap/imap-fetch-body.c
index 0cb0bd2b67..70930706dd 100644
--- a/src/imap/imap-fetch-body.c
+++ b/src/imap/imap-fetch-body.c
@@ -21,9 +21,9 @@ struct imap_fetch_body_data {
 	const char *section; /* NOTE: always uppercased */
 	struct imap_msgpart *msgpart;
 
-	unsigned int partial:1;
-	unsigned int binary:1;
-	unsigned int binary_size:1;
+	bool partial:1;
+	bool binary:1;
+	bool binary_size:1;
 };
 
 static void fetch_read_error(struct imap_fetch_context *ctx,
diff --git a/src/imap/imap-fetch.h b/src/imap/imap-fetch.h
index e2d12e836a..10e2c6f9b4 100644
--- a/src/imap/imap-fetch.h
+++ b/src/imap/imap-fetch.h
@@ -37,8 +37,8 @@ struct imap_fetch_context_handler {
 	const char *name;
 	const char *nil_reply;
 
-	unsigned int buffered:1;
-	unsigned int want_deinit:1;
+	bool buffered:1;
+	bool want_deinit:1;
 };
 
 struct imap_fetch_qresync_args {
@@ -61,14 +61,14 @@ struct imap_fetch_state {
 	int (*cont_handler)(struct imap_fetch_context *ctx);
 	uint64_t *cur_stats_sizep;
 
-	unsigned int fetching:1;
-	unsigned int seen_flags_changed:1;
-	unsigned int cur_first:1;
-	unsigned int cur_flushed:1;
-	unsigned int line_partial:1;
-	unsigned int line_finished:1;
-	unsigned int skipped_expunged_msgs:1;
-	unsigned int failed:1;
+	bool fetching:1;
+	bool seen_flags_changed:1;
+	bool cur_first:1;
+	bool cur_flushed:1;
+	bool line_partial:1;
+	bool line_finished:1;
+	bool skipped_expunged_msgs:1;
+	bool failed:1;
 };
 
 struct imap_fetch_context {
@@ -85,10 +85,10 @@ struct imap_fetch_context {
 
 	struct imap_fetch_state state;
 
-	unsigned int initialized:1;
-	unsigned int flags_have_handler:1;
-	unsigned int flags_update_seen:1;
-	unsigned int flags_show_only_seen_changes:1;
+	bool initialized:1;
+	bool flags_have_handler:1;
+	bool flags_update_seen:1;
+	bool flags_show_only_seen_changes:1;
 };
 
 void imap_fetch_handlers_register(const struct imap_fetch_handler *handlers,
diff --git a/src/imap/imap-notify.h b/src/imap/imap-notify.h
index 43f0dbbbf1..6d8990df0e 100644
--- a/src/imap/imap-notify.h
+++ b/src/imap/imap-notify.h
@@ -49,12 +49,12 @@ struct imap_notify_context {
 	struct imap_fetch_context *fetch_ctx;
 	struct timeout *to_watch;
 
-	unsigned int have_subscriptions:1;
-	unsigned int selected_set:1;
-	unsigned int selected_immediate_expunges:1;
-	unsigned int send_immediate_status:1;
-	unsigned int watching_mailbox:1;
-	unsigned int notifying:1;
+	bool have_subscriptions:1;
+	bool selected_set:1;
+	bool selected_immediate_expunges:1;
+	bool send_immediate_status:1;
+	bool watching_mailbox:1;
+	bool notifying:1;
 };
 
 bool imap_notify_match_mailbox(struct imap_notify_namespace *notify_ns,
diff --git a/src/imap/imap-search.h b/src/imap/imap-search.h
index 64ddc97072..f8d14c9588 100644
--- a/src/imap/imap-search.h
+++ b/src/imap/imap-search.h
@@ -42,9 +42,9 @@ struct imap_search_context {
 
 	uint64_t highest_seen_modseq;
 
-	unsigned int have_seqsets:1;
-	unsigned int have_modseqs:1;
-	unsigned int sorting:1;
+	bool have_seqsets:1;
+	bool have_modseqs:1;
+	bool sorting:1;
 };
 
 int cmd_search_parse_return_if_found(struct imap_search_context *ctx,
diff --git a/src/imap/imap-sync.c b/src/imap/imap-sync.c
index 27f31d0543..05d58f1f77 100644
--- a/src/imap/imap-sync.c
+++ b/src/imap/imap-sync.c
@@ -44,11 +44,11 @@ struct imap_sync_context {
 
 	unsigned int messages_count;
 
-	unsigned int failed:1;
-	unsigned int finished:1;
-	unsigned int no_newmail:1;
-	unsigned int have_new_mails:1;
-	unsigned int search_update_notifying:1;
+	bool failed:1;
+	bool finished:1;
+	bool no_newmail:1;
+	bool have_new_mails:1;
+	bool search_update_notifying:1;
 };
 
 static void uids_to_seqs(struct mailbox *box, ARRAY_TYPE(seq_range) *uids)
diff --git a/src/indexer/indexer-client.c b/src/indexer/indexer-client.c
index 16c15a3f1e..dcf3dbf9bc 100644
--- a/src/indexer/indexer-client.c
+++ b/src/indexer/indexer-client.c
@@ -27,9 +27,9 @@ struct indexer_client {
 	struct ostream *output;
 	struct io *io;
 
-	unsigned int version_received:1;
-	unsigned int handshaked:1;
-	unsigned int destroyed:1;
+	bool version_received:1;
+	bool handshaked:1;
+	bool destroyed:1;
 };
 
 struct indexer_client_request {
diff --git a/src/indexer/indexer-queue.h b/src/indexer/indexer-queue.h
index aeddabcec8..2b5dd7a6c8 100644
--- a/src/indexer/indexer-queue.h
+++ b/src/indexer/indexer-queue.h
@@ -12,16 +12,16 @@ struct indexer_request {
 	unsigned int max_recent_msgs;
 
 	/* index messages in this mailbox */
-	unsigned int index:1;
+	bool index:1;
 	/* optimize this mailbox */
-	unsigned int optimize:1;
+	bool optimize:1;
 	/* currently indexing this mailbox */
-	unsigned int working:1;
+	bool working:1;
 	/* after indexing is finished, add this request back to the queue and
 	   reindex it (i.e. a new indexing request came while we were
 	   working.) */
-	unsigned int reindex_head:1;
-	unsigned int reindex_tail:1;
+	bool reindex_head:1;
+	bool reindex_tail:1;
 
 	/* when working finished, call this number of contexts and leave the
 	   rest to the reindexing. */
diff --git a/src/indexer/master-connection.c b/src/indexer/master-connection.c
index 64a5c69726..d1e32ed1dd 100644
--- a/src/indexer/master-connection.c
+++ b/src/indexer/master-connection.c
@@ -30,7 +30,7 @@ struct master_connection {
 	struct istream *input;
 	struct ostream *output;
 
-	unsigned int version_received:1;
+	bool version_received:1;
 };
 
 static void ATTR_NULL(1, 2)
diff --git a/src/indexer/worker-connection.c b/src/indexer/worker-connection.c
index 445b00bcbe..93d8e7171d 100644
--- a/src/indexer/worker-connection.c
+++ b/src/indexer/worker-connection.c
@@ -36,7 +36,7 @@ struct worker_connection {
 	struct aqueue *request_queue;
 
 	unsigned int process_limit;
-	unsigned int version_received:1;
+	bool version_received:1;
 };
 
 struct worker_connection *
diff --git a/src/ipc/ipc-connection.h b/src/ipc/ipc-connection.h
index b9354062f6..83603b5317 100644
--- a/src/ipc/ipc-connection.h
+++ b/src/ipc/ipc-connection.h
@@ -29,8 +29,8 @@ struct ipc_connection {
 	/* running commands */
 	ARRAY(struct ipc_connection_cmd *) cmds;
 
-	unsigned int version_received:1;
-	unsigned int handshake_received:1;
+	bool version_received:1;
+	bool handshake_received:1;
 };
 
 struct ipc_connection *ipc_connection_create(int listen_fd, int fd);
diff --git a/src/lib-auth/auth-client-private.h b/src/lib-auth/auth-client-private.h
index 8dceefd2e1..82b6d26bea 100644
--- a/src/lib-auth/auth-client-private.h
+++ b/src/lib-auth/auth-client-private.h
@@ -14,7 +14,7 @@ struct auth_client {
 
 	unsigned int request_id_counter;
 
-	unsigned int debug:1;
+	bool debug:1;
 };
 
 #endif
diff --git a/src/lib-auth/auth-master.c b/src/lib-auth/auth-master.c
index 79dfb59550..b2aae9e5ef 100644
--- a/src/lib-auth/auth-master.c
+++ b/src/lib-auth/auth-master.c
@@ -43,9 +43,9 @@ struct auth_master_connection {
 			       void *context);
 	void *reply_context;
 
-	unsigned int sent_handshake:1;
-	unsigned int handshaked:1;
-	unsigned int aborted:1;
+	bool sent_handshake:1;
+	bool handshaked:1;
+	bool aborted:1;
 };
 
 struct auth_master_lookup_ctx {
diff --git a/src/lib-auth/auth-master.h b/src/lib-auth/auth-master.h
index 07de9c230f..40c4baf235 100644
--- a/src/lib-auth/auth-master.h
+++ b/src/lib-auth/auth-master.h
@@ -22,7 +22,7 @@ struct auth_user_reply {
 	gid_t gid;
 	const char *home, *chroot;
 	ARRAY_TYPE(const_string) extra_fields;
-	unsigned int anonymous:1;
+	bool anonymous:1;
 };
 
 struct auth_master_connection *
diff --git a/src/lib-auth/auth-server-connection.h b/src/lib-auth/auth-server-connection.h
index 51fc7f24b7..4e9c1a5c2b 100644
--- a/src/lib-auth/auth-server-connection.h
+++ b/src/lib-auth/auth-server-connection.h
@@ -22,9 +22,9 @@ struct auth_server_connection {
 	/* id => request */
 	HASH_TABLE(void *, struct auth_client_request *) requests;
 
-	unsigned int version_received:1;
-	unsigned int handshake_received:1;
-	unsigned int has_plain_mech:1;
+	bool version_received:1;
+	bool handshake_received:1;
+	bool has_plain_mech:1;
 };
 
 struct auth_server_connection *
diff --git a/src/lib-compression/istream-bzlib.c b/src/lib-compression/istream-bzlib.c
index 0ebca31f58..c17d66fcd5 100644
--- a/src/lib-compression/istream-bzlib.c
+++ b/src/lib-compression/istream-bzlib.c
@@ -18,9 +18,9 @@ struct bzlib_istream {
 	size_t high_pos;
 	struct stat last_parent_statbuf;
 
-	unsigned int log_errors:1;
-	unsigned int marked:1;
-	unsigned int zs_closed:1;
+	bool log_errors:1;
+	bool marked:1;
+	bool zs_closed:1;
 };
 
 static void i_stream_bzlib_close(struct iostream_private *stream,
diff --git a/src/lib-compression/istream-lz4.c b/src/lib-compression/istream-lz4.c
index 2f169fbbb5..e4ac44a85b 100644
--- a/src/lib-compression/istream-lz4.c
+++ b/src/lib-compression/istream-lz4.c
@@ -19,9 +19,9 @@ struct lz4_istream {
 	buffer_t *chunk_buf;
 	uint32_t chunk_size, chunk_left, max_uncompressed_chunk_size;
 
-	unsigned int log_errors:1;
-	unsigned int marked:1;
-	unsigned int header_read:1;
+	bool log_errors:1;
+	bool marked:1;
+	bool header_read:1;
 };
 
 static void i_stream_lz4_close(struct iostream_private *stream,
diff --git a/src/lib-compression/istream-lzma.c b/src/lib-compression/istream-lzma.c
index 749858bcd6..5cc21c68d1 100644
--- a/src/lib-compression/istream-lzma.c
+++ b/src/lib-compression/istream-lzma.c
@@ -20,9 +20,9 @@ struct lzma_istream {
 	size_t high_pos;
 	struct stat last_parent_statbuf;
 
-	unsigned int log_errors:1;
-	unsigned int marked:1;
-	unsigned int strm_closed:1;
+	bool log_errors:1;
+	bool marked:1;
+	bool strm_closed:1;
 };
 
 static void i_stream_lzma_close(struct iostream_private *stream,
diff --git a/src/lib-compression/istream-zlib.c b/src/lib-compression/istream-zlib.c
index dca544164c..8e2d748d9d 100644
--- a/src/lib-compression/istream-zlib.c
+++ b/src/lib-compression/istream-zlib.c
@@ -30,12 +30,12 @@ struct zlib_istream {
 	uint32_t crc32;
 	struct stat last_parent_statbuf;
 
-	unsigned int gz:1;
-	unsigned int log_errors:1;
-	unsigned int marked:1;
-	unsigned int header_read:1;
-	unsigned int trailer_read:1;
-	unsigned int zs_closed:1;
+	bool gz:1;
+	bool log_errors:1;
+	bool marked:1;
+	bool header_read:1;
+	bool trailer_read:1;
+	bool zs_closed:1;
 };
 
 static void i_stream_zlib_init(struct zlib_istream *zstream);
diff --git a/src/lib-compression/ostream-bzlib.c b/src/lib-compression/ostream-bzlib.c
index ed6e797f89..8f11a6aaa5 100644
--- a/src/lib-compression/ostream-bzlib.c
+++ b/src/lib-compression/ostream-bzlib.c
@@ -17,7 +17,7 @@ struct bzlib_ostream {
 	char outbuf[CHUNK_SIZE];
 	unsigned int outbuf_offset, outbuf_used;
 
-	unsigned int flushed:1;
+	bool flushed:1;
 };
 
 static void o_stream_bzlib_close(struct iostream_private *stream,
diff --git a/src/lib-compression/ostream-lzma.c b/src/lib-compression/ostream-lzma.c
index 5000d5da69..9f25af5e20 100644
--- a/src/lib-compression/ostream-lzma.c
+++ b/src/lib-compression/ostream-lzma.c
@@ -17,7 +17,7 @@ struct lzma_ostream {
 	unsigned char outbuf[CHUNK_SIZE];
 	unsigned int outbuf_offset, outbuf_used;
 
-	unsigned int flushed:1;
+	bool flushed:1;
 };
 
 static void o_stream_lzma_close(struct iostream_private *stream,
diff --git a/src/lib-compression/ostream-zlib.c b/src/lib-compression/ostream-zlib.c
index d043e4bdbf..3c3ded2daf 100644
--- a/src/lib-compression/ostream-zlib.c
+++ b/src/lib-compression/ostream-zlib.c
@@ -22,9 +22,9 @@ struct zlib_ostream {
 
 	uint32_t crc, bytes32;
 
-	unsigned int gz:1;
-	unsigned int header_sent:1;
-	unsigned int flushed:1;
+	bool gz:1;
+	bool header_sent:1;
+	bool flushed:1;
 };
 
 static void o_stream_zlib_close(struct iostream_private *stream,
diff --git a/src/lib-dict/dict-client.c b/src/lib-dict/dict-client.c
index 8b5fadc7e8..b62beb14ad 100644
--- a/src/lib-dict/dict-client.c
+++ b/src/lib-dict/dict-client.c
@@ -50,8 +50,8 @@ struct client_dict {
 	unsigned int async_commits;
 	unsigned int iter_replies_skip;
 
-	unsigned int in_iteration:1;
-	unsigned int handshaked:1;
+	bool in_iteration:1;
+	bool handshaked:1;
 };
 
 struct client_dict_iterate_context {
@@ -75,9 +75,9 @@ struct client_dict_transaction_context {
 	unsigned int id;
 	unsigned int connect_counter;
 
-	unsigned int sent_begin:1;
-	unsigned int async:1;
-	unsigned int committed:1;
+	bool sent_begin:1;
+	bool async:1;
+	bool committed:1;
 };
 
 static int client_dict_connect(struct client_dict *dict, const char **error_r);
diff --git a/src/lib-dict/dict-private.h b/src/lib-dict/dict-private.h
index 049588d4da..3c487eeb50 100644
--- a/src/lib-dict/dict-private.h
+++ b/src/lib-dict/dict-private.h
@@ -53,13 +53,13 @@ struct dict_iterate_context {
 	dict_iterate_callback_t *async_callback;
 	void *async_context;
 
-	unsigned int has_more:1;
+	bool has_more:1;
 };
 
 struct dict_transaction_context {
 	struct dict *dict;
 
-	unsigned int changed:1;
+	bool changed:1;
 };
 
 extern struct dict dict_driver_client;
diff --git a/src/lib-dict/dict-sql.c b/src/lib-dict/dict-sql.c
index e1aafe5010..84d1a23452 100644
--- a/src/lib-dict/dict-sql.c
+++ b/src/lib-dict/dict-sql.c
@@ -30,7 +30,7 @@ struct sql_dict {
 	const char *username;
 	const struct dict_sql_settings *set;
 
-	unsigned int has_on_duplicate_key:1;
+	bool has_on_duplicate_key:1;
 };
 
 struct sql_dict_iterate_context {
diff --git a/src/lib-fs/fs-api-private.h b/src/lib-fs/fs-api-private.h
index 8889e6fd3a..c98b4b2bae 100644
--- a/src/lib-fs/fs-api-private.h
+++ b/src/lib-fs/fs-api-private.h
@@ -116,14 +116,14 @@ struct fs_file {
 
 	struct timeval timing_start[FS_OP_COUNT];
 
-	unsigned int write_pending:1;
-	unsigned int writing_stream:1;
-	unsigned int metadata_changed:1;
-
-	unsigned int read_or_prefetch_counted:1;
-	unsigned int lookup_metadata_counted:1;
-	unsigned int stat_counted:1;
-	unsigned int istream_open:1;
+	bool write_pending:1;
+	bool writing_stream:1;
+	bool metadata_changed:1;
+
+	bool read_or_prefetch_counted:1;
+	bool lookup_metadata_counted:1;
+	bool stat_counted:1;
+	bool istream_open:1;
 };
 
 struct fs_lock {
diff --git a/src/lib-http/http-client-private.h b/src/lib-http/http-client-private.h
index aa0ba486bb..f658ed314a 100644
--- a/src/lib-http/http-client-private.h
+++ b/src/lib-http/http-client-private.h
@@ -117,25 +117,25 @@ struct http_client_request {
 
 	enum http_request_state state;
 
-	unsigned int have_hdr_authorization:1;
-	unsigned int have_hdr_body_spec:1;
-	unsigned int have_hdr_connection:1;
-	unsigned int have_hdr_date:1;
-	unsigned int have_hdr_expect:1;
-	unsigned int have_hdr_host:1;
-	unsigned int have_hdr_user_agent:1;
-
-	unsigned int payload_sync:1;
-	unsigned int payload_sync_continue:1;
-	unsigned int payload_chunked:1;
-	unsigned int payload_wait:1;
-	unsigned int urgent:1;
-	unsigned int submitted:1;
-	unsigned int listed:1;
-	unsigned int connect_tunnel:1;
-	unsigned int connect_direct:1;
-	unsigned int ssl_tunnel:1;
-	unsigned int preserve_exact_reason:1;
+	bool have_hdr_authorization:1;
+	bool have_hdr_body_spec:1;
+	bool have_hdr_connection:1;
+	bool have_hdr_date:1;
+	bool have_hdr_expect:1;
+	bool have_hdr_host:1;
+	bool have_hdr_user_agent:1;
+
+	bool payload_sync:1;
+	bool payload_sync_continue:1;
+	bool payload_chunked:1;
+	bool payload_wait:1;
+	bool urgent:1;
+	bool submitted:1;
+	bool listed:1;
+	bool connect_tunnel:1;
+	bool connect_direct:1;
+	bool ssl_tunnel:1;
+	bool preserve_exact_reason:1;
 };
 
 struct http_client_connection {
@@ -165,17 +165,17 @@ struct http_client_connection {
 	/* requests that have been sent, waiting for response */
 	ARRAY_TYPE(http_client_request) request_wait_list;
 
-	unsigned int connected:1;           /* connection is connected */
-	unsigned int tunneling:1;          /* last sent request turns this
+	bool connected:1;           /* connection is connected */
+	bool tunneling:1;          /* last sent request turns this
 	                                      connection into tunnel */
-	unsigned int connect_initialized:1; /* connection was initialized */
-	unsigned int connect_succeeded:1;
-	unsigned int closing:1;
-	unsigned int disconnected:1;
-	unsigned int close_indicated:1;
-	unsigned int output_locked:1;       /* output is locked; no pipelining */
-	unsigned int output_broken:1;       /* output is broken; no more requests */
-	unsigned int in_req_callback:1;  /* performin request callback (busy) */
+	bool connect_initialized:1; /* connection was initialized */
+	bool connect_succeeded:1;
+	bool closing:1;
+	bool disconnected:1;
+	bool close_indicated:1;
+	bool output_locked:1;       /* output is locked; no pipelining */
+	bool output_broken:1;       /* output is broken; no more requests */
+	bool in_req_callback:1;  /* performin request callback (busy) */
 };
 
 struct http_client_peer {
@@ -202,12 +202,12 @@ struct http_client_peer {
 	struct timeout *to_backoff;
 	unsigned int backoff_time_msecs;
 
-	unsigned int disconnected:1;     /* peer is already disconnected */
-	unsigned int no_payload_sync:1;  /* expect: 100-continue failed before */
-	unsigned int seen_100_response:1;/* expect: 100-continue succeeded before */
-	unsigned int allows_pipelining:1;/* peer is known to allow persistent
+	bool disconnected:1;     /* peer is already disconnected */
+	bool no_payload_sync:1;  /* expect: 100-continue failed before */
+	bool seen_100_response:1;/* expect: 100-continue succeeded before */
+	bool allows_pipelining:1;/* peer is known to allow persistent
 	                                     connections */
-	unsigned int handling_requests:1;/* currently running request handler */
+	bool handling_requests:1;/* currently running request handler */
 };
 
 struct http_client_queue {
@@ -261,7 +261,7 @@ struct http_client_host {
 	/* active DNS lookup */
 	struct dns_lookup *dns_lookup;
 
-	unsigned int unix_local:1;
+	bool unix_local:1;
 };
 
 struct http_client {
diff --git a/src/lib-http/http-header-parser.c b/src/lib-http/http-header-parser.c
index 0c1a9cda63..080069b575 100644
--- a/src/lib-http/http-header-parser.c
+++ b/src/lib-http/http-header-parser.c
@@ -37,7 +37,7 @@ struct http_header_parser {
 
 	enum http_header_parse_state state;
 
-	unsigned int lenient:1;
+	bool lenient:1;
 };
 
 struct http_header_parser *
diff --git a/src/lib-http/http-message-parser.h b/src/lib-http/http-message-parser.h
index f9b39ef414..418b4f0b67 100644
--- a/src/lib-http/http-message-parser.h
+++ b/src/lib-http/http-message-parser.h
@@ -31,8 +31,8 @@ struct http_message {
 	ARRAY_TYPE(http_transfer_coding) transfer_encoding;
 	ARRAY_TYPE(const_string) connection_options;
 
-	unsigned int connection_close:1;
-	unsigned int have_content_length:1;
+	bool connection_close:1;
+	bool have_content_length:1;
 };
 
 struct http_message_parser {
@@ -52,7 +52,7 @@ struct http_message_parser {
 	pool_t msg_pool;
 	struct http_message msg;
 
-	unsigned int lenient:1;
+	bool lenient:1;
 };
 
 void http_message_parser_init(struct http_message_parser *parser,
diff --git a/src/lib-http/http-request-parser.c b/src/lib-http/http-request-parser.c
index 706834ca9c..b5a21fd252 100644
--- a/src/lib-http/http-request-parser.c
+++ b/src/lib-http/http-request-parser.c
@@ -33,7 +33,7 @@ struct http_request_parser {
 	const char *request_method;
 	const char *request_target;
 
-	unsigned int skipping_line:1;
+	bool skipping_line:1;
 };
 
 struct http_request_parser *
diff --git a/src/lib-http/http-request.h b/src/lib-http/http-request.h
index b162ad5c5b..feee28fba1 100644
--- a/src/lib-http/http-request.h
+++ b/src/lib-http/http-request.h
@@ -45,8 +45,8 @@ struct http_request {
 
 	ARRAY_TYPE(const_string) connection_options;
 
-	unsigned int connection_close:1;
-	unsigned int expect_100_continue:1;
+	bool connection_close:1;
+	bool expect_100_continue:1;
 };
 
 static inline bool
diff --git a/src/lib-http/http-response.h b/src/lib-http/http-response.h
index dde386efe4..ccd8e6f9d6 100644
--- a/src/lib-http/http-response.h
+++ b/src/lib-http/http-response.h
@@ -31,7 +31,7 @@ struct http_response {
 
 	ARRAY_TYPE(const_string) connection_options;
 
-	unsigned int connection_close:1;
+	bool connection_close:1;
 };
 
 void
diff --git a/src/lib-http/http-server-private.h b/src/lib-http/http-server-private.h
index b0a512898b..31b54f820e 100644
--- a/src/lib-http/http-server-private.h
+++ b/src/lib-http/http-server-private.h
@@ -58,16 +58,16 @@ struct http_server_response {
 	http_server_tunnel_callback_t tunnel_callback;
 	void *tunnel_context;
 
-	unsigned int have_hdr_connection:1;
-	unsigned int have_hdr_date:1;
-	unsigned int have_hdr_body_spec:1;
-
-	unsigned int payload_chunked:1;
-	unsigned int payload_blocking:1;
-	unsigned int payload_direct:1;
-	unsigned int payload_corked:1;
-	unsigned int close:1;
-	unsigned int submitted:1;
+	bool have_hdr_connection:1;
+	bool have_hdr_date:1;
+	bool have_hdr_body_spec:1;
+
+	bool payload_chunked:1;
+	bool payload_blocking:1;
+	bool payload_direct:1;
+	bool payload_corked:1;
+	bool close:1;
+	bool submitted:1;
 };
 
 struct http_server_request {
@@ -90,11 +90,11 @@ struct http_server_request {
 	void (*destroy_callback)(void *);
 	void *destroy_context;
 
-	unsigned int payload_halted:1;
-	unsigned int sent_100_continue:1;
-	unsigned int delay_destroy:1;
-	unsigned int destroy_pending:1;
-	unsigned int failed:1;
+	bool payload_halted:1;
+	bool sent_100_continue:1;
+	bool delay_destroy:1;
+	bool destroy_pending:1;
+	bool failed:1;
 };
 
 struct http_server_connection {
@@ -121,13 +121,13 @@ struct http_server_connection {
 
 	struct http_server_stats stats;
 
-	unsigned int ssl:1;
-	unsigned int closed:1;
-	unsigned int close_indicated:1;
-	unsigned int input_broken:1;
-	unsigned int output_locked:1;
-	unsigned int in_req_callback:1;  /* performing request callback (busy) */
-	unsigned int switching_ioloop:1; /* in the middle of switching ioloop */
+	bool ssl:1;
+	bool closed:1;
+	bool close_indicated:1;
+	bool input_broken:1;
+	bool output_locked:1;
+	bool in_req_callback:1;  /* performing request callback (busy) */
+	bool switching_ioloop:1; /* in the middle of switching ioloop */
 };
 
 struct http_server {
@@ -140,7 +140,7 @@ struct http_server {
 
 	struct connection_list *conn_list;
 
-	unsigned int shutting_down:1;    /* shutting down server */
+	bool shutting_down:1;    /* shutting down server */
 };
 
 static inline const char *
diff --git a/src/lib-http/http-transfer-chunked.c b/src/lib-http/http-transfer-chunked.c
index ac738749ea..b092a89211 100644
--- a/src/lib-http/http-transfer-chunked.c
+++ b/src/lib-http/http-transfer-chunked.c
@@ -47,7 +47,7 @@ struct http_transfer_chunked_istream {
 
 	struct http_header_parser *header_parser;
 
-	unsigned int finished:1;
+	bool finished:1;
 };
 
 /* Chunk parser */
@@ -533,7 +533,7 @@ struct http_transfer_chunked_ostream {
 
 	size_t chunk_size, chunk_pos;
 
-	unsigned int chunk_active:1;
+	bool chunk_active:1;
 };
 
 static size_t _log16(size_t in)
diff --git a/src/lib-http/http-url.c b/src/lib-http/http-url.c
index df7a209ba6..ffac19d7df 100644
--- a/src/lib-http/http-url.c
+++ b/src/lib-http/http-url.c
@@ -23,8 +23,8 @@ struct http_url_parser {
 
 	enum http_request_target_format req_format;
 
- 	unsigned int relative:1;
-	unsigned int request_target:1;
+ 	bool relative:1;
+	bool request_target:1;
 };
 
 static bool http_url_parse_authority(struct http_url_parser *url_parser)
diff --git a/src/lib-http/http-url.h b/src/lib-http/http-url.h
index 6d3863ac15..4472fe3ae0 100644
--- a/src/lib-http/http-url.h
+++ b/src/lib-http/http-url.h
@@ -24,7 +24,7 @@ struct http_url {
 	/* #fragment (still encoded) */
 	const char *enc_fragment;
 
-	unsigned int have_ssl:1;
+	bool have_ssl:1;
 };
 
 /*
diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c
index b4f90bc80b..a6bc16eea3 100644
--- a/src/lib-imap-client/imapc-connection.c
+++ b/src/lib-imap-client/imapc-connection.c
@@ -57,11 +57,11 @@ struct imapc_command {
 	void *context;
 
 	/* This is the AUTHENTICATE command */
-	unsigned int authenticate:1;
+	bool authenticate:1;
 	/* This is the IDLE command */
-	unsigned int idle:1;
+	bool idle:1;
 	/* Waiting for '+' literal reply before we can continue */
-	unsigned int wait_for_literal:1;
+	bool wait_for_literal:1;
 };
 ARRAY_DEFINE_TYPE(imapc_command, struct imapc_command *);
 
@@ -125,10 +125,10 @@ struct imapc_connection {
 	struct timeval throttle_end_timeval;
 	struct timeout *to_throttle, *to_throttle_shrink;
 
-	unsigned int reconnecting:1;
-	unsigned int idling:1;
-	unsigned int idle_stopping:1;
-	unsigned int idle_plus_waiting:1;
+	bool reconnecting:1;
+	bool idling:1;
+	bool idle_stopping:1;
+	bool idle_plus_waiting:1;
 };
 
 static void imapc_connection_capability_cb(const struct imapc_command_reply *reply,
diff --git a/src/lib-imap-storage/imap-metadata.c b/src/lib-imap-storage/imap-metadata.c
index 15330f9b36..3bd3642b79 100644
--- a/src/lib-imap-storage/imap-metadata.c
+++ b/src/lib-imap-storage/imap-metadata.c
@@ -12,7 +12,7 @@ struct imap_metadata_transaction {
 	enum mail_error error;
 	char *error_string;
 
-	unsigned int server:1;
+	bool server:1;
 };
 
 bool imap_metadata_verify_entry_name(const char *name, const char **error_r)
diff --git a/src/lib-imap-storage/imap-msgpart-url.c b/src/lib-imap-storage/imap-msgpart-url.c
index 5afb15c38e..9d2ccf4e44 100644
--- a/src/lib-imap-storage/imap-msgpart-url.c
+++ b/src/lib-imap-storage/imap-msgpart-url.c
@@ -27,7 +27,7 @@ struct imap_msgpart_url {
 	
 	struct imap_msgpart_open_result result;
 
-	unsigned int decode_cte_to_binary:1;
+	bool decode_cte_to_binary:1;
 };
 
 int imap_msgpart_url_create(struct mail_user *user, const struct imap_url *url,
diff --git a/src/lib-imap-storage/imap-msgpart.c b/src/lib-imap-storage/imap-msgpart.c
index 0e8428ccb8..08f78254ce 100644
--- a/src/lib-imap-storage/imap-msgpart.c
+++ b/src/lib-imap-storage/imap-msgpart.c
@@ -44,7 +44,7 @@ struct imap_msgpart {
 	/* which part of the message part to fetch (default: 0..(uoff_t)-1) */
 	uoff_t partial_offset, partial_size;
 
-	unsigned int decode_cte_to_binary:1;
+	bool decode_cte_to_binary:1;
 };
 
 struct imap_msgpart_open_ctx {
diff --git a/src/lib-imap-urlauth/imap-urlauth-connection.c b/src/lib-imap-urlauth/imap-urlauth-connection.c
index 6ab16e9700..d350998838 100644
--- a/src/lib-imap-urlauth/imap-urlauth-connection.c
+++ b/src/lib-imap-urlauth/imap-urlauth-connection.c
@@ -79,7 +79,7 @@ struct imap_urlauth_connection {
 	/* userid => target struct */
 	struct imap_urlauth_target *targets_head, *targets_tail;
 
-	unsigned int reading_literal:1;
+	bool reading_literal:1;
 };
 
 #define IMAP_URLAUTH_RECONNECT_MIN_SECS 2
diff --git a/src/lib-imap-urlauth/imap-urlauth-fetch.c b/src/lib-imap-urlauth/imap-urlauth-fetch.c
index c72cbfcbdc..736be82c17 100644
--- a/src/lib-imap-urlauth/imap-urlauth-fetch.c
+++ b/src/lib-imap-urlauth/imap-urlauth-fetch.c
@@ -44,13 +44,13 @@ struct imap_urlauth_fetch {
 		char *bodypartstruct;
 		char *error;
 
-		unsigned int succeeded:1;
-		unsigned int binary_has_nuls:1;
+		bool succeeded:1;
+		bool binary_has_nuls:1;
 	} pending_reply;
 
-	unsigned int failed:1;
-	unsigned int waiting_local:1;
-	unsigned int waiting_service:1;
+	bool failed:1;
+	bool waiting_local:1;
+	bool waiting_service:1;
 };
 
 static void imap_urlauth_fetch_abort_local(struct imap_urlauth_fetch *ufetch)
diff --git a/src/lib-imap-urlauth/imap-urlauth-fetch.h b/src/lib-imap-urlauth/imap-urlauth-fetch.h
index 116a477fcf..628a95ec2c 100644
--- a/src/lib-imap-urlauth/imap-urlauth-fetch.h
+++ b/src/lib-imap-urlauth/imap-urlauth-fetch.h
@@ -26,8 +26,8 @@ struct imap_urlauth_fetch_reply {
 	const char *bodypartstruct;
 	const char *error;
 
-	unsigned int succeeded:1;
-	unsigned int binary_has_nuls:1;
+	bool succeeded:1;
+	bool binary_has_nuls:1;
 };
 
 /* Callback to handle fetch reply. Returns 1 if handled completely and ready
diff --git a/src/lib-imap-urlauth/imap-urlauth-private.h b/src/lib-imap-urlauth/imap-urlauth-private.h
index 4e392c5489..3dcf798e9e 100644
--- a/src/lib-imap-urlauth/imap-urlauth-private.h
+++ b/src/lib-imap-urlauth/imap-urlauth-private.h
@@ -13,7 +13,7 @@ struct imap_urlauth_context {
 	char *access_user;
 	const char **access_applications;
 
-	unsigned int access_anonymous:1;
+	bool access_anonymous:1;
 };
 
 #endif
diff --git a/src/lib-imap/imap-arg.h b/src/lib-imap/imap-arg.h
index 870d4ccf82..d55ee154f0 100644
--- a/src/lib-imap/imap-arg.h
+++ b/src/lib-imap/imap-arg.h
@@ -57,7 +57,7 @@ struct imap_arg {
 		uoff_t literal_size;
 		ARRAY_TYPE(imap_arg_list) list;
 	} _data;
-	unsigned int literal8:1; /* BINARY literal8 used */
+	bool literal8:1; /* BINARY literal8 used */
 };
 
 /* RFC 3501's astring type. Note that this doesn't return TRUE for
diff --git a/src/lib-imap/imap-parser.c b/src/lib-imap/imap-parser.c
index a901cb2fb9..8715e310ee 100644
--- a/src/lib-imap/imap-parser.c
+++ b/src/lib-imap/imap-parser.c
@@ -57,14 +57,14 @@ struct imap_parser {
 	enum imap_parser_error error;
 	const char *error_msg;
 
-	unsigned int literal_minus:1;
-	unsigned int literal_skip_crlf:1;
-	unsigned int literal_nonsync:1;
-	unsigned int literal8:1;
-	unsigned int literal_size_return:1;
-	unsigned int eol:1;
-	unsigned int args_added_extra_eol:1;
-	unsigned int fatal_error:1;
+	bool literal_minus:1;
+	bool literal_skip_crlf:1;
+	bool literal_nonsync:1;
+	bool literal8:1;
+	bool literal_size_return:1;
+	bool eol:1;
+	bool args_added_extra_eol:1;
+	bool fatal_error:1;
 };
 
 struct imap_parser *
diff --git a/src/lib-imap/imap-url.c b/src/lib-imap/imap-url.c
index 6ce2318e05..344cecd441 100644
--- a/src/lib-imap/imap-url.c
+++ b/src/lib-imap/imap-url.c
@@ -121,7 +121,7 @@ struct imap_url_parser {
 	struct imap_url *url;
 	const struct imap_url *base;
 
-	unsigned int relative:1;
+	bool relative:1;
 };
 
 static int
diff --git a/src/lib-imap/imap-url.h b/src/lib-imap/imap-url.h
index d62bc7b9fe..9f0b2aa6d4 100644
--- a/src/lib-imap/imap-url.h
+++ b/src/lib-imap/imap-url.h
@@ -34,7 +34,7 @@ struct imap_url {
 	size_t uauth_token_size;
 	time_t uauth_expire; /* (time_t)-1 if not set */
 
-	unsigned int have_partial:1;
+	bool have_partial:1;
 };
 
 /*
diff --git a/src/lib-index/mail-cache-private.h b/src/lib-index/mail-cache-private.h
index 22576cbf54..cfa74af646 100644
--- a/src/lib-index/mail-cache-private.h
+++ b/src/lib-index/mail-cache-private.h
@@ -99,9 +99,9 @@ struct mail_cache_field_private {
 	uint32_t uid_highwater;
 
 	/* Unused fields aren't written to cache file */
-	unsigned int used:1;
-	unsigned int adding:1;
-	unsigned int decision_dirty:1;
+	bool used:1;
+	bool adding:1;
+	bool decision_dirty:1;
 };
 
 struct mail_cache {
@@ -152,13 +152,13 @@ struct mail_cache {
 	unsigned int *file_field_map;
 	unsigned int file_fields_count;
 
-	unsigned int opened:1;
-	unsigned int locked:1;
-	unsigned int last_lock_failed:1;
-	unsigned int hdr_modified:1;
-	unsigned int field_header_write_pending:1;
-	unsigned int compressing:1;
-	unsigned int map_with_read:1;
+	bool opened:1;
+	bool locked:1;
+	bool last_lock_failed:1;
+	bool hdr_modified:1;
+	bool field_header_write_pending:1;
+	bool compressing:1;
+	bool map_with_read:1;
 };
 
 struct mail_cache_loop_track {
@@ -183,7 +183,7 @@ struct mail_cache_view {
 	uint8_t cached_exists_value;
 	uint32_t cached_exists_seq;
 
-	unsigned int no_decision_updates:1;
+	bool no_decision_updates:1;
 };
 
 struct mail_cache_iterate_field {
@@ -204,10 +204,10 @@ struct mail_cache_lookup_iterate_ctx {
 
 	unsigned int trans_next_idx;
 
-	unsigned int stop:1;
-	unsigned int failed:1;
-	unsigned int memory_appends_checked:1;
-	unsigned int disk_appends_checked:1;
+	bool stop:1;
+	bool failed:1;
+	bool memory_appends_checked:1;
+	bool disk_appends_checked:1;
 };
 
 /* Explicitly lock the cache file. Returns -1 if error / timed out,
diff --git a/src/lib-index/mail-cache-transaction.c b/src/lib-index/mail-cache-transaction.c
index bbd7e9bcb9..75eb0f4c1c 100644
--- a/src/lib-index/mail-cache-transaction.c
+++ b/src/lib-index/mail-cache-transaction.c
@@ -44,8 +44,8 @@ struct mail_cache_transaction_ctx {
 
 	unsigned int records_written;
 
-	unsigned int tried_compression:1;
-	unsigned int changes:1;
+	bool tried_compression:1;
+	bool changes:1;
 };
 
 static MODULE_CONTEXT_DEFINE_INIT(cache_mail_index_transaction_module,
diff --git a/src/lib-index/mail-index-private.h b/src/lib-index/mail-index-private.h
index 6cfd83db75..b2e219bb55 100644
--- a/src/lib-index/mail-index-private.h
+++ b/src/lib-index/mail-index-private.h
@@ -114,7 +114,7 @@ struct mail_index_registered_ext {
 	mail_index_expunge_handler_t *expunge_handler;
 
 	void *expunge_context;
-	unsigned int expunge_handler_call_always:1;
+	bool expunge_handler_call_always:1;
 };
 
 struct mail_index_record_map {
@@ -215,21 +215,21 @@ struct mail_index {
 	ARRAY(union mail_index_module_context *) module_contexts;
 
 	char *error;
-	unsigned int nodiskspace:1;
-	unsigned int index_lock_timeout:1;
-
-	unsigned int index_delete_requested:1; /* next sync sets it deleted */
-	unsigned int index_deleted:1; /* no changes allowed anymore */
-	unsigned int log_sync_locked:1;
-	unsigned int readonly:1;
-	unsigned int mapping:1;
-	unsigned int syncing:1;
-	unsigned int need_recreate:1;
-	unsigned int index_min_write:1;
-	unsigned int modseqs_enabled:1;
-	unsigned int initial_create:1;
-	unsigned int initial_mapped:1;
-	unsigned int fscked:1;
+	bool nodiskspace:1;
+	bool index_lock_timeout:1;
+
+	bool index_delete_requested:1; /* next sync sets it deleted */
+	bool index_deleted:1; /* no changes allowed anymore */
+	bool log_sync_locked:1;
+	bool readonly:1;
+	bool mapping:1;
+	bool syncing:1;
+	bool need_recreate:1;
+	bool index_min_write:1;
+	bool modseqs_enabled:1;
+	bool initial_create:1;
+	bool initial_mapped:1;
+	bool fscked:1;
 };
 
 extern struct mail_index_module_register mail_index_module_register;
diff --git a/src/lib-index/mail-index-strmap.c b/src/lib-index/mail-index-strmap.c
index 4382d75a93..672aba9ee1 100644
--- a/src/lib-index/mail-index-strmap.c
+++ b/src/lib-index/mail-index-strmap.c
@@ -48,7 +48,7 @@ struct mail_index_strmap_view {
 	uint32_t next_str_idx;
 	uint32_t lost_expunged_uid;
 
-	unsigned int desynced:1;
+	bool desynced:1;
 };
 
 struct mail_index_strmap_read_context {
@@ -65,7 +65,7 @@ struct mail_index_strmap_read_context {
 	uint32_t next_ref_index;
 	unsigned int rec_size;
 
-	unsigned int too_large_uids:1;
+	bool too_large_uids:1;
 };
 
 struct mail_index_strmap_view_sync {
diff --git a/src/lib-index/mail-index-sync-private.h b/src/lib-index/mail-index-sync-private.h
index 5ef8293208..efce109fdf 100644
--- a/src/lib-index/mail-index-sync-private.h
+++ b/src/lib-index/mail-index-sync-private.h
@@ -13,7 +13,7 @@ struct mail_index_sync_list {
 	const ARRAY_TYPE(uid_range) *array;
 	unsigned int idx;
 	unsigned int keyword_idx:31;
-	unsigned int keyword_remove:1;
+	bool keyword_remove:1;
 };
 
 struct mail_index_expunge_handler {
@@ -37,12 +37,12 @@ struct mail_index_sync_map_ctx {
 
         enum mail_index_sync_handler_type type;
 
-	unsigned int sync_handlers_initialized:1;
-	unsigned int expunge_handlers_set:1;
-	unsigned int expunge_handlers_used:1;
-	unsigned int cur_ext_ignore:1;
-	unsigned int internal_update:1; /* used by keywords for ext_intro */
-	unsigned int errors:1;
+	bool sync_handlers_initialized:1;
+	bool expunge_handlers_set:1;
+	bool expunge_handlers_used:1;
+	bool cur_ext_ignore:1;
+	bool internal_update:1; /* used by keywords for ext_intro */
+	bool errors:1;
 };
 
 extern struct mail_transaction_map_functions mail_index_map_sync_funcs;
diff --git a/src/lib-index/mail-index-sync.c b/src/lib-index/mail-index-sync.c
index 34a9c78c6b..a7a2662610 100644
--- a/src/lib-index/mail-index-sync.c
+++ b/src/lib-index/mail-index-sync.c
@@ -24,8 +24,8 @@ struct mail_index_sync_ctx {
 	ARRAY(struct mail_index_sync_list) sync_list;
 	uint32_t next_uid;
 
-	unsigned int no_warning:1;
-	unsigned int seen_nonexternal_transactions:1;
+	bool no_warning:1;
+	bool seen_nonexternal_transactions:1;
 };
 
 static void mail_index_sync_add_expunge(struct mail_index_sync_ctx *ctx)
diff --git a/src/lib-index/mail-index-transaction-private.h b/src/lib-index/mail-index-transaction-private.h
index 8b51e7f655..664c850f78 100644
--- a/src/lib-index/mail-index-transaction-private.h
+++ b/src/lib-index/mail-index-transaction-private.h
@@ -81,25 +81,25 @@ struct mail_index_transaction {
 	/* Module-specific contexts. */
 	ARRAY(union mail_index_transaction_module_context *) module_contexts;
 
-	unsigned int no_appends:1;
-
-	unsigned int sync_transaction:1;
-	unsigned int appends_nonsorted:1;
-	unsigned int expunges_nonsorted:1;
-	unsigned int drop_unnecessary_flag_updates:1;
-	unsigned int pre_hdr_changed:1;
-	unsigned int post_hdr_changed:1;
-	unsigned int reset:1;
-	unsigned int index_deleted:1;
-	unsigned int index_undeleted:1;
-	unsigned int commit_deleted_index:1;
-	unsigned int tail_offset_changed:1;
+	bool no_appends:1;
+
+	bool sync_transaction:1;
+	bool appends_nonsorted:1;
+	bool expunges_nonsorted:1;
+	bool drop_unnecessary_flag_updates:1;
+	bool pre_hdr_changed:1;
+	bool post_hdr_changed:1;
+	bool reset:1;
+	bool index_deleted:1;
+	bool index_undeleted:1;
+	bool commit_deleted_index:1;
+	bool tail_offset_changed:1;
 	/* non-extension updates. flag updates don't change this because
 	   they may be added and removed, so be sure to check that the updates
 	   array is non-empty also. */
-	unsigned int log_updates:1;
+	bool log_updates:1;
 	/* extension updates */
-	unsigned int log_ext_updates:1;
+	bool log_ext_updates:1;
 };
 
 #define MAIL_INDEX_TRANSACTION_HAS_CHANGES(t) \
diff --git a/src/lib-index/mail-index-view-private.h b/src/lib-index/mail-index-view-private.h
index 3c323fde81..e291fae1a5 100644
--- a/src/lib-index/mail-index-view-private.h
+++ b/src/lib-index/mail-index-view-private.h
@@ -73,11 +73,11 @@ struct mail_index_view {
 	struct mail_index_transaction *transactions_list;
 	int transactions;
 
-	unsigned int inconsistent:1;
+	bool inconsistent:1;
 	/* this view was created by mail_index_sync_begin() */
-	unsigned int index_sync_view:1;
+	bool index_sync_view:1;
 	/* this view is being synced */
-	unsigned int syncing:1;
+	bool syncing:1;
 };
 
 struct mail_index_view *
diff --git a/src/lib-index/mail-index-view-sync.c b/src/lib-index/mail-index-view-sync.c
index d7c664ef3b..57214a2054 100644
--- a/src/lib-index/mail-index-view-sync.c
+++ b/src/lib-index/mail-index-view-sync.c
@@ -32,12 +32,12 @@ struct mail_index_view_sync_ctx {
 	unsigned int lost_flag_idx;
 
 	size_t data_offset;
-	unsigned int failed:1;
-	unsigned int sync_map_update:1;
-	unsigned int skipped_expunges:1;
-	unsigned int last_read:1;
-	unsigned int log_was_lost:1;
-	unsigned int hidden:1;
+	bool failed:1;
+	bool sync_map_update:1;
+	bool skipped_expunges:1;
+	bool last_read:1;
+	bool log_was_lost:1;
+	bool hidden:1;
 };
 
 static int
diff --git a/src/lib-index/mail-index.h b/src/lib-index/mail-index.h
index bf4620db0e..12ae8adf14 100644
--- a/src/lib-index/mail-index.h
+++ b/src/lib-index/mail-index.h
@@ -208,7 +208,7 @@ struct mail_index_view_sync_rec {
 	enum mail_index_view_sync_type type;
 
 	/* TRUE if this was a hidden transaction. */
-	unsigned int hidden:1;
+	bool hidden:1;
 };
 
 struct mail_index_transaction_commit_result {
diff --git a/src/lib-index/mail-transaction-log-private.h b/src/lib-index/mail-transaction-log-private.h
index a0e0c8c988..769b8f1d65 100644
--- a/src/lib-index/mail-transaction-log-private.h
+++ b/src/lib-index/mail-transaction-log-private.h
@@ -76,9 +76,9 @@ struct mail_transaction_log_file {
 	struct file_lock *file_lock;
 	time_t lock_created;
 
-	unsigned int locked:1;
-	unsigned int locked_sync_offset_updated:1;
-	unsigned int corrupted:1;
+	bool locked:1;
+	bool locked_sync_offset_updated:1;
+	bool corrupted:1;
 };
 
 struct mail_transaction_log {
@@ -97,8 +97,8 @@ struct mail_transaction_log {
 	unsigned int dotlock_count;
 	struct dotlock *dotlock;
 
-	unsigned int nfs_flush:1;
-	unsigned int log_2_unlink_checked:1;
+	bool nfs_flush:1;
+	bool log_2_unlink_checked:1;
 };
 
 void
diff --git a/src/lib-index/mail-transaction-log-view-private.h b/src/lib-index/mail-transaction-log-view-private.h
index b35d25adce..e739609903 100644
--- a/src/lib-index/mail-transaction-log-view-private.h
+++ b/src/lib-index/mail-transaction-log-view-private.h
@@ -27,7 +27,7 @@ struct mail_transaction_log_view {
 	uoff_t mark_offset, mark_next_offset;
 	uint64_t mark_modseq;
 
-	unsigned int broken:1;
+	bool broken:1;
 };
 
 #endif
diff --git a/src/lib-index/mail-transaction-log.h b/src/lib-index/mail-transaction-log.h
index f1e997309b..b12bb6fceb 100644
--- a/src/lib-index/mail-transaction-log.h
+++ b/src/lib-index/mail-transaction-log.h
@@ -177,11 +177,11 @@ struct mail_transaction_log_append_ctx {
 	unsigned int transaction_count;
 
 	/* same as mail_index_transaction->sync_transaction */
-	unsigned int index_sync_transaction:1;
+	bool index_sync_transaction:1;
 	/* same as mail_index_transaction->tail_offset_changed */
-	unsigned int tail_offset_changed:1;
-	unsigned int sync_includes_this:1;
-	unsigned int want_fsync:1;
+	bool tail_offset_changed:1;
+	bool sync_includes_this:1;
+	bool want_fsync:1;
 };
 
 #define LOG_IS_BEFORE(seq1, offset1, seq2, offset2) \
diff --git a/src/lib-lda/duplicate.c b/src/lib-lda/duplicate.c
index 66751112f0..bc806ba668 100644
--- a/src/lib-lda/duplicate.c
+++ b/src/lib-lda/duplicate.c
@@ -44,7 +44,7 @@ struct duplicate_file {
 
 	int new_fd;
 	struct dotlock *dotlock;
-	unsigned int changed:1;
+	bool changed:1;
 };
 
 struct duplicate_context {
diff --git a/src/lib-lda/lmtp-client.c b/src/lib-lda/lmtp-client.c
index 5b882cac90..5cf53fa3c8 100644
--- a/src/lib-lda/lmtp-client.c
+++ b/src/lib-lda/lmtp-client.c
@@ -33,8 +33,8 @@ struct lmtp_rcpt {
 
 	struct lmtp_recipient_params params;
 
-	unsigned int data_called:1;
-	unsigned int failed:1;
+	bool data_called:1;
+	bool failed:1;
 };
 
 struct lmtp_client {
@@ -73,12 +73,12 @@ struct lmtp_client {
 	unsigned char output_last;
 	struct lmtp_client_times times;
 
-	unsigned int running:1;
-	unsigned int xclient_sent:1;
-	unsigned int rcpt_to_successes:1;
-	unsigned int output_finished:1;
-	unsigned int finish_called:1;
-	unsigned int global_remote_failure:1;
+	bool running:1;
+	bool xclient_sent:1;
+	bool rcpt_to_successes:1;
+	bool output_finished:1;
+	bool finish_called:1;
+	bool global_remote_failure:1;
 };
 
 static void lmtp_client_send_rcpts(struct lmtp_client *client);
diff --git a/src/lib-mail/istream-binary-converter.c b/src/lib-mail/istream-binary-converter.c
index 978380d2a5..66b0684a6d 100644
--- a/src/lib-mail/istream-binary-converter.c
+++ b/src/lib-mail/istream-binary-converter.c
@@ -24,7 +24,7 @@ struct binary_converter_istream {
 
 	buffer_t *hdr_buf;
 	unsigned int cte_header_len;
-	unsigned int content_type_seen:1;
+	bool content_type_seen:1;
 };
 
 static void stream_add_data(struct binary_converter_istream *bstream,
diff --git a/src/lib-mail/istream-dot.c b/src/lib-mail/istream-dot.c
index 096f18af53..7341d3003a 100644
--- a/src/lib-mail/istream-dot.c
+++ b/src/lib-mail/istream-dot.c
@@ -12,13 +12,13 @@ struct dot_istream {
 	/* how far in string "\r\n.\r" are we */
 	unsigned int state;
 	/* state didn't actually start with \r */
-	unsigned int state_no_cr:1;
+	bool state_no_cr:1;
 	/* state didn't contain \n either (only at the beginnign of stream) */
-	unsigned int state_no_lf:1;
+	bool state_no_lf:1;
 	/* we've seen the "." line, keep returning EOF */
-	unsigned int dot_eof:1;
+	bool dot_eof:1;
 
-	unsigned int send_last_lf:1;
+	bool send_last_lf:1;
 };
 
 static int i_stream_dot_read_some(struct dot_istream *dstream)
diff --git a/src/lib-mail/istream-header-filter.c b/src/lib-mail/istream-header-filter.c
index 7d30d64cf4..168102c20b 100644
--- a/src/lib-mail/istream-header-filter.c
+++ b/src/lib-mail/istream-header-filter.c
@@ -27,22 +27,22 @@ struct header_filter_istream {
 	unsigned int cur_line, parsed_lines;
 	ARRAY(unsigned int) match_change_lines;
 
-	unsigned int header_read:1;
-	unsigned int seen_eoh:1;
-	unsigned int header_parsed:1;
-	unsigned int headers_edited:1;
-	unsigned int exclude:1;
-	unsigned int crlf:1;
-	unsigned int crlf_preserve:1;
-	unsigned int hide_body:1;
-	unsigned int add_missing_eoh:1;
-	unsigned int end_body_with_lf:1;
-	unsigned int last_lf_added:1;
-	unsigned int last_orig_crlf:1;
-	unsigned int last_added_newline:1;
-	unsigned int eoh_not_matched:1;
-	unsigned int callbacks_called:1;
-	unsigned int prev_matched:1;
+	bool header_read:1;
+	bool seen_eoh:1;
+	bool header_parsed:1;
+	bool headers_edited:1;
+	bool exclude:1;
+	bool crlf:1;
+	bool crlf_preserve:1;
+	bool hide_body:1;
+	bool add_missing_eoh:1;
+	bool end_body_with_lf:1;
+	bool last_lf_added:1;
+	bool last_orig_crlf:1;
+	bool last_added_newline:1;
+	bool eoh_not_matched:1;
+	bool callbacks_called:1;
+	bool prev_matched:1;
 };
 
 header_filter_callback *null_header_filter_callback = NULL;
diff --git a/src/lib-mail/message-decoder.c b/src/lib-mail/message-decoder.c
index 4402f63f05..a2185c805b 100644
--- a/src/lib-mail/message-decoder.c
+++ b/src/lib-mail/message-decoder.c
@@ -35,7 +35,7 @@ struct message_decoder_context {
 	char *content_type, *content_charset;
 	enum message_cte message_cte;
 
-	unsigned int binary_input:1;
+	bool binary_input:1;
 };
 
 static void
diff --git a/src/lib-mail/message-header-decode.c b/src/lib-mail/message-header-decode.c
index 381cea4830..7d11154207 100644
--- a/src/lib-mail/message-header-decode.c
+++ b/src/lib-mail/message-header-decode.c
@@ -138,7 +138,7 @@ void message_header_decode(const unsigned char *data, size_t size,
 struct decode_utf8_context {
 	buffer_t *dest;
 	normalizer_func_t *normalizer;
-	unsigned int changed:1;
+	bool changed:1;
 };
 
 static bool
diff --git a/src/lib-mail/message-header-parser.c b/src/lib-mail/message-header-parser.c
index 665a55f7bb..ecaa43b4bd 100644
--- a/src/lib-mail/message-header-parser.c
+++ b/src/lib-mail/message-header-parser.c
@@ -17,8 +17,8 @@ struct message_header_parser_ctx {
 	buffer_t *value_buf;
 
 	enum message_header_parser_flags flags;
-	unsigned int skip_line:1;
-	unsigned int has_nuls:1;
+	bool skip_line:1;
+	bool has_nuls:1;
 };
 
 struct message_header_parser_ctx *
diff --git a/src/lib-mail/message-header-parser.h b/src/lib-mail/message-header-parser.h
index b234026a00..d6863524aa 100644
--- a/src/lib-mail/message-header-parser.h
+++ b/src/lib-mail/message-header-parser.h
@@ -31,12 +31,12 @@ struct message_header_line {
 
 	uoff_t name_offset, full_value_offset;
 
-	unsigned int continues:1; /* multiline header, continues in next line */
-	unsigned int continued:1; /* multiline header, continues */
-	unsigned int eoh:1; /* "end of headers" line */
-	unsigned int no_newline:1; /* no \n after this line */
-	unsigned int crlf_newline:1; /* newline was \r\n */
-	unsigned int use_full_value:1; /* set if you want full_value */
+	bool continues:1; /* multiline header, continues in next line */
+	bool continued:1; /* multiline header, continues */
+	bool eoh:1; /* "end of headers" line */
+	bool no_newline:1; /* no \n after this line */
+	bool crlf_newline:1; /* newline was \r\n */
+	bool use_full_value:1; /* set if you want full_value */
 };
 
 /* called once with hdr = NULL at the end of headers */
diff --git a/src/lib-mail/message-parser.c b/src/lib-mail/message-parser.c
index fa2a7da022..3ce3af2be4 100644
--- a/src/lib-mail/message-parser.c
+++ b/src/lib-mail/message-parser.c
@@ -19,7 +19,7 @@ struct message_boundary {
 	const char *boundary;
 	size_t len;
 
-	unsigned int epilogue_found:1;
+	bool epilogue_found:1;
 };
 
 struct message_parser_ctx {
@@ -44,10 +44,10 @@ struct message_parser_ctx {
 	int (*parse_next_block)(struct message_parser_ctx *ctx,
 				struct message_block *block_r);
 
-	unsigned int part_seen_content_type:1;
-	unsigned int multipart:1;
-	unsigned int preparsed:1;
-	unsigned int eof:1;
+	bool part_seen_content_type:1;
+	bool multipart:1;
+	bool preparsed:1;
+	bool eof:1;
 };
 
 message_part_header_callback_t *null_message_part_header_callback = NULL;
diff --git a/src/lib-mail/message-search.c b/src/lib-mail/message-search.c
index 001f884820..60cc32dc9c 100644
--- a/src/lib-mail/message-search.c
+++ b/src/lib-mail/message-search.c
@@ -18,7 +18,7 @@ struct message_search_context {
 	struct message_part *prev_part;
 
 	struct message_decoder_context *decoder;
-	unsigned int content_type_text:1; /* text/any or message/any */
+	bool content_type_text:1; /* text/any or message/any */
 };
 
 struct message_search_context *
diff --git a/src/lib-master/ipc-server.c b/src/lib-master/ipc-server.c
index e25b9ea92b..cc892f0995 100644
--- a/src/lib-master/ipc-server.c
+++ b/src/lib-master/ipc-server.c
@@ -33,7 +33,7 @@ struct ipc_server {
 	struct istream *input;
 	struct ostream *output;
 
-	unsigned int version_received:1;
+	bool version_received:1;
 };
 
 static void ipc_server_disconnect(struct ipc_server *server);
diff --git a/src/lib-master/master-instance.c b/src/lib-master/master-instance.c
index de16d61de3..c39e7693c1 100644
--- a/src/lib-master/master-instance.c
+++ b/src/lib-master/master-instance.c
@@ -19,8 +19,8 @@ struct master_instance_list {
 
 	ARRAY(struct master_instance) instances;
 
-	unsigned int locked:1;
-	unsigned int config_paths_changed:1;
+	bool locked:1;
+	bool config_paths_changed:1;
 };
 
 struct master_instance_list_iter {
diff --git a/src/lib-master/master-login-auth.c b/src/lib-master/master-login-auth.c
index a643e4b494..8b40803aac 100644
--- a/src/lib-master/master-login-auth.c
+++ b/src/lib-master/master-login-auth.c
@@ -32,7 +32,7 @@ struct master_login_auth_request {
 	master_login_auth_request_callback_t *callback;
 	void *context;
 
-	unsigned int aborted:1;
+	bool aborted:1;
 };
 
 struct master_login_auth {
@@ -53,9 +53,9 @@ struct master_login_auth {
 
 	pid_t auth_server_pid;
 
-	unsigned int request_auth_token:1;
-	unsigned int version_received:1;
-	unsigned int spid_received:1;
+	bool request_auth_token:1;
+	bool version_received:1;
+	bool spid_received:1;
 };
 
 static void master_login_auth_set_timeout(struct master_login_auth *auth);
diff --git a/src/lib-master/master-login.c b/src/lib-master/master-login.c
index 658972563f..e08aa7270d 100644
--- a/src/lib-master/master-login.c
+++ b/src/lib-master/master-login.c
@@ -29,7 +29,7 @@ struct master_login_connection {
 	struct io *io;
 	struct ostream *output;
 
-	unsigned int login_success:1;
+	bool login_success:1;
 };
 
 struct master_login_postlogin {
@@ -51,7 +51,7 @@ struct master_login {
 	char *postlogin_socket_path;
 	unsigned int postlogin_timeout_secs;
 
-	unsigned int stopping:1;
+	bool stopping:1;
 };
 
 static void master_login_conn_close(struct master_login_connection *conn);
diff --git a/src/lib-master/master-login.h b/src/lib-master/master-login.h
index 1b9014a4a3..89e80cba5f 100644
--- a/src/lib-master/master-login.h
+++ b/src/lib-master/master-login.h
@@ -29,7 +29,7 @@ struct master_login_settings {
 	master_login_callback_t *callback;
 	master_login_failure_callback_t *failure_callback;
 
-	unsigned int request_auth_token:1;
+	bool request_auth_token:1;
 };
 
 struct master_login *
diff --git a/src/lib-master/master-service-private.h b/src/lib-master/master-service-private.h
index 7c9a820f1e..bb56568136 100644
--- a/src/lib-master/master-service-private.h
+++ b/src/lib-master/master-service-private.h
@@ -70,17 +70,17 @@ struct master_service {
 
 	struct master_service_haproxy_conn *haproxy_conns;
 
-	unsigned int killed:1;
-	unsigned int stopping:1;
-	unsigned int keep_environment:1;
-	unsigned int log_directly:1;
-	unsigned int initial_status_sent:1;
-	unsigned int die_with_master:1;
-	unsigned int call_avail_overflow:1;
-	unsigned int config_path_changed_with_param:1;
-	unsigned int want_ssl_settings:1;
-	unsigned int ssl_ctx_initialized:1;
-	unsigned int config_path_from_master:1;
+	bool killed:1;
+	bool stopping:1;
+	bool keep_environment:1;
+	bool log_directly:1;
+	bool initial_status_sent:1;
+	bool die_with_master:1;
+	bool call_avail_overflow:1;
+	bool config_path_changed_with_param:1;
+	bool want_ssl_settings:1;
+	bool ssl_ctx_initialized:1;
+	bool config_path_from_master:1;
 };
 
 void master_service_io_listeners_add(struct master_service *service);
diff --git a/src/lib-master/master-service-settings-cache.c b/src/lib-master/master-service-settings-cache.c
index e3be9da507..0d590db5fd 100644
--- a/src/lib-master/master-service-settings-cache.c
+++ b/src/lib-master/master-service-settings-cache.c
@@ -47,9 +47,9 @@ struct master_service_settings_cache {
 	   (doesn't count memory used by hash table or global sets) */
 	size_t cache_malloc_size;
 
-	unsigned int done_initial_lookup:1;
-	unsigned int service_uses_local:1;
-	unsigned int service_uses_remote:1;
+	bool done_initial_lookup:1;
+	bool service_uses_local:1;
+	bool service_uses_remote:1;
 };
 
 struct master_service_settings_cache *
diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h
index 3820740bb3..b1210eda99 100644
--- a/src/lib-master/master-service-settings.h
+++ b/src/lib-master/master-service-settings.h
@@ -49,16 +49,16 @@ struct master_service_settings_output {
 	/* some settings for this service (or if service was not given,
 	   all services) contain local/remote ip/host specific settings
 	   (but this lookup didn't necessarily return any of them). */
-	unsigned int service_uses_local:1;
-	unsigned int service_uses_remote:1;
+	bool service_uses_local:1;
+	bool service_uses_remote:1;
 	/* returned settings contain settings specific to given
 	   local/remote ip/host */
-	unsigned int used_local:1;
-	unsigned int used_remote:1;
+	bool used_local:1;
+	bool used_remote:1;
 	/* Config couldn't be read because we don't have enough permissions.
 	   The process probably should be restarted and the settings read
 	   before dropping privileges. */
-	unsigned int permission_denied:1;
+	bool permission_denied:1;
 };
 
 extern const struct setting_parser_info master_service_setting_parser_info;
diff --git a/src/lib-master/master-service.h b/src/lib-master/master-service.h
index c08b2d7255..21ab957a3e 100644
--- a/src/lib-master/master-service.h
+++ b/src/lib-master/master-service.h
@@ -46,10 +46,10 @@ struct master_service_connection {
 	struct ip_addr real_remote_ip, real_local_ip;
 	in_port_t real_remote_port, real_local_port;
 
-	unsigned int fifo:1;
-	unsigned int ssl:1;
+	bool fifo:1;
+	bool ssl:1;
 
-	unsigned int accepted:1;
+	bool accepted:1;
 };
 
 typedef void
diff --git a/src/lib-master/service-settings.h b/src/lib-master/service-settings.h
index c128334c58..da9986b533 100644
--- a/src/lib-master/service-settings.h
+++ b/src/lib-master/service-settings.h
@@ -66,12 +66,12 @@ struct service_settings {
 	struct master_settings *master_set;
 	enum service_type parsed_type;
 	enum service_user_default user_default;
-	unsigned int login_dump_core:1;
+	bool login_dump_core:1;
 
 	/* -- flags that can be set internally -- */
 
 	/* process_limit must not be higher than 1 */
-	unsigned int process_limit_1:1;
+	bool process_limit_1:1;
 };
 ARRAY_DEFINE_TYPE(service_settings, struct service_settings *);
 
diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index 565629d539..ad44d766bb 100644
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -101,8 +101,8 @@ struct cassandra_result {
 	sql_query_callback_t *callback;
 	void *context;
 
-	unsigned int query_sent:1;
-	unsigned int finished:1;
+	bool query_sent:1;
+	bool finished:1;
 };
 
 struct cassandra_transaction_context {
@@ -115,9 +115,9 @@ struct cassandra_transaction_context {
 	pool_t query_pool;
 	char *error;
 
-	unsigned int begin_succeeded:1;
-	unsigned int begin_failed:1;
-	unsigned int failed:1;
+	bool begin_succeeded:1;
+	bool begin_failed:1;
+	bool failed:1;
 };
 
 extern const struct sql_db driver_cassandra_db;
diff --git a/src/lib-sql/driver-mysql.c b/src/lib-sql/driver-mysql.c
index 7d9a30d740..21e0f83d70 100644
--- a/src/lib-sql/driver-mysql.c
+++ b/src/lib-sql/driver-mysql.c
@@ -42,7 +42,7 @@ struct mysql_db {
 	MYSQL *mysql;
 	unsigned int next_query_connection;
 
-	unsigned int ssl_set:1;
+	bool ssl_set:1;
 };
 
 struct mysql_result {
@@ -63,7 +63,7 @@ struct mysql_transaction_context {
 	pool_t query_pool;
 	const char *error;
 
-	unsigned int failed:1;
+	bool failed:1;
 };
 
 extern const struct sql_db driver_mysql_db;
diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c
index dc13f8a93e..abf62f0a40 100644
--- a/src/lib-sql/driver-pgsql.c
+++ b/src/lib-sql/driver-pgsql.c
@@ -35,7 +35,7 @@ struct pgsql_db {
 	char *error;
 	const char *connect_state;
 
-	unsigned int fatal_error:1;
+	bool fatal_error:1;
 };
 
 struct pgsql_binary_value {
@@ -58,7 +58,7 @@ struct pgsql_result {
 	sql_query_callback_t *callback;
 	void *context;
 
-	unsigned int timeout:1;
+	bool timeout:1;
 };
 
 struct pgsql_transaction_context {
@@ -71,7 +71,7 @@ struct pgsql_transaction_context {
 	pool_t query_pool;
 	const char *error;
 
-	unsigned int failed:1;
+	bool failed:1;
 };
 
 extern const struct sql_db driver_pgsql_db;
diff --git a/src/lib-sql/driver-sqlite.c b/src/lib-sql/driver-sqlite.c
index de8ac1eddd..a3e16314e1 100644
--- a/src/lib-sql/driver-sqlite.c
+++ b/src/lib-sql/driver-sqlite.c
@@ -18,7 +18,7 @@ struct sqlite_db {
 	pool_t pool;
 	const char *dbfile;
 	sqlite3 *sqlite;
-	unsigned int connected:1;
+	bool connected:1;
 	int rc;
 };
 
@@ -31,7 +31,7 @@ struct sqlite_result {
 
 struct sqlite_transaction_context {
 	struct sql_transaction_context ctx;
-	unsigned int failed:1;
+	bool failed:1;
 };
 
 extern const struct sql_db driver_sqlite_db;
diff --git a/src/lib-sql/sql-api-private.h b/src/lib-sql/sql-api-private.h
index ea47f5cba4..95e64c17cd 100644
--- a/src/lib-sql/sql-api-private.h
+++ b/src/lib-sql/sql-api-private.h
@@ -100,7 +100,7 @@ struct sql_db {
 	unsigned int connect_failure_count;
 	struct timeout *to_reconnect;
 
-	unsigned int no_reconnect:1;
+	bool no_reconnect:1;
 };
 
 struct sql_result_vfuncs {
@@ -142,9 +142,9 @@ struct sql_result {
 	void *fetch_dest;
 	size_t fetch_dest_size;
 
-	unsigned int failed:1;
-	unsigned int failed_try_retry:1;
-	unsigned int callback:1;
+	bool failed:1;
+	bool failed_try_retry:1;
+	bool callback:1;
 };
 
 struct sql_transaction_context {
diff --git a/src/lib-ssl-iostream/iostream-openssl.h b/src/lib-ssl-iostream/iostream-openssl.h
index bbadca0627..07f830cc24 100644
--- a/src/lib-ssl-iostream/iostream-openssl.h
+++ b/src/lib-ssl-iostream/iostream-openssl.h
@@ -14,7 +14,7 @@ struct ssl_iostream_context {
 	DH *dh_512, *dh_default;
 	int username_nid;
 
-	unsigned int client_ctx:1;
+	bool client_ctx:1;
 };
 
 struct ssl_iostream {
@@ -42,14 +42,14 @@ struct ssl_iostream {
 	ssl_iostream_handshake_callback_t *handshake_callback;
 	void *handshake_context;
 
-	unsigned int handshaked:1;
-	unsigned int handshake_failed:1;
-	unsigned int cert_received:1;
-	unsigned int cert_broken:1;
-	unsigned int want_read:1;
-	unsigned int input_handler:1;
-	unsigned int ostream_flush_waiting_input:1;
-	unsigned int closed:1;
+	bool handshaked:1;
+	bool handshake_failed:1;
+	bool cert_received:1;
+	bool cert_broken:1;
+	bool want_read:1;
+	bool input_handler:1;
+	bool ostream_flush_waiting_input:1;
+	bool closed:1;
 };
 
 extern int dovecot_ssl_extdata_index;
diff --git a/src/lib-storage/index/cydir/cydir-save.c b/src/lib-storage/index/cydir/cydir-save.c
index 67aaa06bc5..dd5e5ce6c2 100644
--- a/src/lib-storage/index/cydir/cydir-save.c
+++ b/src/lib-storage/index/cydir/cydir-save.c
@@ -31,8 +31,8 @@ struct cydir_save_context {
 	struct mail *mail;
 	int fd;
 
-	unsigned int failed:1;
-	unsigned int finished:1;
+	bool failed:1;
+	bool finished:1;
 };
 
 static char *cydir_generate_tmp_filename(void)
diff --git a/src/lib-storage/index/dbox-common/dbox-file.h b/src/lib-storage/index/dbox-common/dbox-file.h
index 107bff3d2b..309c7056bf 100644
--- a/src/lib-storage/index/dbox-common/dbox-file.h
+++ b/src/lib-storage/index/dbox-common/dbox-file.h
@@ -120,8 +120,8 @@ struct dbox_file {
 	ARRAY(const char *) metadata;
 	uoff_t metadata_read_offset;
 
-	unsigned int appending:1;
-	unsigned int corrupted:1;
+	bool appending:1;
+	bool corrupted:1;
 };
 
 struct dbox_file_append_context {
diff --git a/src/lib-storage/index/dbox-common/dbox-save.h b/src/lib-storage/index/dbox-common/dbox-save.h
index 7b16d1c87a..c822f13f88 100644
--- a/src/lib-storage/index/dbox-common/dbox-save.h
+++ b/src/lib-storage/index/dbox-common/dbox-save.h
@@ -14,10 +14,10 @@ struct dbox_save_context {
 
 	struct ostream *dbox_output;
 
-	unsigned int failed:1;
-	unsigned int finished:1;
-	unsigned int have_pop3_uidls:1;
-	unsigned int have_pop3_orders:1;
+	bool failed:1;
+	bool finished:1;
+	bool have_pop3_uidls:1;
+	bool have_pop3_orders:1;
 };
 
 void dbox_save_begin(struct dbox_save_context *ctx, struct istream *input);
diff --git a/src/lib-storage/index/dbox-multi/mdbox-map-private.h b/src/lib-storage/index/dbox-multi/mdbox-map-private.h
index 261c236ac9..259d854844 100644
--- a/src/lib-storage/index/dbox-multi/mdbox-map-private.h
+++ b/src/lib-storage/index/dbox-multi/mdbox-map-private.h
@@ -21,7 +21,7 @@ struct mdbox_map {
 
 	struct mailbox_list *root_list;
 
-	unsigned int verify_existing_file_ids:1;
+	bool verify_existing_file_ids:1;
 };
 
 struct mdbox_map_append {
@@ -42,7 +42,7 @@ struct mdbox_map_append_context {
 
 	unsigned int files_nonappendable_count;
 
-	unsigned int failed:1;
+	bool failed:1;
 };
 
 struct mdbox_map_atomic_context {
@@ -51,10 +51,10 @@ struct mdbox_map_atomic_context {
 	struct mail_index_sync_ctx *sync_ctx;
 	struct mail_index_view *sync_view;
 
-	unsigned int map_refreshed:1;
-	unsigned int locked:1;
-	unsigned int success:1;
-	unsigned int failed:1;
+	bool map_refreshed:1;
+	bool locked:1;
+	bool success:1;
+	bool failed:1;
 };
 
 int mdbox_map_view_lookup_rec(struct mdbox_map *map,
diff --git a/src/lib-storage/index/dbox-multi/mdbox-map.c b/src/lib-storage/index/dbox-multi/mdbox-map.c
index 5bc6548bf7..91a70e2ac2 100644
--- a/src/lib-storage/index/dbox-multi/mdbox-map.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-map.c
@@ -24,8 +24,8 @@ struct mdbox_map_transaction_context {
 	struct mdbox_map_atomic_context *atomic;
 	struct mail_index_transaction *trans;
 
-	unsigned int changed:1;
-	unsigned int committed:1;
+	bool changed:1;
+	bool committed:1;
 };
 
 static int mdbox_map_generate_uid_validity(struct mdbox_map *map);
diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
index 5cf75e719d..4eece4f933 100644
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
@@ -32,7 +32,7 @@ struct mdbox_rebuild_msg {
 	uint32_t map_uid;
 
 	uint16_t refcount;
-	unsigned int seen_zero_ref_in_map:1;
+	bool seen_zero_ref_in_map:1;
 };
 
 struct rebuild_msg_mailbox {
@@ -60,8 +60,8 @@ struct mdbox_storage_rebuild_context {
 
 	struct rebuild_msg_mailbox prev_msg;
 
-	unsigned int have_pop3_uidls:1;
-	unsigned int have_pop3_orders:1;
+	bool have_pop3_uidls:1;
+	bool have_pop3_orders:1;
 };
 
 static struct mdbox_storage_rebuild_context *
diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage.h b/src/lib-storage/index/dbox-multi/mdbox-storage.h
index b77da52ae0..b89b620a3f 100644
--- a/src/lib-storage/index/dbox-multi/mdbox-storage.h
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage.h
@@ -40,9 +40,9 @@ struct mdbox_storage {
 	   has changed from this value) */
 	uint32_t corrupted_rebuild_count;
 
-	unsigned int corrupted:1;
-	unsigned int rebuilding_storage:1;
-	unsigned int preallocate_space:1;
+	bool corrupted:1;
+	bool rebuilding_storage:1;
+	bool preallocate_space:1;
 };
 
 struct mdbox_mail_index_record {
@@ -59,8 +59,8 @@ struct mdbox_mailbox {
 	uint32_t map_uid_validity;
 	uint32_t ext_id, hdr_ext_id, guid_ext_id;
 
-	unsigned int mdbox_deleted_synced:1;
-	unsigned int creating:1;
+	bool mdbox_deleted_synced:1;
+	bool creating:1;
 };
 
 extern struct dbox_storage_vfuncs mdbox_dbox_storage_vfuncs;
diff --git a/src/lib-storage/index/imapc/imapc-list.h b/src/lib-storage/index/imapc/imapc-list.h
index 8e4eee6da7..84bdbe112c 100644
--- a/src/lib-storage/index/imapc/imapc-list.h
+++ b/src/lib-storage/index/imapc/imapc-list.h
@@ -22,15 +22,15 @@ struct imapc_mailbox_list {
 
 	/* mailboxes/subscriptions are fully refreshed only during
 	   mailbox list iteration. */
-	unsigned int refreshed_subscriptions:1;
-	unsigned int refreshed_mailboxes:1;
+	bool refreshed_subscriptions:1;
+	bool refreshed_mailboxes:1;
 	/* mailbox list's "recently refreshed" state is reset by syncing a
 	   mailbox. mainly we use this to cache mailboxes' existence to avoid
 	   issuing a LIST command every time. */
-	unsigned int refreshed_mailboxes_recently:1;
-	unsigned int index_list_failed:1;
-	unsigned int root_sep_pending:1;
-	unsigned int root_sep_lookup_failed:1;
+	bool refreshed_mailboxes_recently:1;
+	bool index_list_failed:1;
+	bool root_sep_pending:1;
+	bool root_sep_lookup_failed:1;
 };
 
 int imapc_list_get_mailbox_flags(struct mailbox_list *list, const char *name,
diff --git a/src/lib-storage/index/imapc/imapc-save.c b/src/lib-storage/index/imapc/imapc-save.c
index da463d98c1..2d82c5a7c3 100644
--- a/src/lib-storage/index/imapc/imapc-save.c
+++ b/src/lib-storage/index/imapc/imapc-save.c
@@ -29,8 +29,8 @@ struct imapc_save_context {
 	ARRAY_TYPE(seq_range) dest_saved_uids;
 	unsigned int save_count;
 
-	unsigned int failed:1;
-	unsigned int finished:1;
+	bool failed:1;
+	bool finished:1;
 };
 
 struct imapc_save_cmd_context {
diff --git a/src/lib-storage/index/imapc/imapc-storage.h b/src/lib-storage/index/imapc/imapc-storage.h
index f2f89aeaa0..921923bc2b 100644
--- a/src/lib-storage/index/imapc/imapc-storage.h
+++ b/src/lib-storage/index/imapc/imapc-storage.h
@@ -51,8 +51,8 @@ struct imapc_storage_client {
 
 	ARRAY(struct imapc_storage_event_callback) untagged_callbacks;
 
-	unsigned int auth_failed:1;
-	unsigned int destroying:1;
+	bool auth_failed:1;
+	bool destroying:1;
 };
 
 struct imapc_storage {
@@ -68,7 +68,7 @@ struct imapc_storage {
 
 	ARRAY(struct imapc_namespace) remote_namespaces;
 
-	unsigned int namespaces_requested:1;
+	bool namespaces_requested:1;
 };
 
 struct imapc_mail_cache {
@@ -130,11 +130,11 @@ struct imapc_mailbox {
 	const char *guid_fetch_field_name;
 	struct imapc_search_context *search_ctx;
 
-	unsigned int selecting:1;
-	unsigned int syncing:1;
-	unsigned int initial_sync_done:1;
-	unsigned int selected:1;
-	unsigned int exists_received:1;
+	bool selecting:1;
+	bool syncing:1;
+	bool initial_sync_done:1;
+	bool selected:1;
+	bool exists_received:1;
 };
 
 struct imapc_simple_context {
diff --git a/src/lib-storage/index/imapc/imapc-sync.h b/src/lib-storage/index/imapc/imapc-sync.h
index 72e9790bff..056ad48841 100644
--- a/src/lib-storage/index/imapc/imapc-sync.h
+++ b/src/lib-storage/index/imapc/imapc-sync.h
@@ -14,7 +14,7 @@ struct imapc_sync_context {
 	ARRAY_TYPE(seq_range) expunged_uids;
 	unsigned int sync_command_count;
 
-	unsigned int failed:1;
+	bool failed:1;
 };
 
 struct mailbox_sync_context *
diff --git a/src/lib-storage/index/index-mail.h b/src/lib-storage/index/index-mail.h
index 392420f652..e7b1ed6b65 100644
--- a/src/lib-storage/index/index-mail.h
+++ b/src/lib-storage/index/index-mail.h
@@ -108,27 +108,27 @@ struct index_mail_data {
 	ARRAY_TYPE(keywords) keywords;
 	ARRAY_TYPE(keyword_indexes) keyword_indexes;
 
-	unsigned int initialized:1;
-	unsigned int save_sent_date:1;
-	unsigned int sent_date_parsed:1;
-	unsigned int save_envelope:1;
-	unsigned int save_bodystructure_header:1;
-	unsigned int save_bodystructure_body:1;
-	unsigned int save_message_parts:1;
-	unsigned int save_body_snippet:1;
-	unsigned int stream_has_only_header:1;
-	unsigned int parsed_bodystructure:1;
-	unsigned int hdr_size_set:1;
-	unsigned int body_size_set:1;
-	unsigned int messageparts_saved_to_cache:1;
-	unsigned int header_parsed:1;
-	unsigned int no_caching:1;
-	unsigned int forced_no_caching:1;
-	unsigned int destroying_stream:1;
-	unsigned int initialized_wrapper_stream:1;
-	unsigned int destroy_callback_set:1;
-	unsigned int prefetch_sent:1;
-	unsigned int header_parser_initialized:1;
+	bool initialized:1;
+	bool save_sent_date:1;
+	bool sent_date_parsed:1;
+	bool save_envelope:1;
+	bool save_bodystructure_header:1;
+	bool save_bodystructure_body:1;
+	bool save_message_parts:1;
+	bool save_body_snippet:1;
+	bool stream_has_only_header:1;
+	bool parsed_bodystructure:1;
+	bool hdr_size_set:1;
+	bool body_size_set:1;
+	bool messageparts_saved_to_cache:1;
+	bool header_parsed:1;
+	bool no_caching:1;
+	bool forced_no_caching:1;
+	bool destroying_stream:1;
+	bool initialized_wrapper_stream:1;
+	bool destroy_callback_set:1;
+	bool prefetch_sent:1;
+	bool header_parser_initialized:1;
 };
 
 struct index_mail {
@@ -150,11 +150,11 @@ struct index_mail {
 	ARRAY(unsigned int) header_match_lines;
 	uint8_t header_match_value;
 
-	unsigned int pop3_state_set:1;
+	bool pop3_state_set:1;
 	/* mail created by mailbox_search_*() */
-	unsigned int search_mail:1;
+	bool search_mail:1;
 	/* close() is being called from mail_free() */
-	unsigned int freeing:1;
+	bool freeing:1;
 };
 
 struct mail *
diff --git a/src/lib-storage/index/index-rebuild.h b/src/lib-storage/index/index-rebuild.h
index 14914023fc..183da9de1f 100644
--- a/src/lib-storage/index/index-rebuild.h
+++ b/src/lib-storage/index/index-rebuild.h
@@ -14,7 +14,7 @@ struct index_rebuild_context {
 	struct mail_index *backup_index;
 	struct mail_index_view *backup_view;
 
-	unsigned int cache_used:1;
+	bool cache_used:1;
 };
 
 typedef unsigned int
diff --git a/src/lib-storage/index/index-search-private.h b/src/lib-storage/index/index-search-private.h
index 44999d1c5f..e08f382c7d 100644
--- a/src/lib-storage/index/index-search-private.h
+++ b/src/lib-storage/index/index-search-private.h
@@ -28,11 +28,11 @@ struct index_search_context {
 	struct timeval last_nonblock_timeval;
 	unsigned long long cost, next_time_check_cost;
 
-	unsigned int failed:1;
-	unsigned int sorted:1;
-	unsigned int have_seqsets:1;
-	unsigned int have_index_args:1;
-	unsigned int have_mailbox_args:1;
+	bool failed:1;
+	bool sorted:1;
+	bool have_seqsets:1;
+	bool have_index_args:1;
+	bool have_mailbox_args:1;
 };
 
 struct mail *index_search_get_mail(struct index_search_context *ctx);
diff --git a/src/lib-storage/index/index-search.c b/src/lib-storage/index/index-search.c
index 46d0f19857..38342ebe33 100644
--- a/src/lib-storage/index/index-search.c
+++ b/src/lib-storage/index/index-search.c
@@ -46,9 +46,9 @@ struct search_header_context {
 
         struct message_header_line *hdr;
 
-	unsigned int parse_headers:1;
-	unsigned int custom_header:1;
-	unsigned int threading:1;
+	bool parse_headers:1;
+	bool custom_header:1;
+	bool threading:1;
 };
 
 struct search_body_context {
diff --git a/src/lib-storage/index/index-sort-string.c b/src/lib-storage/index/index-sort-string.c
index 6c05743cde..4ed8b8c8e3 100644
--- a/src/lib-storage/index/index-sort-string.c
+++ b/src/lib-storage/index/index-sort-string.c
@@ -36,12 +36,12 @@ struct sort_string_context {
 	uint32_t ext_id, last_seq, highest_reset_id, prev_seq;
 	uint32_t lowest_nonexpunged_zero;
 
-	unsigned int regetting:1;
-	unsigned int have_all_wanted:1;
-	unsigned int no_writing:1;
-	unsigned int reverse:1;
-	unsigned int seqs_nonsorted:1;
-	unsigned int broken:1;
+	bool regetting:1;
+	bool have_all_wanted:1;
+	bool no_writing:1;
+	bool reverse:1;
+	bool seqs_nonsorted:1;
+	bool broken:1;
 };
 
 static char expunged_msg;
diff --git a/src/lib-storage/index/index-thread-finish.c b/src/lib-storage/index/index-thread-finish.c
index ed4b9992e8..bea7fd0a95 100644
--- a/src/lib-storage/index/index-thread-finish.c
+++ b/src/lib-storage/index/index-thread-finish.c
@@ -25,11 +25,11 @@ struct mail_thread_root_node {
 	uint32_t parent_root_idx1;
 
 	/* subject contained a Re: or Fwd: */
-	unsigned int reply_or_forward:1;
+	bool reply_or_forward:1;
 	/* a dummy node */
-	unsigned int dummy:1;
+	bool dummy:1;
 	/* ignore this node - it's a dummy without children */
-	unsigned int ignore:1;
+	bool ignore:1;
 };
 
 struct thread_finish_context {
@@ -42,8 +42,8 @@ struct thread_finish_context {
 	ARRAY(struct mail_thread_shadow_node) shadow_nodes;
 	unsigned int next_new_root_idx;
 
-	unsigned int use_sent_date:1;
-	unsigned int return_seqs:1;
+	bool use_sent_date:1;
+	bool return_seqs:1;
 };
 
 struct mail_thread_iterate_context {
diff --git a/src/lib-storage/index/index-thread-private.h b/src/lib-storage/index/index-thread-private.h
index 4f44319188..ed2837b7bb 100644
--- a/src/lib-storage/index/index-thread-private.h
+++ b/src/lib-storage/index/index-thread-private.h
@@ -35,10 +35,10 @@ struct mail_thread_node {
 	   from our parent. */
 	unsigned int parent_link_refcount:30;
 	/* If uid is expunged, rebuild the thread tree. */
-	unsigned int expunge_rebuilds:1;
+	bool expunge_rebuilds:1;
 	/* If a link between this node and its child gets unreferenced,
 	   rebuild the thread tree. */
-	unsigned int child_unref_rebuilds:1;
+	bool child_unref_rebuilds:1;
 };
 ARRAY_DEFINE_TYPE(mail_thread_node, struct mail_thread_node);
 #define MAIL_THREAD_NODE_EXISTS(node) \
diff --git a/src/lib-storage/index/index-thread.c b/src/lib-storage/index/index-thread.c
index 5824a16c26..1004260ba2 100644
--- a/src/lib-storage/index/index-thread.c
+++ b/src/lib-storage/index/index-thread.c
@@ -26,8 +26,8 @@ struct mail_thread_context {
 	struct mail_search_args *search_args;
 	ARRAY_TYPE(seq_range) added_uids;
 
-	unsigned int failed:1;
-	unsigned int corrupted:1;
+	bool failed:1;
+	bool corrupted:1;
 };
 
 struct mail_thread_mailbox {
diff --git a/src/lib-storage/index/istream-mail.c b/src/lib-storage/index/istream-mail.c
index 56e92ef2dc..5c6a73f3bb 100644
--- a/src/lib-storage/index/istream-mail.c
+++ b/src/lib-storage/index/istream-mail.c
@@ -11,8 +11,8 @@ struct mail_istream {
 
 	struct mail *mail;
 	uoff_t expected_size;
-	unsigned int files_read_increased:1;
-	unsigned int input_has_body:1;
+	bool files_read_increased:1;
+	bool input_has_body:1;
 };
 
 static bool i_stream_mail_try_get_cached_size(struct mail_istream *mstream)
diff --git a/src/lib-storage/index/maildir/maildir-copy.c b/src/lib-storage/index/maildir/maildir-copy.c
index 493708ebe9..7b0ae78462 100644
--- a/src/lib-storage/index/maildir/maildir-copy.c
+++ b/src/lib-storage/index/maildir/maildir-copy.c
@@ -17,7 +17,7 @@
 
 struct hardlink_ctx {
 	const char *dest_path;
-	unsigned int success:1;
+	bool success:1;
 };
 
 static int do_hardlink(struct maildir_mailbox *mbox, const char *path,
diff --git a/src/lib-storage/index/maildir/maildir-keywords.c b/src/lib-storage/index/maildir/maildir-keywords.c
index f29fa97292..50bd4b9bae 100644
--- a/src/lib-storage/index/maildir/maildir-keywords.c
+++ b/src/lib-storage/index/maildir/maildir-keywords.c
@@ -36,8 +36,8 @@ struct maildir_keywords {
         struct dotlock_settings dotlock_settings;
 
 	time_t synced_mtime;
-	unsigned int synced:1;
-	unsigned int changed:1;
+	bool synced:1;
+	bool changed:1;
 };
 
 struct maildir_keywords_sync_ctx {
diff --git a/src/lib-storage/index/maildir/maildir-save.c b/src/lib-storage/index/maildir/maildir-save.c
index c3ac128f6b..578e0fb709 100644
--- a/src/lib-storage/index/maildir/maildir-save.c
+++ b/src/lib-storage/index/maildir/maildir-save.c
@@ -34,7 +34,7 @@ struct maildir_filename {
 	uoff_t size, vsize;
 	enum mail_flags flags;
 	unsigned int pop3_order;
-	unsigned int preserve_filename:1;
+	bool preserve_filename:1;
 	unsigned int keywords_count;
 	/* unsigned int keywords[]; */
 };
@@ -61,12 +61,12 @@ struct maildir_save_context {
 	int fd;
 	uint32_t first_seq, seq, last_nonrecent_uid;
 
-	unsigned int have_keywords:1;
-	unsigned int have_preserved_filenames:1;
-	unsigned int locked:1;
-	unsigned int failed:1;
-	unsigned int last_save_finished:1;
-	unsigned int locked_uidlist_refresh:1;
+	bool have_keywords:1;
+	bool have_preserved_filenames:1;
+	bool locked:1;
+	bool failed:1;
+	bool last_save_finished:1;
+	bool locked_uidlist_refresh:1;
 };
 
 static int maildir_file_move(struct maildir_save_context *ctx,
diff --git a/src/lib-storage/index/maildir/maildir-storage.h b/src/lib-storage/index/maildir/maildir-storage.h
index 937c0d2ac2..de219aead3 100644
--- a/src/lib-storage/index/maildir/maildir-storage.h
+++ b/src/lib-storage/index/maildir/maildir-storage.h
@@ -84,12 +84,12 @@ struct maildir_mailbox {
 	uint32_t maildir_ext_id;
 	uint32_t maildir_list_index_ext_id;
 
-	unsigned int synced:1;
-	unsigned int syncing_commit:1;
-	unsigned int private_flags_mask_set:1;
-	unsigned int backend_readonly:1;
-	unsigned int backend_readonly_set:1;
-	unsigned int sync_uidlist_refreshed:1;
+	bool synced:1;
+	bool syncing_commit:1;
+	bool private_flags_mask_set:1;
+	bool backend_readonly:1;
+	bool backend_readonly_set:1;
+	bool sync_uidlist_refreshed:1;
 };
 
 extern struct mail_vfuncs maildir_mail_vfuncs;
diff --git a/src/lib-storage/index/maildir/maildir-sync.c b/src/lib-storage/index/maildir/maildir-sync.c
index 1b80e41638..fdd881b44b 100644
--- a/src/lib-storage/index/maildir/maildir-sync.c
+++ b/src/lib-storage/index/maildir/maildir-sync.c
@@ -226,9 +226,9 @@ struct maildir_sync_context {
 	struct maildir_uidlist_sync_ctx *uidlist_sync_ctx;
 	struct maildir_index_sync_context *index_sync_ctx;
 
-	unsigned int partial:1;
-	unsigned int locked:1;
-	unsigned int racing:1;
+	bool partial:1;
+	bool locked:1;
+	bool racing:1;
 };
 
 void maildir_sync_set_racing(struct maildir_sync_context *ctx)
diff --git a/src/lib-storage/index/maildir/maildir-uidlist.c b/src/lib-storage/index/maildir/maildir-uidlist.c
index c364bd6b6b..e29b925670 100644
--- a/src/lib-storage/index/maildir/maildir-uidlist.c
+++ b/src/lib-storage/index/maildir/maildir-uidlist.c
@@ -90,15 +90,15 @@ struct maildir_uidlist {
 
 	guid_128_t mailbox_guid;
 
-	unsigned int recreate:1;
-	unsigned int recreate_on_change:1;
-	unsigned int initial_read:1;
-	unsigned int initial_hdr_read:1;
-	unsigned int retry_rewind:1;
-	unsigned int locked_refresh:1;
-	unsigned int unsorted:1;
-	unsigned int have_mailbox_guid:1;
-	unsigned int opened_readonly:1;
+	bool recreate:1;
+	bool recreate_on_change:1;
+	bool initial_read:1;
+	bool initial_hdr_read:1;
+	bool retry_rewind:1;
+	bool locked_refresh:1;
+	bool unsorted:1;
+	bool have_mailbox_guid:1;
+	bool opened_readonly:1;
 };
 
 struct maildir_uidlist_sync_ctx {
@@ -113,11 +113,11 @@ struct maildir_uidlist_sync_ctx {
 	unsigned int new_files_count;
 	unsigned int finish_change_counter;
 
-	unsigned int partial:1;
-	unsigned int finished:1;
-	unsigned int changed:1;
-	unsigned int failed:1;
-	unsigned int locked:1;
+	bool partial:1;
+	bool finished:1;
+	bool changed:1;
+	bool failed:1;
+	bool locked:1;
 };
 
 struct maildir_uidlist_iter_ctx {
diff --git a/src/lib-storage/index/mbox/istream-raw-mbox.c b/src/lib-storage/index/mbox/istream-raw-mbox.c
index 43d0e40a4f..455f73daf4 100644
--- a/src/lib-storage/index/mbox/istream-raw-mbox.c
+++ b/src/lib-storage/index/mbox/istream-raw-mbox.c
@@ -15,13 +15,13 @@ struct raw_mbox_istream {
 	uoff_t from_offset, hdr_offset, body_offset, mail_size;
 	uoff_t input_peak_offset;
 
-	unsigned int locked:1;
-	unsigned int seeked:1;
-	unsigned int crlf_ending:1;
-	unsigned int corrupted:1;
-	unsigned int mail_size_forced:1;
-	unsigned int eof:1;
-	unsigned int header_missing_eoh:1;
+	bool locked:1;
+	bool seeked:1;
+	bool crlf_ending:1;
+	bool corrupted:1;
+	bool mail_size_forced:1;
+	bool eof:1;
+	bool header_missing_eoh:1;
 };
 
 static void i_stream_raw_mbox_destroy(struct iostream_private *stream)
diff --git a/src/lib-storage/index/mbox/mbox-save.c b/src/lib-storage/index/mbox/mbox-save.c
index 3724c68ffc..47bde17c32 100644
--- a/src/lib-storage/index/mbox/mbox-save.c
+++ b/src/lib-storage/index/mbox/mbox-save.c
@@ -52,9 +52,9 @@ struct mbox_save_context {
 	struct mbox_md5_context *mbox_md5_ctx;
 	char *x_delivery_id_header;
 
-	unsigned int synced:1;
-	unsigned int failed:1;
-	unsigned int finished:1;
+	bool synced:1;
+	bool failed:1;
+	bool finished:1;
 };
 
 static void write_error(struct mbox_save_context *ctx)
diff --git a/src/lib-storage/index/mbox/mbox-storage.h b/src/lib-storage/index/mbox/mbox-storage.h
index 2e69814cc4..b1be46744b 100644
--- a/src/lib-storage/index/mbox/mbox-storage.h
+++ b/src/lib-storage/index/mbox/mbox-storage.h
@@ -34,7 +34,7 @@ struct mbox_storage {
 	const struct mbox_settings *set;
 	enum mbox_lock_type *read_locks;
 	enum mbox_lock_type *write_locks;
-	unsigned int lock_settings_initialized:1;
+	bool lock_settings_initialized:1;
 };
 
 struct mbox_mailbox {
@@ -59,16 +59,16 @@ struct mbox_mailbox {
 
 	struct mbox_md5_vfuncs md5_v;
 
-	unsigned int no_mbox_file:1;
-	unsigned int invalid_mbox_file:1;
-	unsigned int mbox_broken_offsets:1;
-	unsigned int mbox_save_md5:1;
-	unsigned int mbox_dotlocked:1;
-	unsigned int mbox_used_privileges:1;
-	unsigned int mbox_privileged_locking:1;
-	unsigned int syncing:1;
-	unsigned int backend_readonly:1;
-	unsigned int backend_readonly_set:1;
+	bool no_mbox_file:1;
+	bool invalid_mbox_file:1;
+	bool mbox_broken_offsets:1;
+	bool mbox_save_md5:1;
+	bool mbox_dotlocked:1;
+	bool mbox_used_privileges:1;
+	bool mbox_privileged_locking:1;
+	bool syncing:1;
+	bool backend_readonly:1;
+	bool backend_readonly_set:1;
 };
 
 struct mbox_transaction_context {
diff --git a/src/lib-storage/index/mbox/mbox-sync-private.h b/src/lib-storage/index/mbox/mbox-sync-private.h
index 275afe9d7b..9d991acf01 100644
--- a/src/lib-storage/index/mbox/mbox-sync-private.h
+++ b/src/lib-storage/index/mbox/mbox-sync-private.h
@@ -49,11 +49,11 @@ struct mbox_sync_mail {
 	ARRAY_TYPE(keyword_indexes) keywords;
 	uint8_t flags;
 
-	unsigned int uid_broken:1;
-	unsigned int expunged:1;
-	unsigned int pseudo:1;
-	unsigned int status_broken:1;
-	unsigned int xstatus_broken:1;
+	bool uid_broken:1;
+	bool expunged:1;
+	bool pseudo:1;
+	bool status_broken:1;
+	bool xstatus_broken:1;
 
 	uoff_t from_offset;
 	uoff_t body_size;
@@ -89,14 +89,14 @@ struct mbox_sync_mail_context {
 	uint32_t parsed_uid, last_uid_updated_value;
 	unsigned int last_uid_value_start_pos;
 
-	unsigned int have_eoh:1;
-	unsigned int need_rewrite:1;
-	unsigned int seen_imapbase:1;
-	unsigned int updated:1;
-	unsigned int recent:1;
-	unsigned int dirty:1;
-	unsigned int imapbase_rewrite:1;
-	unsigned int imapbase_updated:1;
+	bool have_eoh:1;
+	bool need_rewrite:1;
+	bool seen_imapbase:1;
+	bool updated:1;
+	bool recent:1;
+	bool dirty:1;
+	bool imapbase_rewrite:1;
+	bool imapbase_updated:1;
 };
 
 struct mbox_sync_context {
@@ -136,18 +136,18 @@ struct mbox_sync_context {
 	uint32_t last_nonrecent_uid;
 	off_t expunged_space, space_diff;
 
-	unsigned int dest_first_mail:1;
-	unsigned int first_mail_crlf_expunged:1;
+	bool dest_first_mail:1;
+	bool first_mail_crlf_expunged:1;
 
 	/* global flags: */
-	unsigned int keep_recent:1;
-	unsigned int readonly:1;
-	unsigned int delay_writes:1;
-	unsigned int renumber_uids:1;
-	unsigned int moved_offsets:1;
-	unsigned int ext_modified:1;
-	unsigned int index_reset:1;
-	unsigned int errors:1;
+	bool keep_recent:1;
+	bool readonly:1;
+	bool delay_writes:1;
+	bool renumber_uids:1;
+	bool moved_offsets:1;
+	bool ext_modified:1;
+	bool index_reset:1;
+	bool errors:1;
 };
 
 int mbox_sync_header_refresh(struct mbox_mailbox *mbox);
diff --git a/src/lib-storage/index/pop3c/pop3c-client.c b/src/lib-storage/index/pop3c/pop3c-client.c
index e74fe22497..e11c24425b 100644
--- a/src/lib-storage/index/pop3c/pop3c-client.c
+++ b/src/lib-storage/index/pop3c/pop3c-client.c
@@ -79,7 +79,7 @@ struct pop3c_client {
 	const char *input_line;
 	struct istream *dot_input;
 
-	unsigned int running:1;
+	bool running:1;
 };
 
 static void
diff --git a/src/lib-storage/index/pop3c/pop3c-storage.h b/src/lib-storage/index/pop3c/pop3c-storage.h
index 8f0cbdd737..0cb3657fc4 100644
--- a/src/lib-storage/index/pop3c/pop3c-storage.h
+++ b/src/lib-storage/index/pop3c/pop3c-storage.h
@@ -26,15 +26,15 @@ struct pop3c_mailbox {
 	   the UID may not exist for the entire session */
 	uint32_t *msg_uids;
 
-	unsigned int logged_in:1;
+	bool logged_in:1;
 };
 
 struct pop3c_mail {
 	struct index_mail imail;
 	struct istream *prefetch_stream;
 
-	unsigned int prefetching:1;
-	unsigned int prefetching_body:1;
+	bool prefetching:1;
+	bool prefetching_body:1;
 };
 
 struct mail *
diff --git a/src/lib-storage/index/raw/raw-storage.h b/src/lib-storage/index/raw/raw-storage.h
index fddd998a91..b1384b8da1 100644
--- a/src/lib-storage/index/raw/raw-storage.h
+++ b/src/lib-storage/index/raw/raw-storage.h
@@ -18,8 +18,8 @@ struct raw_mailbox {
 	uoff_t size;
 	const char *envelope_sender;
 
-	unsigned int synced:1;
-	unsigned int have_filename:1;
+	bool synced:1;
+	bool have_filename:1;
 };
 
 extern struct mail_vfuncs raw_mail_vfuncs;
diff --git a/src/lib-storage/list/mailbox-list-fs-iter.c b/src/lib-storage/list/mailbox-list-fs-iter.c
index 9606db4dbf..57661e10b6 100644
--- a/src/lib-storage/list/mailbox-list-fs-iter.c
+++ b/src/lib-storage/list/mailbox-list-fs-iter.c
@@ -48,9 +48,9 @@ struct fs_list_iterate_context {
 	/* current directory we're handling */
 	struct list_dir_context *dir;
 
-	unsigned int inbox_found:1;
-	unsigned int inbox_has_children:1;
-	unsigned int list_inbox_inbox:1;
+	bool inbox_found:1;
+	bool inbox_has_children:1;
+	bool list_inbox_inbox:1;
 };
 
 static int
diff --git a/src/lib-storage/list/mailbox-list-index-notify.c b/src/lib-storage/list/mailbox-list-index-notify.c
index d19982142e..73b513e5a2 100644
--- a/src/lib-storage/list/mailbox-list-index-notify.c
+++ b/src/lib-storage/list/mailbox-list-index-notify.c
@@ -61,9 +61,9 @@ struct mailbox_list_notify_index {
 	char *list_log_path, *inbox_log_path;
 	struct stat list_last_st, inbox_last_st;
 
-	unsigned int initialized:1;
-	unsigned int read_failed:1;
-	unsigned int inbox_event_pending:1;
+	bool initialized:1;
+	bool read_failed:1;
+	bool inbox_event_pending:1;
 };
 
 int mailbox_list_index_notify_init(struct mailbox_list *list,
diff --git a/src/lib-storage/list/mailbox-list-index-sync.h b/src/lib-storage/list/mailbox-list-index-sync.h
index 8b5815486c..cb8972ecb5 100644
--- a/src/lib-storage/list/mailbox-list-index-sync.h
+++ b/src/lib-storage/list/mailbox-list-index-sync.h
@@ -14,7 +14,7 @@ struct mailbox_list_index_sync_context {
 	struct mail_index_view *view;
 	struct mail_index_transaction *trans;
 
-	unsigned int syncing_list:1;
+	bool syncing_list:1;
 };
 
 int mailbox_list_index_sync_begin(struct mailbox_list *list,
diff --git a/src/lib-storage/list/mailbox-list-index.h b/src/lib-storage/list/mailbox-list-index.h
index 6fe9ccd298..48a6610c88 100644
--- a/src/lib-storage/list/mailbox-list-index.h
+++ b/src/lib-storage/list/mailbox-list-index.h
@@ -107,12 +107,12 @@ struct mailbox_list_index {
 	HASH_TABLE(void *, struct mailbox_list_index_node *) mailbox_hash;
 	struct mailbox_list_index_node *mailbox_tree;
 
-	unsigned int pending_init:1;
-	unsigned int opened:1;
-	unsigned int syncing:1;
-	unsigned int updating_status:1;
-	unsigned int has_backing_store:1;
-	unsigned int index_last_check_changed:1;
+	bool pending_init:1;
+	bool opened:1;
+	bool syncing:1;
+	bool updating_status:1;
+	bool has_backing_store:1;
+	bool index_last_check_changed:1;
 };
 
 struct mailbox_list_index_iterate_context {
@@ -127,7 +127,7 @@ struct mailbox_list_index_iterate_context {
 	string_t *path;
 	struct mailbox_list_index_node *next_node;
 
-	unsigned int failed:1;
+	bool failed:1;
 };
 
 extern MODULE_CONTEXT_DEFINE(mailbox_list_index_module,
diff --git a/src/lib-storage/list/mailbox-list-iter.c b/src/lib-storage/list/mailbox-list-iter.c
index 2c1381b834..b01774d348 100644
--- a/src/lib-storage/list/mailbox-list-iter.c
+++ b/src/lib-storage/list/mailbox-list-iter.c
@@ -46,9 +46,9 @@ struct ns_list_iterate_context {
 	struct mailbox_info inbox_info;
 	const struct mailbox_info *pending_backend_info;
 
-	unsigned int cur_ns_prefix_sent:1;
-	unsigned int inbox_list:1;
-	unsigned int inbox_listed:1;
+	bool cur_ns_prefix_sent:1;
+	bool inbox_list:1;
+	bool inbox_listed:1;
 };
 
 static bool ns_match_next(struct ns_list_iterate_context *ctx, 
diff --git a/src/lib-storage/list/mailbox-list-none.c b/src/lib-storage/list/mailbox-list-none.c
index 610e0f7080..8db6f2a026 100644
--- a/src/lib-storage/list/mailbox-list-none.c
+++ b/src/lib-storage/list/mailbox-list-none.c
@@ -10,7 +10,7 @@
 struct noop_list_iterate_context {
 	struct mailbox_list_iterate_context ctx;
 	struct mailbox_info inbox_info;
-	unsigned int list_inbox:1;
+	bool list_inbox:1;
 };
 
 extern struct mailbox_list none_mailbox_list;
diff --git a/src/lib-storage/mail-namespace.h b/src/lib-storage/mail-namespace.h
index ce57a0f23a..ca2e2b3708 100644
--- a/src/lib-storage/mail-namespace.h
+++ b/src/lib-storage/mail-namespace.h
@@ -73,8 +73,8 @@ struct mail_namespace {
 	const struct mail_namespace_settings *set, *unexpanded_set;
 	const struct mail_storage_settings *mail_set;
 
-	unsigned int special_use_mailboxes:1;
-	unsigned int destroyed:1;
+	bool special_use_mailboxes:1;
+	bool destroyed:1;
 };
 
 int mail_namespaces_init(struct mail_user *user, const char **error_r);
diff --git a/src/lib-storage/mail-search-register.c b/src/lib-storage/mail-search-register.c
index 3e825e1387..baffe2d286 100644
--- a/src/lib-storage/mail-search-register.c
+++ b/src/lib-storage/mail-search-register.c
@@ -9,7 +9,7 @@ struct mail_search_register {
 	ARRAY(struct mail_search_register_arg) args;
 	mail_search_register_fallback_t *fallback;
 
-	unsigned int args_sorted:1;
+	bool args_sorted:1;
 };
 
 struct mail_search_register *mail_search_register_init(void)
diff --git a/src/lib-storage/mail-search.h b/src/lib-storage/mail-search.h
index e0a9fd0aa2..2e17891364 100644
--- a/src/lib-storage/mail-search.h
+++ b/src/lib-storage/mail-search.h
@@ -97,11 +97,11 @@ struct mail_search_arg {
 
         void *context;
 	const char *hdr_field_name; /* for SEARCH_HEADER* */
-	unsigned int match_not:1; /* result = !result */
-	unsigned int match_always:1; /* result = 1 always */
-	unsigned int nonmatch_always:1; /* result = 0 always */
-	unsigned int fuzzy:1; /* use fuzzy matching for this arg */
-	unsigned int no_fts:1; /* do NOT call FTS */
+	bool match_not:1; /* result = !result */
+	bool match_always:1; /* result = 1 always */
+	bool nonmatch_always:1; /* result = 0 always */
+	bool fuzzy:1; /* use fuzzy matching for this arg */
+	bool no_fts:1; /* do NOT call FTS */
 
 	int result; /* -1 = unknown, 0 = unmatched, 1 = matched */
 };
@@ -113,14 +113,14 @@ struct mail_search_args {
 	struct mailbox *box;
 	struct mail_search_arg *args;
 
-	unsigned int simplified:1;
-	unsigned int have_inthreads:1;
+	bool simplified:1;
+	bool have_inthreads:1;
 	/* Stop mail_search_next() when finding a non-matching mail.
 	   (Could be useful when wanting to find only the oldest mails.) */
-	unsigned int stop_on_nonmatch:1;
+	bool stop_on_nonmatch:1;
 	/* fts plugin has already expanded the search args - no need to do
 	   it again. */
-	unsigned int fts_expanded:1;
+	bool fts_expanded:1;
 };
 
 #define ARG_SET_RESULT(arg, res) \
diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index 0aad8f83f8..726fd7faf1 100644
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -142,7 +142,7 @@ struct mail_storage {
 	ARRAY(union mail_storage_module_context *) module_contexts;
 
 	/* Failed to create shared attribute dict, don't try again */
-	unsigned int shared_attr_dict_failed:1;
+	bool shared_attr_dict_failed:1;
 };
 
 struct mail_attachment_part {
@@ -371,40 +371,40 @@ struct mailbox {
 
 	/* When FAST open flag is used, the mailbox isn't actually opened until
 	   it's synced for the first time. */
-	unsigned int opened:1;
+	bool opened:1;
 	/* Mailbox was deleted while we had it open. */
-	unsigned int mailbox_deleted:1;
+	bool mailbox_deleted:1;
 	/* Mailbox is being created */
-	unsigned int creating:1;
+	bool creating:1;
 	/* Mailbox is being deleted */
-	unsigned int deleting:1;
+	bool deleting:1;
 	/* Don't use MAIL_INDEX_SYNC_FLAG_DELETING_INDEX for sync flag */
-	unsigned int delete_sync_check:1;
+	bool delete_sync_check:1;
 	/* Delete mailbox only if it's empty */
-	unsigned int deleting_must_be_empty:1;
+	bool deleting_must_be_empty:1;
 	/* The backend wants to skip checking if there are 0 messages before
 	   calling mailbox_list.delete_mailbox() */
-	unsigned int delete_skip_empty_check:1;
+	bool delete_skip_empty_check:1;
 	/* Mailbox was already marked as deleted within this allocation. */
-	unsigned int marked_deleted:1;
+	bool marked_deleted:1;
 	/* TRUE if this is an INBOX for this user */
-	unsigned int inbox_user:1;
+	bool inbox_user:1;
 	/* TRUE if this is an INBOX for this namespace (user or shared) */
-	unsigned int inbox_any:1;
+	bool inbox_any:1;
 	/* When copying to this mailbox, require that mailbox_copy() uses
 	   mailbox_save_*() to actually save a new physical copy rather than
 	   simply incrementing a reference count (e.g. via hard link) */
-	unsigned int disable_reflink_copy_to:1;
+	bool disable_reflink_copy_to:1;
 	/* Don't allow creating any new keywords */
-	unsigned int disallow_new_keywords:1;
+	bool disallow_new_keywords:1;
 	/* Mailbox has been synced at least once */
-	unsigned int synced:1;
+	bool synced:1;
 	/* Updating cache file is disabled */
-	unsigned int mail_cache_disabled:1;
+	bool mail_cache_disabled:1;
 	/* Update first_saved field to mailbox list index. */
-	unsigned int update_first_saved:1;
+	bool update_first_saved:1;
 	/* mailbox_verify_create_name() only checks for mailbox_verify_name() */
-	unsigned int skip_create_name_restrictions:1;
+	bool skip_create_name_restrictions:1;
 };
 
 struct mail_vfuncs {
@@ -561,11 +561,11 @@ struct mailbox_transaction_context {
 	/* these statistics are never reset by mail-storage API: */
 	struct mailbox_transaction_stats stats;
 	/* Set to TRUE to update stats_* fields */
-	unsigned int stats_track:1;
+	bool stats_track:1;
 	/* We've done some non-transactional (e.g. dovecot-uidlist updates) */
-	unsigned int nontransactional_changes:1;
+	bool nontransactional_changes:1;
 	/* FIXME: v2.3: this should be in attribute_get/set() parameters */
-	unsigned int internal_attribute:1;
+	bool internal_attribute:1;
 };
 
 union mail_search_module_context {
@@ -594,8 +594,8 @@ struct mail_search_context {
 
 	ARRAY(union mail_search_module_context *) module_contexts;
 
-	unsigned int seen_lost_data:1;
-	unsigned int progress_hidden:1;
+	bool seen_lost_data:1;
+	bool progress_hidden:1;
 };
 
 struct mail_save_data {
@@ -628,15 +628,15 @@ struct mail_save_context {
 
 	/* mailbox_save_alloc() called, but finish/cancel not.
 	   the same context is usually returned by the backends for reuse. */
-	unsigned int unfinished:1;
+	bool unfinished:1;
 	/* mailbox_save_finish() or mailbox_copy() is being called. */
-	unsigned int finishing:1;
+	bool finishing:1;
 	/* mail was copied using saving */
-	unsigned int copying_via_save:1;
+	bool copying_via_save:1;
 	/* mail is being saved, not copied */
-	unsigned int saving:1;
+	bool saving:1;
 	/* mail is being moved - ignore quota */
-	unsigned int moving:1;
+	bool moving:1;
 };
 
 struct mailbox_sync_context {
diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 47b8e89f1f..6ce5566f21 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -63,9 +63,9 @@ struct mail_storage_service_ctx {
 	pool_t userdb_next_pool;
 	const char *const **userdb_next_fieldsp;
 
-	unsigned int debug:1;
-	unsigned int log_initialized:1;
-	unsigned int config_permission_denied:1;
+	bool debug:1;
+	bool log_initialized:1;
+	bool config_permission_denied:1;
 };
 
 struct mail_storage_service_user {
@@ -84,8 +84,8 @@ struct mail_storage_service_user {
 
 	unsigned int session_id_counter;
 
-	unsigned int anonymous:1;
-	unsigned int admin:1;
+	bool anonymous:1;
+	bool admin:1;
 };
 
 struct module *mail_storage_service_modules = NULL;
diff --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h
index 2f8f1ef8ac..b6db2bcfdb 100644
--- a/src/lib-storage/mail-storage-service.h
+++ b/src/lib-storage/mail-storage-service.h
@@ -57,9 +57,9 @@ struct mail_storage_service_input {
 	enum mail_storage_service_flags flags_override_remove;
 
 	/* override MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP for this lookup */
-	unsigned int no_userdb_lookup:1;
+	bool no_userdb_lookup:1;
 	/* Enable auth_debug=yes for this lookup */
-	unsigned int debug:1;
+	bool debug:1;
 };
 
 extern struct module *mail_storage_service_modules;
diff --git a/src/lib-storage/mail-storage.h b/src/lib-storage/mail-storage.h
index 64804b4f33..b4b8cd43bc 100644
--- a/src/lib-storage/mail-storage.h
+++ b/src/lib-storage/mail-storage.h
@@ -252,21 +252,21 @@ struct mailbox_status {
 	enum mail_flags permanent_flags;
 
 	/* All keywords can be permanently modified (STATUS_PERMANENT_FLAGS) */
-	unsigned int permanent_keywords:1;
+	bool permanent_keywords:1;
 	/* More keywords can be created (STATUS_PERMANENT_FLAGS) */
-	unsigned int allow_new_keywords:1;
+	bool allow_new_keywords:1;
 	/* Modseqs aren't permanent (index is in memory) (STATUS_HIGHESTMODSEQ) */
-	unsigned int nonpermanent_modseqs:1;
+	bool nonpermanent_modseqs:1;
 	/* Modseq tracking has never been enabled for this mailbox
 	   yet. (STATUS_HIGHESTMODSEQ) */
-	unsigned int no_modseq_tracking:1;
+	bool no_modseq_tracking:1;
 
 	/* Messages have GUIDs (always set) */
-	unsigned int have_guids:1;
+	bool have_guids:1;
 	/* mailbox_save_set_guid() works (always set) */
-	unsigned int have_save_guids:1;
+	bool have_save_guids:1;
 	/* GUIDs are always 128bit (always set) */
-	unsigned int have_only_guid128:1;
+	bool have_only_guid128:1;
 };
 
 struct mailbox_cache_field {
@@ -338,7 +338,7 @@ struct mailbox_sync_rec {
 };
 struct mailbox_sync_status {
 	/* There are expunges that haven't been synced yet */
-	unsigned int sync_delayed_expunges:1;
+	bool sync_delayed_expunges:1;
 };
 
 struct mailbox_expunge_rec {
@@ -365,10 +365,10 @@ struct mail {
 	struct mailbox_transaction_context *transaction;
 	uint32_t seq, uid;
 
-	unsigned int expunged:1;
-	unsigned int saving:1; /* This mail is still being saved */
-	unsigned int has_nuls:1; /* message data is known to contain NULs */
-	unsigned int has_no_nuls:1; /* -''- known to not contain NULs */
+	bool expunged:1;
+	bool saving:1; /* This mail is still being saved */
+	bool has_nuls:1; /* message data is known to contain NULs */
+	bool has_no_nuls:1; /* -''- known to not contain NULs */
 
 	/* If the lookup is aborted, error is set to MAIL_ERROR_NOTPOSSIBLE */
 	enum mail_lookup_abort lookup_abort;
diff --git a/src/lib-storage/mail-user.h b/src/lib-storage/mail-user.h
index dfeadc4602..e280a823ef 100644
--- a/src/lib-storage/mail-user.h
+++ b/src/lib-storage/mail-user.h
@@ -59,38 +59,38 @@ struct mail_user {
 
 	/* User doesn't exist (as reported by userdb lookup when looking
 	   up home) */
-	unsigned int nonexistent:1;
+	bool nonexistent:1;
 	/* Either home is set or there is no home for the user. */
-	unsigned int home_looked_up:1;
+	bool home_looked_up:1;
 	/* User is anonymous */
-	unsigned int anonymous:1;
+	bool anonymous:1;
 	/* This is an autocreated user (e.g. for shared namespace or
 	   lda raw storage) */
-	unsigned int autocreated:1;
+	bool autocreated:1;
 	/* mail_user_init() has been called */
-	unsigned int initialized:1;
+	bool initialized:1;
 	/* SET_STR_VARS in user's all settings have been expanded.
 	   This happens near the beginning of the user initialization,
 	   so this is rarely needed to be checked. */
-	unsigned int settings_expanded:1;
+	bool settings_expanded:1;
 	/* Shortcut to mail_storage_settings.mail_debug */
-	unsigned int mail_debug:1;
+	bool mail_debug:1;
 	/* If INBOX can't be opened, log an error, but only once. */
-	unsigned int inbox_open_error_logged:1;
+	bool inbox_open_error_logged:1;
 	/* Fuzzy search works for this user (FTS enabled) */
-	unsigned int fuzzy_search:1;
+	bool fuzzy_search:1;
 	/* We're running dsync */
-	unsigned int dsyncing:1;
+	bool dsyncing:1;
 	/* Failed to create attribute dict, don't try again */
-	unsigned int attr_dict_failed:1;
+	bool attr_dict_failed:1;
 	/* We're deinitializing the user */
-	unsigned int deinitializing:1;
+	bool deinitializing:1;
 	/* Enable administrator user commands for the user */
-	unsigned int admin:1;
+	bool admin:1;
 	/* Enable all statistics gathering */
-	unsigned int stats_enabled:1;
+	bool stats_enabled:1;
 	/* Enable autoexpunging at deinit. */
-	unsigned int autoexpunge_enabled:1;
+	bool autoexpunge_enabled:1;
 };
 
 struct mail_user_module_register {
diff --git a/src/lib-storage/mailbox-list-private.h b/src/lib-storage/mailbox-list-private.h
index 30b61a82a6..f444acc609 100644
--- a/src/lib-storage/mailbox-list-private.h
+++ b/src/lib-storage/mailbox-list-private.h
@@ -132,9 +132,9 @@ struct mailbox_list {
 
 	ARRAY(union mailbox_list_module_context *) module_contexts;
 
-	unsigned int index_root_dir_created:1;
-	unsigned int guid_cache_updated:1;
-	unsigned int guid_cache_invalidated:1;
+	bool index_root_dir_created:1;
+	bool guid_cache_updated:1;
+	bool guid_cache_invalidated:1;
 };
 
 union mailbox_list_iterate_module_context {
@@ -161,8 +161,8 @@ struct mailbox_list_iter_update_context {
 	struct imap_match_glob *glob;
 	enum mailbox_info_flags leaf_flags, parent_flags;
 
-	unsigned int update_only:1;
-	unsigned int match_parents:1;
+	bool update_only:1;
+	bool match_parents:1;
 };
 
 /* Modules should use do "my_id = mailbox_list_module_id++" and
diff --git a/src/lib-storage/mailbox-search-result-private.h b/src/lib-storage/mailbox-search-result-private.h
index c05417888b..983ac3c73f 100644
--- a/src/lib-storage/mailbox-search-result-private.h
+++ b/src/lib-storage/mailbox-search-result-private.h
@@ -14,9 +14,9 @@ struct mail_search_result {
 	ARRAY_TYPE(seq_range) never_uids;
 	ARRAY_TYPE(seq_range) removed_uids, added_uids;
 
-	unsigned int args_have_flags:1;
-	unsigned int args_have_keywords:1;
-	unsigned int args_have_modseq:1;
+	bool args_have_flags:1;
+	bool args_have_keywords:1;
+	bool args_have_modseq:1;
 };
 
 struct mail_search_result *
diff --git a/src/lib-storage/mailbox-tree.c b/src/lib-storage/mailbox-tree.c
index d78d909a08..3afdcff718 100644
--- a/src/lib-storage/mailbox-tree.c
+++ b/src/lib-storage/mailbox-tree.c
@@ -25,7 +25,7 @@ struct mailbox_tree_iterate_context {
 	string_t *path_str;
 	size_t parent_pos;
 
-	unsigned int first_child:1;
+	bool first_child:1;
 };
 
 struct mailbox_tree_context *mailbox_tree_init(char separator)
diff --git a/src/lib/buffer.c b/src/lib/buffer.c
index 65025cb7fe..4bcd91261c 100644
--- a/src/lib/buffer.c
+++ b/src/lib/buffer.c
@@ -16,8 +16,8 @@ struct real_buffer {
 
 	pool_t pool;
 
-	unsigned int alloced:1;
-	unsigned int dynamic:1;
+	bool alloced:1;
+	bool dynamic:1;
 };
 typedef int buffer_check_sizes[COMPILE_ERROR_IF_TRUE(sizeof(struct real_buffer) > sizeof(buffer_t)) ?1:1];
 
diff --git a/src/lib/connection.h b/src/lib/connection.h
index 3d32ca3536..cee9669d6f 100644
--- a/src/lib/connection.h
+++ b/src/lib/connection.h
@@ -90,7 +90,7 @@ struct connection {
 
 	enum connection_disconnect_reason disconnect_reason;
 
-	unsigned int version_received:1;
+	bool version_received:1;
 };
 
 struct connection_list {
diff --git a/src/lib/file-dotlock.c b/src/lib/file-dotlock.c
index 90219a7b92..c4a81acd35 100644
--- a/src/lib/file-dotlock.c
+++ b/src/lib/file-dotlock.c
@@ -69,10 +69,10 @@ struct lock_info {
 	time_t last_change;
 	unsigned int wait_usecs;
 
-	unsigned int have_pid:1;
-	unsigned int pid_read:1;
-	unsigned int use_io_notify:1;
-	unsigned int lock_stated:1;
+	bool have_pid:1;
+	bool pid_read:1;
+	bool use_io_notify:1;
+	bool lock_stated:1;
 };
 
 static struct dotlock *
diff --git a/src/lib/file-dotlock.h b/src/lib/file-dotlock.h
index c2e21312bc..0b958c8df1 100644
--- a/src/lib/file-dotlock.h
+++ b/src/lib/file-dotlock.h
@@ -29,12 +29,12 @@ struct dotlock_settings {
 
 	/* Rely on O_EXCL locking to work instead of using hardlinks.
 	   It's faster, but doesn't work with all NFS implementations. */
-	unsigned int use_excl_lock:1;
+	bool use_excl_lock:1;
 	/* Flush NFS attribute cache before stating files. */
-	unsigned int nfs_flush:1;
+	bool nfs_flush:1;
 	/* Use io_add_notify() to speed up finding out when an existing
 	   dotlock is deleted */
-	unsigned int use_io_notify:1;
+	bool use_io_notify:1;
 };
 
 enum dotlock_create_flags {
diff --git a/src/lib/ioloop-private.h b/src/lib/ioloop-private.h
index b50f86179e..4cd5e20d0c 100644
--- a/src/lib/ioloop-private.h
+++ b/src/lib/ioloop-private.h
@@ -29,8 +29,8 @@ struct ioloop {
 
 	unsigned int io_pending_count;
 
-	unsigned int running:1;
-	unsigned int iolooping:1;
+	bool running:1;
+	bool iolooping:1;
 };
 
 struct io {
@@ -73,7 +73,7 @@ struct timeout {
 	struct ioloop *ioloop;
 	struct ioloop_context *ctx;
 
-	unsigned int one_shot:1;
+	bool one_shot:1;
 };
 
 struct ioloop_context_callback {
diff --git a/src/lib/istream-crlf.c b/src/lib/istream-crlf.c
index 445059cce2..ded34c151d 100644
--- a/src/lib/istream-crlf.c
+++ b/src/lib/istream-crlf.c
@@ -7,8 +7,8 @@
 struct crlf_istream {
 	struct istream_private istream;
 
-	unsigned int pending_cr:1;
-	unsigned int last_cr:1;
+	bool pending_cr:1;
+	bool last_cr:1;
 };
 
 static int i_stream_crlf_read_common(struct crlf_istream *cstream)
diff --git a/src/lib/istream-file-private.h b/src/lib/istream-file-private.h
index d0666660a4..c4701ed2ff 100644
--- a/src/lib/istream-file-private.h
+++ b/src/lib/istream-file-private.h
@@ -8,9 +8,9 @@ struct file_istream {
 
 	uoff_t skip_left;
 
-	unsigned int file:1;
-	unsigned int autoclose_fd:1;
-	unsigned int seen_eof:1;
+	bool file:1;
+	bool autoclose_fd:1;
+	bool seen_eof:1;
 };
 
 struct istream *
diff --git a/src/lib/istream-jsonstr.c b/src/lib/istream-jsonstr.c
index 51caf7442f..1425fbf4bd 100644
--- a/src/lib/istream-jsonstr.c
+++ b/src/lib/istream-jsonstr.c
@@ -13,7 +13,7 @@ struct jsonstr_istream {
 	struct istream_private istream;
 
 	/* The end '"' was found */
-	unsigned int str_end:1;
+	bool str_end:1;
 };
 
 static int
diff --git a/src/lib/istream-mmap.c b/src/lib/istream-mmap.c
index 7e1e1ab130..b5f0806aa7 100644
--- a/src/lib/istream-mmap.c
+++ b/src/lib/istream-mmap.c
@@ -17,7 +17,7 @@ struct mmap_istream {
 	off_t mmap_offset;
 	uoff_t v_size;
 
-	unsigned int autoclose_fd:1;
+	bool autoclose_fd:1;
 };
 
 static size_t mmap_pagemask = 0;
diff --git a/src/lib/istream-private.h b/src/lib/istream-private.h
index 0fceda0273..6e86080854 100644
--- a/src/lib/istream-private.h
+++ b/src/lib/istream-private.h
@@ -49,10 +49,10 @@ struct istream_private {
 	unsigned int access_counter;
 
 	string_t *line_str; /* for i_stream_next_line() if w_buffer == NULL */
-	unsigned int line_crlf:1;
-	unsigned int return_nolf_line:1;
-	unsigned int stream_size_passthrough:1; /* stream is parent's size */
-	unsigned int nonpersistent_buffers:1;
+	bool line_crlf:1;
+	bool return_nolf_line:1;
+	bool stream_size_passthrough:1; /* stream is parent's size */
+	bool nonpersistent_buffers:1;
 };
 
 struct istream * ATTR_NOWARN_UNUSED_RESULT
diff --git a/src/lib/istream-tee.c b/src/lib/istream-tee.c
index 6462844f5e..0e6f6bb1b9 100644
--- a/src/lib/istream-tee.c
+++ b/src/lib/istream-tee.c
@@ -17,7 +17,7 @@ struct tee_child_istream {
 	struct tee_istream *tee;
 	struct tee_child_istream *next;
 
-	unsigned int last_read_waiting:1;
+	bool last_read_waiting:1;
 };
 
 static void tee_streams_update_buffer(struct tee_istream *tee)
diff --git a/src/lib/istream.h b/src/lib/istream.h
index b987b5acec..9f93f299d9 100644
--- a/src/lib/istream.h
+++ b/src/lib/istream.h
@@ -8,13 +8,13 @@ struct istream {
 	uoff_t v_offset;
 
 	int stream_errno;
-	unsigned int mmaped:1; /* be careful when copying data */
-	unsigned int blocking:1; /* read() shouldn't return 0 */
-	unsigned int closed:1;
-	unsigned int readable_fd:1; /* fd can be read directly if necessary
+	bool mmaped:1; /* be careful when copying data */
+	bool blocking:1; /* read() shouldn't return 0 */
+	bool closed:1;
+	bool readable_fd:1; /* fd can be read directly if necessary
 	                               (for sendfile()) */
-	unsigned int seekable:1; /* we can seek() backwards */
-	unsigned int eof:1; /* read() has reached to end of file
+	bool seekable:1; /* we can seek() backwards */
+	bool eof:1; /* read() has reached to end of file
 	                       (but may still be data available in buffer) */
 
 	struct istream_private *real_stream;
diff --git a/src/lib/mempool.h b/src/lib/mempool.h
index aa2d34b2f0..ae8bf6afc2 100644
--- a/src/lib/mempool.h
+++ b/src/lib/mempool.h
@@ -42,8 +42,8 @@ struct pool_vfuncs {
 struct pool {
 	const struct pool_vfuncs *v;
 
-	unsigned int alloconly_pool:1;
-	unsigned int datastack_pool:1;
+	bool alloconly_pool:1;
+	bool datastack_pool:1;
 };
 
 /* system_pool uses calloc() + realloc() + free() */
diff --git a/src/lib/module-dir.h b/src/lib/module-dir.h
index f9c5d57d4c..f62e90677c 100644
--- a/src/lib/module-dir.h
+++ b/src/lib/module-dir.h
@@ -18,13 +18,13 @@ struct module_dir_load_settings {
 	void *filter_context;
 
 	/* Require all plugins to have <plugin_name>_init() function */
-	unsigned int require_init_funcs:1;
+	bool require_init_funcs:1;
 	/* Enable debug logging */
-	unsigned int debug:1;
+	bool debug:1;
 	/* If dlopen() fails for some modules, silently skip it. */
-	unsigned int ignore_dlopen_errors:1;
+	bool ignore_dlopen_errors:1;
 	/* Don't fail if some specified modules weren't found */
-	unsigned int ignore_missing:1;
+	bool ignore_missing:1;
 };
 
 struct module {
@@ -34,7 +34,7 @@ struct module {
 	void (*init)(struct module *module);
 	void (*deinit)(void);
 
-	unsigned int initialized:1;
+	bool initialized:1;
 
         struct module *next;
 };
diff --git a/src/lib/ostream-file-private.h b/src/lib/ostream-file-private.h
index f2bcdaaf0f..39da5bd3e6 100644
--- a/src/lib/ostream-file-private.h
+++ b/src/lib/ostream-file-private.h
@@ -19,13 +19,13 @@ struct file_ostream {
 	size_t buffer_size, optimal_block_size;
 	size_t head, tail; /* first unsent/unused byte */
 
-	unsigned int full:1; /* if head == tail, is buffer empty or full? */
-	unsigned int file:1;
-	unsigned int flush_pending:1;
-	unsigned int socket_cork_set:1;
-	unsigned int no_socket_cork:1;
-	unsigned int no_sendfile:1;
-	unsigned int autoclose_fd:1;
+	bool full:1; /* if head == tail, is buffer empty or full? */
+	bool file:1;
+	bool flush_pending:1;
+	bool socket_cork_set:1;
+	bool no_socket_cork:1;
+	bool no_sendfile:1;
+	bool autoclose_fd:1;
 };
 
 struct ostream *
diff --git a/src/lib/ostream-private.h b/src/lib/ostream-private.h
index c792e87dd8..f35d472362 100644
--- a/src/lib/ostream-private.h
+++ b/src/lib/ostream-private.h
@@ -37,11 +37,11 @@ struct ostream_private {
 	stream_flush_callback_t *callback;
 	void *context;
 
-	unsigned int corked:1;
-	unsigned int closing:1;
-	unsigned int last_errors_not_checked:1;
-	unsigned int error_handling_disabled:1;
-	unsigned int noverflow:1;
+	bool corked:1;
+	bool closing:1;
+	bool last_errors_not_checked:1;
+	bool error_handling_disabled:1;
+	bool noverflow:1;
 };
 
 struct ostream *
diff --git a/src/lib/ostream.h b/src/lib/ostream.h
index 7b1901ec92..32f95d229b 100644
--- a/src/lib/ostream.h
+++ b/src/lib/ostream.h
@@ -35,10 +35,10 @@ struct ostream {
 	/* overflow is set when some of the data given to send()
 	   functions was neither sent nor buffered. It's never unset inside
 	   ostream code. */
-	unsigned int overflow:1;
+	bool overflow:1;
 	/* o_stream_send() writes all the data or returns failure */
-	unsigned int blocking:1;
-	unsigned int closed:1;
+	bool blocking:1;
+	bool closed:1;
 
 	struct ostream_private *real_stream;
 };
diff --git a/src/lmtp/client.h b/src/lmtp/client.h
index c5b8b44135..5166374bfa 100644
--- a/src/lmtp/client.h
+++ b/src/lmtp/client.h
@@ -45,8 +45,8 @@ struct client_state {
 	struct mail_user *dest_user;
 	struct mail *first_saved_mail;
 
-	unsigned int mail_body_7bit:1;
-	unsigned int mail_body_8bitmime:1;
+	bool mail_body_7bit:1;
+	bool mail_body_8bitmime:1;
 };
 
 struct client {
@@ -80,7 +80,7 @@ struct client {
 	unsigned int proxy_ttl;
 	unsigned int proxy_timeout_secs;
 
-	unsigned int disconnected:1;
+	bool disconnected:1;
 };
 
 extern unsigned int clients_count;
diff --git a/src/lmtp/lmtp-proxy.c b/src/lmtp/lmtp-proxy.c
index 7066251f5b..6477edaab5 100644
--- a/src/lmtp/lmtp-proxy.c
+++ b/src/lmtp/lmtp-proxy.c
@@ -19,8 +19,8 @@ struct lmtp_proxy_recipient {
 	const char *reply;
 	unsigned int idx;
 
-	unsigned int rcpt_to_failed:1;
-	unsigned int data_reply_received:1;
+	bool rcpt_to_failed:1;
+	bool data_reply_received:1;
 };
 
 struct lmtp_proxy_connection {
@@ -31,8 +31,8 @@ struct lmtp_proxy_connection {
 	struct istream *data_input;
 	struct timeout *to;
 
-	unsigned int finished:1;
-	unsigned int failed:1;
+	bool finished:1;
+	bool failed:1;
 };
 
 struct lmtp_proxy {
@@ -53,7 +53,7 @@ struct lmtp_proxy {
 	lmtp_proxy_finish_callback_t *finish_callback;
 	void *finish_context;
 
-	unsigned int finished:1;
+	bool finished:1;
 };
 
 static void lmtp_conn_finish(void *context);
diff --git a/src/log/log-connection.c b/src/log/log-connection.c
index 2f96a8ce29..6eac6e8177 100644
--- a/src/log/log-connection.c
+++ b/src/log/log-connection.c
@@ -28,7 +28,7 @@
 struct log_client {
 	struct ip_addr ip;
 	char *prefix;
-	unsigned int fatal_logged:1;
+	bool fatal_logged:1;
 };
 
 struct log_connection {
@@ -45,8 +45,8 @@ struct log_connection {
 
 	unsigned int pending_count;
 
-	unsigned int master:1;
-	unsigned int handshaked:1;
+	bool master:1;
+	bool handshaked:1;
 };
 
 static struct log_connection *log_connections = NULL;
diff --git a/src/login-common/client-common.h b/src/login-common/client-common.h
index ba511a44fe..88a4189a4c 100644
--- a/src/login-common/client-common.h
+++ b/src/login-common/client-common.h
@@ -68,11 +68,11 @@ struct client_auth_reply {
 	/* all the key=value fields returned by passdb */
 	const char *const *all_fields;
 
-	unsigned int proxy:1;
-	unsigned int proxy_nopipelining:1;
-	unsigned int temp:1;
-	unsigned int nologin:1;
-	unsigned int authz_failure:1;
+	bool proxy:1;
+	bool proxy_nopipelining:1;
+	bool temp:1;
+	bool nologin:1;
+	bool authz_failure:1;
 };
 
 struct client_vfuncs {
@@ -154,27 +154,27 @@ struct client {
 	ARRAY(union login_client_module_context *) module_contexts;
 
 	char *virtual_user, *virtual_user_orig, *virtual_auth_user;
-	unsigned int destroyed:1;
-	unsigned int input_blocked:1;
-	unsigned int login_success:1;
-	unsigned int starttls:1;
-	unsigned int tls:1;
-	unsigned int secured:1;
-	unsigned int trusted:1;
-	unsigned int ssl_servername_settings_read:1;
-	unsigned int authenticating:1;
-	unsigned int auth_tried_disabled_plaintext:1;
-	unsigned int auth_tried_unsupported_mech:1;
-	unsigned int auth_try_aborted:1;
-	unsigned int auth_initializing:1;
-	unsigned int auth_process_comm_fail:1;
-	unsigned int proxy_auth_failed:1;
-	unsigned int proxy_nopipelining:1;
-	unsigned int auth_waiting:1;
-	unsigned int auth_user_disabled:1;
-	unsigned int auth_pass_expired:1;
-	unsigned int notified_auth_ready:1;
-	unsigned int notified_disconnect:1;
+	bool destroyed:1;
+	bool input_blocked:1;
+	bool login_success:1;
+	bool starttls:1;
+	bool tls:1;
+	bool secured:1;
+	bool trusted:1;
+	bool ssl_servername_settings_read:1;
+	bool authenticating:1;
+	bool auth_tried_disabled_plaintext:1;
+	bool auth_tried_unsupported_mech:1;
+	bool auth_try_aborted:1;
+	bool auth_initializing:1;
+	bool auth_process_comm_fail:1;
+	bool proxy_auth_failed:1;
+	bool proxy_nopipelining:1;
+	bool auth_waiting:1;
+	bool auth_user_disabled:1;
+	bool auth_pass_expired:1;
+	bool notified_auth_ready:1;
+	bool notified_disconnect:1;
 	/* ... */
 };
 
diff --git a/src/login-common/login-proxy.c b/src/login-common/login-proxy.c
index de74eb41f3..fb35e89009 100644
--- a/src/login-common/login-proxy.c
+++ b/src/login-common/login-proxy.c
@@ -54,11 +54,11 @@ struct login_proxy {
 
 	proxy_callback_t *callback;
 
-	unsigned int connected:1;
-	unsigned int destroying:1;
-	unsigned int disconnecting:1;
-	unsigned int delayed_disconnect:1;
-	unsigned int num_waiting_connections_updated:1;
+	bool connected:1;
+	bool destroying:1;
+	bool disconnecting:1;
+	bool delayed_disconnect:1;
+	bool num_waiting_connections_updated:1;
 };
 
 static struct login_proxy_state *proxy_state;
diff --git a/src/login-common/ssl-proxy-openssl.c b/src/login-common/ssl-proxy-openssl.c
index 8f03438cca..b1c6498af1 100644
--- a/src/login-common/ssl-proxy-openssl.c
+++ b/src/login-common/ssl-proxy-openssl.c
@@ -74,13 +74,13 @@ struct ssl_proxy {
 
 	const char *cert_error;
 	char *last_error;
-	unsigned int handshaked:1;
-	unsigned int destroyed:1;
-	unsigned int cert_received:1;
-	unsigned int cert_broken:1;
-	unsigned int client_proxy:1;
-	unsigned int flushing:1;
-	unsigned int failed:1;
+	bool handshaked:1;
+	bool destroyed:1;
+	bool cert_received:1;
+	bool cert_broken:1;
+	bool client_proxy:1;
+	bool flushing:1;
+	bool failed:1;
 };
 
 struct ssl_parameters {
diff --git a/src/master/service-process.h b/src/master/service-process.h
index 6cd381bb4b..d35390a9ca 100644
--- a/src/master/service-process.h
+++ b/src/master/service-process.h
@@ -28,7 +28,7 @@ struct service_process {
 	/* kill the process if it doesn't send initial status notification */
 	struct timeout *to_status;
 
-	unsigned int destroyed:1;
+	bool destroyed:1;
 };
 
 #define SERVICE_PROCESS_IS_INITIALIZED(process) \
diff --git a/src/master/service.h b/src/master/service.h
index 79aa65f9ef..5d624af1e3 100644
--- a/src/master/service.h
+++ b/src/master/service.h
@@ -110,15 +110,15 @@ struct service {
 	time_t last_drop_warning;
 
 	/* all processes are in use and new connections are coming */
-	unsigned int listen_pending:1;
+	bool listen_pending:1;
 	/* service is currently listening for new connections */
-	unsigned int listening:1;
+	bool listening:1;
 	/* TRUE if service has at least one inet_listener */
-	unsigned int have_inet_listeners:1;
+	bool have_inet_listeners:1;
 	/* service_login_notify()'s last notification state */
-	unsigned int last_login_full_notify:1;
+	bool last_login_full_notify:1;
 	/* service has exited at least once with exit code 0 */
-	unsigned int have_successful_exits:1;
+	bool have_successful_exits:1;
 };
 
 struct service_list {
@@ -143,10 +143,10 @@ struct service_list {
 
 	ARRAY(struct service *) services;
 
-	unsigned int destroying:1;
-	unsigned int destroyed:1;
-	unsigned int sigterm_sent:1;
-	unsigned int sigterm_sent_to_log:1;
+	bool destroying:1;
+	bool destroyed:1;
+	bool sigterm_sent:1;
+	bool sigterm_sent_to_log:1;
 };
 
 HASH_TABLE_DEFINE_TYPE(pid_process, void *, struct service_process *);
diff --git a/src/plugins/acl/acl-api-private.h b/src/plugins/acl/acl-api-private.h
index 1e4712ea24..581a4c1440 100644
--- a/src/plugins/acl/acl-api-private.h
+++ b/src/plugins/acl/acl-api-private.h
@@ -57,8 +57,8 @@ struct acl_backend {
 
 	struct acl_backend_vfuncs v;
 
-	unsigned int owner:1;
-	unsigned int debug:1;
+	bool owner:1;
+	bool debug:1;
 };
 
 struct acl_mailbox_list_context {
@@ -79,7 +79,7 @@ struct acl_object_list_iter {
 
 	struct acl_rights *rights;
 	unsigned int idx, count;
-	unsigned int failed:1;
+	bool failed:1;
 };
 
 extern const char *const all_mailbox_rights[];
diff --git a/src/plugins/acl/acl-api.h b/src/plugins/acl/acl-api.h
index beb28072d4..91aa82b798 100644
--- a/src/plugins/acl/acl-api.h
+++ b/src/plugins/acl/acl-api.h
@@ -77,7 +77,7 @@ struct acl_rights {
 	const char *const *neg_rights;
 
 	/* These rights are global for all users */
-	unsigned int global:1;
+	bool global:1;
 };
 ARRAY_DEFINE_TYPE(acl_rights, struct acl_rights);
 
diff --git a/src/plugins/acl/acl-backend-vfile.h b/src/plugins/acl/acl-backend-vfile.h
index 28003d3c18..b55239ffa9 100644
--- a/src/plugins/acl/acl-backend-vfile.h
+++ b/src/plugins/acl/acl-backend-vfile.h
@@ -47,8 +47,8 @@ struct acl_backend_vfile {
 	unsigned int acllist_change_counter;
 
 	unsigned int cache_secs;
-	unsigned int rebuilding_acllist:1;
-	unsigned int iterating_acllist:1;
+	bool rebuilding_acllist:1;
+	bool iterating_acllist:1;
 };
 
 void acl_vfile_write_rights_list(string_t *dest, const char *const *rights);
diff --git a/src/plugins/acl/acl-lookup-dict.c b/src/plugins/acl/acl-lookup-dict.c
index d70701e861..da735fecce 100644
--- a/src/plugins/acl/acl-lookup-dict.c
+++ b/src/plugins/acl/acl-lookup-dict.c
@@ -28,7 +28,7 @@ struct acl_lookup_dict_iter {
 	ARRAY_TYPE(const_string) iter_values;
 	unsigned int iter_idx, iter_value_idx;
 
-	unsigned int failed:1;
+	bool failed:1;
 };
 
 struct acl_lookup_dict *acl_lookup_dict_init(struct mail_user *user)
diff --git a/src/plugins/acl/acl-mailbox-list.c b/src/plugins/acl/acl-mailbox-list.c
index dace9e99f7..5cd891adc9 100644
--- a/src/plugins/acl/acl-mailbox-list.c
+++ b/src/plugins/acl/acl-mailbox-list.c
@@ -22,8 +22,8 @@ struct acl_mailbox_list_iterate_context {
 	struct mailbox_info info;
 
 	char sep;
-	unsigned int hide_nonlistable_subscriptions:1;
-	unsigned int simple_star_glob:1;
+	bool hide_nonlistable_subscriptions:1;
+	bool simple_star_glob:1;
 };
 
 static const char *acl_storage_right_names[ACL_STORAGE_RIGHT_COUNT] = {
diff --git a/src/plugins/expire/expire-plugin.c b/src/plugins/expire/expire-plugin.c
index 0a3b823813..c71bd0ce19 100644
--- a/src/plugins/expire/expire-plugin.c
+++ b/src/plugins/expire/expire-plugin.c
@@ -45,8 +45,8 @@ struct expire_mailbox {
 struct expire_transaction_context {
 	union mailbox_transaction_module_context module_ctx;
 
-	unsigned int saves:1;
-	unsigned int first_expunged:1;
+	bool saves:1;
+	bool first_expunged:1;
 };
 
 const char *expire_plugin_version = DOVECOT_ABI_VERSION;
diff --git a/src/plugins/fts-lucene/fts-backend-lucene.c b/src/plugins/fts-lucene/fts-backend-lucene.c
index 3420debe2d..8fe13c8e8c 100644
--- a/src/plugins/fts-lucene/fts-backend-lucene.c
+++ b/src/plugins/fts-lucene/fts-backend-lucene.c
@@ -30,8 +30,8 @@ struct lucene_fts_backend {
 
 	struct fts_expunge_log *expunge_log;
 
-	unsigned int dir_created:1;
-	unsigned int updating:1;
+	bool dir_created:1;
+	bool updating:1;
 };
 
 struct lucene_fts_backend_update_context {
diff --git a/src/plugins/fts-solr/fts-backend-solr.c b/src/plugins/fts-solr/fts-backend-solr.c
index 5d0d3ac390..329dcc7aab 100644
--- a/src/plugins/fts-solr/fts-backend-solr.c
+++ b/src/plugins/fts-solr/fts-backend-solr.c
@@ -55,12 +55,12 @@ struct solr_fts_backend_update_context {
 	uint32_t last_indexed_uid;
 	unsigned int mails_since_flush;
 
-	unsigned int tokenized_input:1;
-	unsigned int last_indexed_uid_set:1;
-	unsigned int body_open:1;
-	unsigned int documents_added:1;
-	unsigned int expunges:1;
-	unsigned int truncate_header:1;
+	bool tokenized_input:1;
+	bool last_indexed_uid_set:1;
+	bool body_open:1;
+	bool documents_added:1;
+	bool expunges:1;
+	bool truncate_header:1;
 };
 
 static const char *solr_escape_chars = "+-&|!(){}[]^\"~*?:\\/ ";
diff --git a/src/plugins/fts-solr/solr-connection.c b/src/plugins/fts-solr/solr-connection.c
index 3449a8f938..08edcd8d96 100644
--- a/src/plugins/fts-solr/solr-connection.c
+++ b/src/plugins/fts-solr/solr-connection.c
@@ -52,7 +52,7 @@ struct solr_connection_post {
 
 	struct http_client_request *http_req;
 
-	unsigned int failed:1;
+	bool failed:1;
 };
 
 struct solr_connection {
@@ -68,10 +68,10 @@ struct solr_connection {
 	struct istream *payload;
 	struct io *io;
 
-	unsigned int debug:1;
-	unsigned int posting:1;
-	unsigned int xml_failed:1;
-	unsigned int http_ssl:1;
+	bool debug:1;
+	bool posting:1;
+	bool xml_failed:1;
+	bool http_ssl:1;
 };
 
 static int solr_xml_parse(struct solr_connection *conn,
diff --git a/src/plugins/fts-squat/squat-trie-private.h b/src/plugins/fts-squat/squat-trie-private.h
index efe93fe0b7..b079554916 100644
--- a/src/plugins/fts-squat/squat-trie-private.h
+++ b/src/plugins/fts-squat/squat-trie-private.h
@@ -56,12 +56,12 @@ struct squat_node {
 	/* TRUE = children.data contains our children.
 	   FALSE = children.offset contains offset to our children in the
 	   index file. */
-	unsigned int children_not_mapped:1;
+	bool children_not_mapped:1;
 	/* When allocating our children, use a sequential array. */
-	unsigned int want_sequential:1;
+	bool want_sequential:1;
 	/* This node's children are in a sequential array, meaning that the
 	   first SEQUENTIAL_COUNT children have chars[n] = n. */
-	unsigned int have_sequential:1;
+	bool have_sequential:1;
 
 	/* Number of UIDs that exists in parent node but not in this one
 	   (i.e. number of UIDs [0..next_uid-1] not in this node's uidlist).
@@ -138,7 +138,7 @@ struct squat_trie {
 	unsigned int default_partial_len;
 	unsigned int default_full_len;
 
-	unsigned int corrupted:1;
+	bool corrupted:1;
 };
 
 #define SQUAT_PACK_MAX_SIZE ((sizeof(uint32_t) * 8 + 7) / 7)
diff --git a/src/plugins/fts-squat/squat-trie.c b/src/plugins/fts-squat/squat-trie.c
index c24aacb032..91111aa4f8 100644
--- a/src/plugins/fts-squat/squat-trie.c
+++ b/src/plugins/fts-squat/squat-trie.c
@@ -39,7 +39,7 @@ struct squat_trie_build_context {
 	struct dotlock *dotlock;
 
 	uint32_t first_uid;
-	unsigned int compress_nodes:1;
+	bool compress_nodes:1;
 };
 
 struct squat_trie_iterate_node {
diff --git a/src/plugins/fts-squat/squat-uidlist.c b/src/plugins/fts-squat/squat-uidlist.c
index 566e9efd10..cbd71ac843 100644
--- a/src/plugins/fts-squat/squat-uidlist.c
+++ b/src/plugins/fts-squat/squat-uidlist.c
@@ -27,7 +27,7 @@
 
 struct uidlist_list {
 	unsigned int uid_count:31;
-	unsigned int uid_begins_with_pointer:1;
+	bool uid_begins_with_pointer:1;
 	uint32_t uid_list[UIDLIST_LIST_SIZE];
 };
 
@@ -54,8 +54,8 @@ struct squat_uidlist {
 	const uint32_t *cur_block_end_indexes;
 
 	size_t max_size;
-	unsigned int corrupted:1;
-	unsigned int building:1;
+	bool corrupted:1;
+	bool building:1;
 };
 
 struct squat_uidlist_build_context {
@@ -69,7 +69,7 @@ struct squat_uidlist_build_context {
 	uint32_t list_start_idx;
 
 	struct squat_uidlist_file_header build_hdr;
-	unsigned int need_reopen:1;
+	bool need_reopen:1;
 };
 
 struct squat_uidlist_rebuild_context {
diff --git a/src/plugins/fts/fts-api-private.h b/src/plugins/fts/fts-api-private.h
index 4fd12e9006..a2eac7a099 100644
--- a/src/plugins/fts/fts-api-private.h
+++ b/src/plugins/fts/fts-api-private.h
@@ -76,7 +76,7 @@ struct fts_backend {
 	struct fts_backend_vfuncs v;
 	struct mail_namespace *ns;
 
-	unsigned int updating:1;
+	bool updating:1;
 };
 
 struct fts_backend_update_context {
@@ -85,8 +85,8 @@ struct fts_backend_update_context {
 
 	struct mailbox *cur_box, *backend_box;
 
-	unsigned int build_key_open:1;
-	unsigned int failed:1;
+	bool build_key_open:1;
+	bool failed:1;
 };
 
 struct fts_index_header {
diff --git a/src/plugins/fts/fts-indexer.c b/src/plugins/fts/fts-indexer.c
index 884132ac9a..30aa2c8386 100644
--- a/src/plugins/fts/fts-indexer.c
+++ b/src/plugins/fts/fts-indexer.c
@@ -30,8 +30,8 @@ struct fts_indexer_context {
 	int fd;
 	struct istream *input;
 
-	unsigned int notified:1;
-	unsigned int failed:1;
+	bool notified:1;
+	bool failed:1;
 };
 
 int fts_indexer_cmd(struct mail_user *user, const char *cmd,
diff --git a/src/plugins/fts/fts-storage.c b/src/plugins/fts/fts-storage.c
index 31468c027f..32dcd309ec 100644
--- a/src/plugins/fts/fts-storage.c
+++ b/src/plugins/fts/fts-storage.c
@@ -48,16 +48,16 @@ struct fts_transaction_context {
 	uint32_t next_index_seq;
 	uint32_t highest_virtual_uid;
 
-	unsigned int precached:1;
-	unsigned int mails_saved:1;
-	unsigned int failed:1;
+	bool precached:1;
+	bool mails_saved:1;
+	bool failed:1;
 };
 
 struct fts_mail {
 	union mail_module_context module_ctx;
 	char score[30];
 
-	unsigned int virtual_mail:1;
+	bool virtual_mail:1;
 };
 
 static MODULE_CONTEXT_DEFINE_INIT(fts_storage_module,
diff --git a/src/plugins/fts/fts-storage.h b/src/plugins/fts/fts-storage.h
index 620b8e3552..bfc99993bb 100644
--- a/src/plugins/fts/fts-storage.h
+++ b/src/plugins/fts/fts-storage.h
@@ -35,10 +35,10 @@ struct fts_search_context {
 
 	struct fts_indexer_context *indexer_ctx;
 
-	unsigned int virtual_mailbox:1;
-	unsigned int fts_lookup_success:1;
-	unsigned int indexing_timed_out:1;
-	unsigned int enforced:1;
+	bool virtual_mailbox:1;
+	bool fts_lookup_success:1;
+	bool indexing_timed_out:1;
+	bool enforced:1;
 };
 
 /* Figure out if we want to use full text search indexes and update
diff --git a/src/plugins/lazy-expunge/lazy-expunge-plugin.c b/src/plugins/lazy-expunge/lazy-expunge-plugin.c
index 322d8b6822..1b25171e64 100644
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c
+++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c
@@ -39,8 +39,8 @@ struct lazy_expunge_mail_user {
 struct lazy_expunge_mailbox_list {
 	union mailbox_list_module_context module_ctx;
 
-	unsigned int allow_rename:1;
-	unsigned int internal_namespace:1;
+	bool allow_rename:1;
+	bool internal_namespace:1;
 };
 
 struct lazy_expunge_transaction {
diff --git a/src/plugins/pop3-migration/pop3-migration-plugin.c b/src/plugins/pop3-migration/pop3-migration-plugin.c
index e713567371..1321aab817 100644
--- a/src/plugins/pop3-migration/pop3-migration-plugin.c
+++ b/src/plugins/pop3-migration/pop3-migration-plugin.c
@@ -24,7 +24,7 @@
 struct msg_map_common {
 	/* sha1(header) - set only when needed */
 	unsigned char hdr_sha1[SHA1_RESULTLEN];
-	unsigned int hdr_sha1_set:1;
+	bool hdr_sha1_set:1;
 };
 
 struct pop3_uidl_map {
@@ -53,10 +53,10 @@ struct pop3_migration_mail_storage {
 	const char *pop3_box_vname;
 	ARRAY(struct pop3_uidl_map) pop3_uidl_map;
 
-	unsigned int all_mailboxes:1;
-	unsigned int pop3_all_hdr_sha1_set:1;
-	unsigned int ignore_missing_uidls:1;
-	unsigned int skip_size_check:1;
+	bool all_mailboxes:1;
+	bool pop3_all_hdr_sha1_set:1;
+	bool ignore_missing_uidls:1;
+	bool skip_size_check:1;
 };
 
 struct pop3_migration_mailbox {
@@ -67,10 +67,10 @@ struct pop3_migration_mailbox {
 
 	struct mail_cache_field cache_field;
 
-	unsigned int cache_field_registered:1;
-	unsigned int uidl_synced:1;
-	unsigned int uidl_sync_failed:1;
-	unsigned int uidl_ordered:1;
+	bool cache_field_registered:1;
+	bool uidl_synced:1;
+	bool uidl_sync_failed:1;
+	bool uidl_ordered:1;
 };
 
 /* NOTE: these headers must be sorted */
diff --git a/src/plugins/quota/quota-fs.c b/src/plugins/quota/quota-fs.c
index b3c15be3a8..c1a3e45e3e 100644
--- a/src/plugins/quota/quota-fs.c
+++ b/src/plugins/quota/quota-fs.c
@@ -73,9 +73,9 @@ struct fs_quota_root {
 	gid_t gid;
 	struct fs_quota_mountpoint *mount;
 
-	unsigned int inode_per_mail:1;
-	unsigned int user_disabled:1;
-	unsigned int group_disabled:1;
+	bool inode_per_mail:1;
+	bool user_disabled:1;
+	bool group_disabled:1;
 #ifdef FS_QUOTA_NETBSD
 	struct quotahandle *qh;
 #endif
diff --git a/src/plugins/quota/quota-maildir.c b/src/plugins/quota/quota-maildir.c
index 7c7a23f7a5..1dcd94f586 100644
--- a/src/plugins/quota/quota-maildir.c
+++ b/src/plugins/quota/quota-maildir.c
@@ -33,7 +33,7 @@ struct maildir_quota_root {
 	time_t recalc_last_stamp;
 	off_t last_size;
 
-	unsigned int limits_initialized:1;
+	bool limits_initialized:1;
 };
 
 struct maildir_list_context {
diff --git a/src/plugins/quota/quota-private.h b/src/plugins/quota/quota-private.h
index 6ac87af181..c28207f195 100644
--- a/src/plugins/quota/quota-private.h
+++ b/src/plugins/quota/quota-private.h
@@ -26,9 +26,9 @@ struct quota_settings {
 			  uoff_t size, bool *too_large_r);
 
 	const char *quota_exceeded_msg;
-	unsigned int debug:1;
-	unsigned int initialized:1;
-	unsigned int vsizes:1;
+	bool debug:1;
+	bool initialized:1;
+	bool vsizes:1;
 };
 
 struct quota_rule {
@@ -39,13 +39,13 @@ struct quota_rule {
 	int bytes_percent, count_percent;
 
 	/* Don't include this mailbox in quota */
-	unsigned int ignore:1;
+	bool ignore:1;
 };
 
 struct quota_warning_rule {
 	struct quota_rule rule;
 	const char *command;
-	unsigned int reverse:1;
+	bool reverse:1;
 };
 
 struct quota_backend_vfuncs {
@@ -100,7 +100,7 @@ struct quota_root_settings {
 	struct quota_rule grace_rule;
 
 	/* Limits in default_rule override backend's quota limits */
-	unsigned int force_default_rule:1;
+	bool force_default_rule:1;
 };
 
 struct quota_root {
@@ -136,22 +136,22 @@ struct quota_root {
 	const char *quota_over_flag;
 
 	/* don't enforce quota when saving */
-	unsigned int no_enforcing:1;
+	bool no_enforcing:1;
 	/* quota is automatically updated. update() should be called but the
 	   bytes/count won't be used. */
-	unsigned int auto_updating:1;
+	bool auto_updating:1;
 	/* If user has unlimited quota, disable quota tracking */
-	unsigned int disable_unlimited_tracking:1;
+	bool disable_unlimited_tracking:1;
 	/* Set while quota is being recalculated to avoid recursion. */
-	unsigned int recounting:1;
+	bool recounting:1;
 	/* Quota root is hidden (to e.g. IMAP GETQUOTAROOT) */
-	unsigned int hidden:1;
+	bool hidden:1;
 	/* Is quota_over_flag* initialized yet? */
-	unsigned int quota_over_flag_initialized:1;
+	bool quota_over_flag_initialized:1;
 	/* Is user currently over quota? */
-	unsigned int quota_over_flag_status:1;
+	bool quota_over_flag_status:1;
 	/* Did we already check quota_over_flag correctness? */
-	unsigned int quota_over_flag_checked:1;
+	bool quota_over_flag_checked:1;
 };
 
 struct quota_transaction_context {
@@ -177,11 +177,11 @@ struct quota_transaction_context {
 	struct mail *tmp_mail;
 	enum quota_recalculate recalculate;
 
-	unsigned int limits_set:1;
-	unsigned int failed:1;
-	unsigned int sync_transaction:1;
+	bool limits_set:1;
+	bool failed:1;
+	bool sync_transaction:1;
 	/* TRUE if all roots have auto_updating=TRUE */
-	unsigned int auto_updating:1;
+	bool auto_updating:1;
 };
 
 /* Register storage to all user's quota roots. */
diff --git a/src/plugins/quota/quota-storage.c b/src/plugins/quota/quota-storage.c
index 14270d8df2..91e364c587 100644
--- a/src/plugins/quota/quota-storage.c
+++ b/src/plugins/quota/quota-storage.c
@@ -33,8 +33,8 @@ struct quota_mailbox {
 	ARRAY(uoff_t) expunge_sizes;
 	unsigned int prev_idx;
 
-	unsigned int recalculate:1;
-	unsigned int sync_transaction_expunge:1;
+	bool recalculate:1;
+	bool sync_transaction_expunge:1;
 };
 
 struct quota_user_module quota_user_module =
diff --git a/src/plugins/virtual/virtual-mail.c b/src/plugins/virtual/virtual-mail.c
index 84fe7dd786..84e6d6eddd 100644
--- a/src/plugins/virtual/virtual-mail.c
+++ b/src/plugins/virtual/virtual-mail.c
@@ -20,7 +20,7 @@ struct virtual_mail {
 	ARRAY(struct mail *) backend_mails;
 
 	/* mail is lost if backend_mail doesn't point to correct mail */
-	unsigned int cur_lost:1;
+	bool cur_lost:1;
 };
 
 struct mail *
diff --git a/src/plugins/virtual/virtual-storage.h b/src/plugins/virtual/virtual-storage.h
index c777091410..e847cd31f8 100644
--- a/src/plugins/virtual/virtual-storage.h
+++ b/src/plugins/virtual/virtual-storage.h
@@ -102,15 +102,15 @@ struct virtual_backend_box {
 	/* mailbox metadata matching */
 	const char *metadata_entry, *metadata_value;
 
-	unsigned int open_tracked:1;
-	unsigned int open_failed:1;
-	unsigned int sync_seen:1;
-	unsigned int wildcard:1;
-	unsigned int clear_recent:1;
-	unsigned int negative_match:1;
-	unsigned int uids_nonsorted:1;
-	unsigned int search_args_initialized:1;
-	unsigned int deleted:1;
+	bool open_tracked:1;
+	bool open_failed:1;
+	bool sync_seen:1;
+	bool wildcard:1;
+	bool clear_recent:1;
+	bool negative_match:1;
+	bool uids_nonsorted:1;
+	bool search_args_initialized:1;
+	bool deleted:1;
 };
 ARRAY_DEFINE_TYPE(virtual_backend_box, struct virtual_backend_box *);
 
@@ -143,12 +143,12 @@ struct virtual_mailbox {
 	ARRAY_TYPE(mailbox_virtual_patterns) list_include_patterns;
 	ARRAY_TYPE(mailbox_virtual_patterns) list_exclude_patterns;
 
-	unsigned int uids_mapped:1;
-	unsigned int sync_initialized:1;
-	unsigned int inconsistent:1;
-	unsigned int have_guid_flags_set:1;
-	unsigned int have_guids:1;
-	unsigned int have_save_guids:1;
+	bool uids_mapped:1;
+	bool sync_initialized:1;
+	bool inconsistent:1;
+	bool have_guid_flags_set:1;
+	bool have_guids:1;
+	bool have_save_guids:1;
 };
 
 extern MODULE_CONTEXT_DEFINE(virtual_storage_module,
diff --git a/src/plugins/virtual/virtual-sync.c b/src/plugins/virtual/virtual-sync.c
index 5b31212cf8..c75f2e29e1 100644
--- a/src/plugins/virtual/virtual-sync.c
+++ b/src/plugins/virtual/virtual-sync.c
@@ -44,10 +44,10 @@ struct virtual_sync_context {
 	enum mailbox_sync_flags flags;
 	uint32_t uid_validity;
 
-	unsigned int ext_header_changed:1;
-	unsigned int ext_header_rewrite:1;
-	unsigned int expunge_removed:1;
-	unsigned int index_broken:1;
+	bool ext_header_changed:1;
+	bool ext_header_rewrite:1;
+	bool expunge_removed:1;
+	bool index_broken:1;
 };
 
 static void virtual_sync_backend_box_deleted(struct virtual_sync_context *ctx,
diff --git a/src/pop3/pop3-client.h b/src/pop3/pop3-client.h
index 6b6fc282d9..c437bf9649 100644
--- a/src/pop3/pop3-client.h
+++ b/src/pop3/pop3-client.h
@@ -96,12 +96,12 @@ struct client {
 	/* Module-specific contexts. */
 	ARRAY(union pop3_module_context *) module_contexts;
 
-	unsigned int disconnected:1;
-	unsigned int deleted:1;
-	unsigned int waiting_input:1;
-	unsigned int anvil_sent:1;
-	unsigned int message_uidls_save:1;
-	unsigned int delete_success:1;
+	bool disconnected:1;
+	bool deleted:1;
+	bool waiting_input:1;
+	bool anvil_sent:1;
+	bool message_uidls_save:1;
+	bool delete_success:1;
 };
 
 struct pop3_module_register {
diff --git a/src/replication/replicator/dsync-client.c b/src/replication/replicator/dsync-client.c
index 1adebb786b..1f7e4d9357 100644
--- a/src/replication/replicator/dsync-client.c
+++ b/src/replication/replicator/dsync-client.c
@@ -30,8 +30,8 @@ struct dsync_client {
 	void *context;
 
 	time_t last_connect_failure;
-	unsigned int handshaked:1;
-	unsigned int cmd_sent:1;
+	bool handshaked:1;
+	bool cmd_sent:1;
 };
 
 struct dsync_client *
diff --git a/src/replication/replicator/notify-connection.c b/src/replication/replicator/notify-connection.c
index e70b4e8fe2..0b9eedf96d 100644
--- a/src/replication/replicator/notify-connection.c
+++ b/src/replication/replicator/notify-connection.c
@@ -26,8 +26,8 @@ struct notify_connection {
 
 	struct replicator_queue *queue;
 
-	unsigned int version_received:1;
-	unsigned int destroyed:1;
+	bool version_received:1;
+	bool destroyed:1;
 };
 
 struct notify_sync_request {
diff --git a/src/replication/replicator/replicator-brain.c b/src/replication/replicator/replicator-brain.c
index abc6dcdf62..bbbfd12efd 100644
--- a/src/replication/replicator/replicator-brain.c
+++ b/src/replication/replicator/replicator-brain.c
@@ -21,7 +21,7 @@ struct replicator_brain {
 
 	ARRAY_TYPE(dsync_client) dsync_clients;
 
-	unsigned int deinitializing:1;
+	bool deinitializing:1;
 };
 
 static void replicator_brain_fill(struct replicator_brain *brain);
diff --git a/src/replication/replicator/replicator-queue.h b/src/replication/replicator/replicator-queue.h
index e48dfa6f31..a9b3b36752 100644
--- a/src/replication/replicator/replicator-queue.h
+++ b/src/replication/replicator/replicator-queue.h
@@ -17,11 +17,11 @@ struct replicator_user {
 
 	enum replication_priority priority;
 	/* User isn't currently in replication queue */
-	unsigned int popped:1;
+	bool popped:1;
 	/* Last replication sync failed */
-	unsigned int last_sync_failed:1;
+	bool last_sync_failed:1;
 	/* Force a full sync on the next replication */
-	unsigned int force_full_sync:1;
+	bool force_full_sync:1;
 };
 
 typedef void replicator_sync_callback_t(bool success, void *context);