-char *compile_object(const void *ctx, const char *outfile, const char *cfile);
-/* Compile and link single C file, with object files.
- * Returns name of result, or NULL (and fills in errmsg). */
-char *compile_and_link(const void *ctx, const char *cfile, const char *objs,
- const char *extra_cflags, const char *libs,
- char **errmsg);
+char *compile_object(const void *ctx, const char *cfile, const char *ccandir,
+ char **errmsg);
+/* Compile and link single C file, with object files, libs, etc. */
+char *compile_and_link(const void *ctx, const char *cfile, const char *ccandir,
+ const char *objs, const char *extra_cflags,
+ const char *libs, char **errmsg);
+
+/* Default wait for run_command. Should never time out. */
+extern const unsigned int default_timeout_ms;
+