-void prepare_databases(void);
-struct database *find_database(const char *id, int new);
-int database_match_criteria(struct session_database *db, struct database_criterion *cl);
-int session_grep_databases(struct session *se, struct database_criterion *cl,
+typedef struct database_hosts *database_hosts_t;
+struct session_database;
+struct session;
+struct conf_service;
+struct database *find_database(const char *id, struct conf_service *service);
+int session_grep_databases(struct session *se, const char *filter,