Index: obj_term.h
===================================================================
--- obj_term.h	(revision 10891)
+++ obj_term.h	(revision 10892)
@@ -38,7 +38,6 @@
 #include <genht/htsp.h>
 #include <genvector/vtp0.h>
 #include "obj_common.h"
-#include "rats.h"
 
 typedef enum pcb_term_err_e {
 	PCB_TERM_ERR_SUCCESS = 0,
@@ -78,8 +77,8 @@
 /* Rename an object's ->term field in an undoable way */
 pcb_term_err_t pcb_term_undoable_rename(pcb_board_t *pcb, pcb_any_obj_t *obj, const char *new_name);
 
-/* Look up subc_name/term_name and put the result in conn. Returns true if found */
-pcb_bool pcb_term_find_name(pcb_data_t *data, const char *subc_name, const char *term_name, pcb_connection_t *conn, pcb_bool same);
+/* Look up subc_name/term_name and put the result in conn. Returns the object
+   or NULL if not found. If the *out parameters are non-NULL, load them */
+pcb_any_obj_t *pcb_term_find_name(pcb_data_t *data, const char *subc_name, const char *term_name, pcb_bool same, pcb_subc_t **parent_out, pcb_layergrp_id_t *gid_out);
 
-
 #endif