diff --git a/src/lib-sieve/plugins/include/ext-include-binary.c b/src/lib-sieve/plugins/include/ext-include-binary.c
index 370ec75cf61856e26bc097dd6b2db64815a90ba8..acf2e32a26cbd461508540a73eb8e04d8f75c534 100644
--- a/src/lib-sieve/plugins/include/ext-include-binary.c
+++ b/src/lib-sieve/plugins/include/ext-include-binary.c
@@ -363,7 +363,7 @@ static void ext_include_binary_free
 
 	/* Release references to all included script objects */
 	hctx = hash_table_iterate_init(binctx->included_scripts);
-	while ( hash_table_iterate_t(hctx, binctx->included_scripts, &script, &incscript) )
+	while ( hash_table_iterate(hctx, binctx->included_scripts, &script, &incscript) )
 		sieve_script_unref(&incscript->script);
 	hash_table_iterate_deinit(&hctx);
 
@@ -391,7 +391,7 @@ bool ext_include_binary_dump
 		return FALSE;
 
 	hctx = hash_table_iterate_init(binctx->included_scripts);
-	while ( hash_table_iterate_t(hctx, binctx->included_scripts, &script, &incscript) ) {
+	while ( hash_table_iterate(hctx, binctx->included_scripts, &script, &incscript) ) {
 		unsigned int block_id = sieve_binary_block_get_id(incscript->block);
 
 		sieve_binary_dump_sectionf(denv, "Included %s script '%s' (block: %d)",
diff --git a/src/lib-sieve/plugins/variables/ext-variables-common.c b/src/lib-sieve/plugins/variables/ext-variables-common.c
index da8e6fa6b51fadec116ece01053fbce306f747c4..25d9a4a1853f01d8cc974e1825b9e5cf818a15dc 100644
--- a/src/lib-sieve/plugins/variables/ext-variables-common.c
+++ b/src/lib-sieve/plugins/variables/ext-variables-common.c
@@ -186,7 +186,7 @@ bool sieve_variable_scope_iterate
 {
 	const char *key;
 
-	return hash_table_iterate_t
+	return hash_table_iterate
 		(iter->hctx, iter->scope->variables, &key, var_r);
 }
 
diff --git a/src/lib-sieve/sieve-extensions.c b/src/lib-sieve/sieve-extensions.c
index f26e7f4a9dd6ab93c0fd83889c53ce5c27db0ccf..9864cc8457634464ec6db12158643e20610b64d3 100644
--- a/src/lib-sieve/sieve-extensions.c
+++ b/src/lib-sieve/sieve-extensions.c
@@ -753,7 +753,7 @@ void sieve_extension_capabilities_unregister
 	struct sieve_capability_registration *reg;
 
 	hictx = hash_table_iterate_init(ext_reg->capabilities_index);
-	while ( hash_table_iterate_t(hictx, ext_reg->capabilities_index, &name, &reg) ) {
+	while ( hash_table_iterate(hictx, ext_reg->capabilities_index, &name, &reg) ) {
 		if ( reg->ext == ext )
 			hash_table_remove(ext_reg->capabilities_index, name);
 	}
diff --git a/src/testsuite/testsuite-settings.c b/src/testsuite/testsuite-settings.c
index 84b1ff046a7e07c896fe3b8eae8df39604161657..7c1716f4c26bcc9bc03442e847e155f7c726f17c 100644
--- a/src/testsuite/testsuite-settings.c
+++ b/src/testsuite/testsuite-settings.c
@@ -35,7 +35,7 @@ void testsuite_settings_deinit(void)
 	const char *key;
 	struct testsuite_setting *setting;
 
-	while ( hash_table_iterate_t(itx, settings, &key, &setting) ) {
+	while ( hash_table_iterate(itx, settings, &key, &setting) ) {
 		i_free(setting->identifier);
 		i_free(setting->value);
 		i_free(setting);