diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-db.c b/src/lib-sieve/storage/ldap/sieve-ldap-db.c
index 0263ce0fdc5dcbc5ec17c7e33946ce8546db3f7e..3f3d90bc13c97620f8086641ba9557e010c8d92f 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-db.c
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-db.c
@@ -60,53 +60,6 @@ static struct ldap_connection *ldap_connections = NULL;
 static int db_ldap_bind(struct ldap_connection *conn);
 static void db_ldap_conn_close(struct ldap_connection *conn);
 
-int ldap_deref_from_str(const char *str, int *deref_r)
-{
-	if (strcasecmp(str, "never") == 0)
-		*deref_r = LDAP_DEREF_NEVER;
-	else if (strcasecmp(str, "searching") == 0)
-		*deref_r = LDAP_DEREF_SEARCHING;
-	else if (strcasecmp(str, "finding") == 0)
-		*deref_r = LDAP_DEREF_FINDING;
-	else if (strcasecmp(str, "always") == 0)
-		*deref_r = LDAP_DEREF_ALWAYS;
-	else
-		return -1;
-	return 0;
-}
-
-int ldap_scope_from_str(const char *str, int *scope_r)
-{
-	if (strcasecmp(str, "base") == 0)
-		*scope_r = LDAP_SCOPE_BASE;
-	else if (strcasecmp(str, "onelevel") == 0)
-		*scope_r = LDAP_SCOPE_ONELEVEL;
-	else if (strcasecmp(str, "subtree") == 0)
-		*scope_r = LDAP_SCOPE_SUBTREE;
-	else
-		return -1;
-	return 0;
-}
-
-#ifdef OPENLDAP_TLS_OPTIONS
-int ldap_tls_require_cert_from_str(const char *str, int *opt_x_tls_r)
-{
-	if (strcasecmp(str, "never") == 0)
-		*opt_x_tls_r = LDAP_OPT_X_TLS_NEVER;
-	else if (strcasecmp(str, "hard") == 0)
-		*opt_x_tls_r = LDAP_OPT_X_TLS_HARD;
-	else if (strcasecmp(str, "demand") == 0)
-		*opt_x_tls_r = LDAP_OPT_X_TLS_DEMAND;
-	else if (strcasecmp(str, "allow") == 0)
-		*opt_x_tls_r = LDAP_OPT_X_TLS_ALLOW;
-	else if (strcasecmp(str, "try") == 0)
-		*opt_x_tls_r = LDAP_OPT_X_TLS_TRY;
-	else
-		return -1;
-	return 0;
-}
-#endif
-
 static int ldap_get_errno(struct ldap_connection *conn)
 {
 	struct sieve_storage *storage = &conn->lstorage->storage;
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-db.h b/src/lib-sieve/storage/ldap/sieve-ldap-db.h
index 784084ae284f644ef6c669c7657159e21d24347d..594aacdc2ca889b18173ba662930da2d1db32f7b 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-db.h
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-db.h
@@ -111,13 +111,6 @@ struct ldap_connection {
 	time_t last_reply_stamp;
 };
 
-
-int ldap_deref_from_str(const char *str, int *deref_r);
-int ldap_scope_from_str(const char *str, int *scope_r);
-#ifdef OPENLDAP_TLS_OPTIONS
-int ldap_tls_require_cert_from_str(const char *str, int *opt_x_tls_r);
-#endif
-
 /* Send/queue request */
 void db_ldap_request(struct ldap_connection *conn,
 		     struct ldap_request *request);
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c b/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c
index addec4357aaa8f43d61efa2f3a10c069a8eebe2e..043fd2f350e508f5c38e1b1212e735494be9630c 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c
@@ -87,6 +87,53 @@ parse_setting(const char *key, const char *value,
 				       &lstorage->set, key, value);
 }
 
+static int ldap_deref_from_str(const char *str, int *deref_r)
+{
+	if (strcasecmp(str, "never") == 0)
+		*deref_r = LDAP_DEREF_NEVER;
+	else if (strcasecmp(str, "searching") == 0)
+		*deref_r = LDAP_DEREF_SEARCHING;
+	else if (strcasecmp(str, "finding") == 0)
+		*deref_r = LDAP_DEREF_FINDING;
+	else if (strcasecmp(str, "always") == 0)
+		*deref_r = LDAP_DEREF_ALWAYS;
+	else
+		return -1;
+	return 0;
+}
+
+static int ldap_scope_from_str(const char *str, int *scope_r)
+{
+	if (strcasecmp(str, "base") == 0)
+		*scope_r = LDAP_SCOPE_BASE;
+	else if (strcasecmp(str, "onelevel") == 0)
+		*scope_r = LDAP_SCOPE_ONELEVEL;
+	else if (strcasecmp(str, "subtree") == 0)
+		*scope_r = LDAP_SCOPE_SUBTREE;
+	else
+		return -1;
+	return 0;
+}
+
+#ifdef OPENLDAP_TLS_OPTIONS
+static int ldap_tls_require_cert_from_str(const char *str, int *opt_x_tls_r)
+{
+	if (strcasecmp(str, "never") == 0)
+		*opt_x_tls_r = LDAP_OPT_X_TLS_NEVER;
+	else if (strcasecmp(str, "hard") == 0)
+		*opt_x_tls_r = LDAP_OPT_X_TLS_HARD;
+	else if (strcasecmp(str, "demand") == 0)
+		*opt_x_tls_r = LDAP_OPT_X_TLS_DEMAND;
+	else if (strcasecmp(str, "allow") == 0)
+		*opt_x_tls_r = LDAP_OPT_X_TLS_ALLOW;
+	else if (strcasecmp(str, "try") == 0)
+		*opt_x_tls_r = LDAP_OPT_X_TLS_TRY;
+	else
+		return -1;
+	return 0;
+}
+#endif
+
 int sieve_ldap_storage_read_settings(struct sieve_ldap_storage *lstorage,
 				     const char *config_path)
 {