Index: exto_trdp.c
===================================================================
--- exto_trdp.c	(revision 37911)
+++ exto_trdp.c	(revision 37912)
@@ -64,15 +64,15 @@
 	}
 }
 
-static rnd_r_dir_t trdp_pstk_cb(const rnd_box_t *box, void *cl)
+static rnd_rtree_dir_t trdp_pstk_cb(void *cl, void *obj, const rnd_rtree_box_t *box)
 {
 	teardrop_t *tr = cl;
-	pcb_pstk_t *ps = (pcb_pstk_t *)box;
+	pcb_pstk_t *ps = (pcb_pstk_t *)obj;
 
 	if (teardrops_init_pstk(tr, ps, tr->line->parent.layer) == 0)
 		teardrop_line(tr, tr->line);
 
-	return RND_R_DIR_FOUND_CONTINUE;
+	return rnd_RTREE_DIR_FOUND_CONT;
 }
 
 /* create new teardrops on a line endpoint */
@@ -102,7 +102,7 @@
 	spot.X2 = x + 10;
 	spot.Y2 = y + 10;
 
-	rnd_r_search(pcb->Data->padstack_tree, &spot, NULL, trdp_pstk_cb, &t, NULL);
+	rnd_rtree_search_any(pcb->Data->padstack_tree, (rnd_rtree_box_t *)&spot, NULL, trdp_pstk_cb, &t, NULL);
 
 	if (t.new_arcs > 0) {
 		*jx = t.jx;
Index: teardrops.c
===================================================================
--- teardrops.c	(revision 37911)
+++ teardrops.c	(revision 37912)
@@ -245,15 +245,15 @@
 	return 0;
 }
 
-static rnd_r_dir_t check_line_callback(const rnd_box_t * box, void *cl)
+static rnd_rtree_dir_t check_line_callback(void *cl, void *obj, const rnd_rtree_box_t *box)
 {
 	teardrop_t *tr = cl;
-	pcb_line_t *line = (pcb_line_t *)box;
+	pcb_line_t *line = (pcb_line_t *)obj;
 
 	tr->flags = line->Flags;
 
 	teardrop_line(tr, line);
-	return RND_R_DIR_FOUND_CONTINUE;
+	return rnd_RTREE_DIR_FOUND_CONT;
 }
 
 static long check_pstk(pcb_board_t *pcb, pcb_pstk_t *ps)
@@ -280,7 +280,7 @@
 		spot.X2 = t.px + 10;
 		spot.Y2 = t.py + 10;
 
-		rnd_r_search(l->line_tree, &spot, NULL, check_line_callback, &t, NULL);
+		rnd_rtree_search_any(l->line_tree, (rnd_rtree_box_t *)&spot, NULL, check_line_callback, &t, NULL);
 	}
 	return t.new_arcs;
 }