diff --git a/src/or/or.h b/src/or/or.h
index 0fac0adeb2..af8a0419f4 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -625,7 +625,7 @@ int connection_edge_finished_flushing(connection_t *conn);
 int connection_edge_package_raw_inbuf(connection_t *conn);
 
 void connection_exit_connect(connection_t *conn);
-
+int connection_ap_can_use_exit(connection_t *conn, routerinfo_t *exit);
 void connection_ap_attach_pending(void);
 
 extern uint64_t stats_n_data_cells_packaged;
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index db35c79640..d8aefcbc27 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -25,7 +25,14 @@ struct directory_token;
 typedef struct directory_token directory_token_t;
 
 /* static function prototypes */
-static int router_add_exit_policy_from_string(routerinfo_t *router, char *s);
+static int router_set_routerlist_from_string(char *s);
+static int
+router_get_list_from_string_impl(char **s, routerlist_t **dest,
+                                 int n_good_nicknames,
+                                 const char **good_nickname_lst);
+static int
+router_get_routerlist_from_directory_impl(char *s, routerlist_t **dest,
+                                          crypto_pk_env_t *pkey);
 static int router_add_exit_policy(routerinfo_t *router, 
                                   directory_token_t *tok);
 static int router_resolve_routerlist(routerlist_t *dir);