-void prepare_databases(void);
-struct database *find_database(const char *id, int new, struct conf_service *service);
-int session_grep_databases(struct session *se, struct database_criterion *cl,
- void (*fun)(void *context, struct session_database *db));
+struct session_database;
+struct session;
+struct conf_service;
+struct settings;
+
+struct database *create_database_for_service(const char *id,
+ struct conf_service *service);
+int session_grep_databases(struct session *se, const char *filter,
+ void (*fun)(struct session *se, struct session_database *db));