-extern config_t *add_config_val(config_t **, int, char *);
-extern int read_config_file(config_t **, const char *);
-extern const config_t *get_config_val(config_t *, which_t type);
-extern void clear_config();
-extern int read_server_config(void);
-extern FILE *ask_and_safe_open(const char*, const char*);
+extern void init_configuration(struct splay_tree_t **);
+extern void exit_configuration(struct splay_tree_t **);
+extern config_t *new_config(void) __attribute__ ((__malloc__));
+extern void free_config(config_t *);
+extern void config_add(struct splay_tree_t *, config_t *);
+extern config_t *lookup_config(struct splay_tree_t *, char *);
+extern config_t *lookup_config_next(struct splay_tree_t *, const config_t *);
+extern bool get_config_bool(const config_t *, bool *);
+extern bool get_config_int(const config_t *, int *);
+extern bool get_config_string(const config_t *, char **);
+extern bool get_config_address(const config_t *, struct addrinfo **);
+
+extern config_t *parse_config_line(char *, const char *, int);
+extern bool read_config_file(struct splay_tree_t *, const char *);
+extern void read_config_options(struct splay_tree_t *, const char *);
+extern bool read_server_config(void);
+extern bool read_host_config(struct splay_tree_t *, const char *);
+extern bool append_config_file(const char *, const char *, const char *);