-extern void retry_outgoing(outgoing_t *);
-extern void handle_incoming_vpn_data(void *, int);
-extern void finish_connecting(struct connection_t *);
-extern bool do_outgoing_connection(struct outgoing_t *);
-extern void handle_new_meta_connection(void *, int);
-extern void handle_new_unix_connection(void *, int);
-extern int setup_listen_socket(const sockaddr_t *);
-extern int setup_vpn_in_socket(const sockaddr_t *);
+extern void retry_outgoing(outgoing_t *outgoing);
+extern void handle_incoming_vpn_data(void *data, int flags);
+extern void finish_connecting(struct connection_t *c);
+extern bool do_outgoing_connection(struct outgoing_t *outgoing);
+extern void handle_new_meta_connection(void *data, int flags);
+extern void handle_new_unix_connection(void *data, int flags);
+extern int setup_listen_socket(const sockaddr_t *sa);
+extern int setup_vpn_in_socket(const sockaddr_t *sa);