Index: acompnet.c
===================================================================
--- acompnet.c	(revision 30969)
+++ acompnet.c	(revision 30970)
@@ -47,7 +47,7 @@
 	rnd_coord_t r;
 } overlap_t;
 
-static pcb_r_dir_t overlap(const rnd_box_t *box, void *closure)
+static pcb_r_dir_t overlap(const rnd_rnd_box_t *box, void *closure)
 {
 	pcb_any_obj_t *obj = (pcb_any_obj_t *)box;
 	overlap_t *ovl = (overlap_t *)closure;
@@ -75,7 +75,7 @@
 
 TODO("move this to search.[ch]")
 /* Search for object(s) on a specific layer */
-static pcb_r_dir_t pcb_search_on_layer(pcb_layer_t *layer, const rnd_box_t *bbox, pcb_r_dir_t (*cb)(const rnd_box_t *box, void *closure), void *closure)
+static pcb_r_dir_t pcb_search_on_layer(pcb_layer_t *layer, const rnd_rnd_box_t *bbox, pcb_r_dir_t (*cb)(const rnd_rnd_box_t *box, void *closure), void *closure)
 {
 	pcb_r_dir_t res, fin = 0;
 
@@ -105,7 +105,7 @@
 static void acompnet_mesh_addpt(pcb_meshgraph_t *gr, pcb_layer_t *layer, double x, double y, int score, double sep)
 {
 	overlap_t ovl;
-	rnd_box_t bbox;
+	rnd_rnd_box_t bbox;
 
 	x = rnd_round(x);
 	y = rnd_round(y);
@@ -181,7 +181,7 @@
 	acompnet_mesh(&gr, PCB_CURRLAYER(PCB));
 
 	{ /* temporary hack for testing: fixed, off-mesh start/end */
-		rnd_box_t bbox;
+		rnd_rnd_box_t bbox;
 		bbox.X1 = PCB_MM_TO_COORD(6.35); bbox.X2 = bbox.X1+1;
 		bbox.Y1 = PCB_MM_TO_COORD(21.5); bbox.Y2 = bbox.Y1+1;
 		is = pcb_msgr_add_node(&gr, &bbox, 0);
Index: meshgraph.c
===================================================================
--- meshgraph.c	(revision 30969)
+++ meshgraph.c	(revision 30970)
@@ -40,12 +40,12 @@
 
 void pcb_msgr_init(pcb_meshgraph_t *gr)
 {
-	pcb_rtree_init(&gr->ntree);
+	rnd_rtree_init(&gr->ntree);
 	htip_init(&gr->id2node, longhash, longkeyeq);
 	gr->next_id = 1;
 }
 
-long int pcb_msgr_add_node(pcb_meshgraph_t *gr, rnd_box_t *bbox, int score)
+long int pcb_msgr_add_node(pcb_meshgraph_t *gr, rnd_rnd_box_t *bbox, int score)
 {
 	pcb_meshnode_t *nd = malloc(sizeof(pcb_meshnode_t));
 	nd->bbox = *bbox;
@@ -55,7 +55,7 @@
 	nd->fscore = INF_SCORE;
 	nd->iscore = score;
 
-	pcb_rtree_insert(&gr->ntree, nd, (pcb_rtree_box_t *)nd);
+	rnd_rtree_insert(&gr->ntree, nd, (rnd_rtree_box_t *)nd);
 	htip_set(&gr->id2node, nd->id, nd);
 	gr->next_id++;
 	return nd->id;
@@ -63,7 +63,7 @@
 
 static double msgr_connect(pcb_meshnode_t *curr, pcb_meshnode_t *next)
 {
-	pcb_point_t np, cp;
+	rnd_point_t np, cp;
 	pcb_route_t route;
 	pcb_route_init(&route);
 
@@ -102,9 +102,9 @@
 
 	htip_set(&open, startid, curr);
 	for(;;) {
-		pcb_rtree_box_t sb;
-		rnd_box_t *b;
-		pcb_rtree_it_t it;
+		rnd_rtree_box_t sb;
+		rnd_rnd_box_t *b;
+		rnd_rtree_it_t it;
 		double tentative_g, best;
 
 TODO("should use a faster way for picking lowest fscore")
@@ -136,7 +136,7 @@
 		sb.x2 = curr->bbox.X2 + SEARCHR;
 		sb.y1 = curr->bbox.Y1 - SEARCHR;
 		sb.y2 = curr->bbox.Y2 + SEARCHR;
-		for(b = pcb_rtree_first(&it, &gr->ntree, &sb); b != NULL; b = pcb_rtree_next(&it)) {
+		for(b = rnd_rtree_first(&it, &gr->ntree, &sb); b != NULL; b = rnd_rtree_next(&it)) {
 			next = (pcb_meshnode_t *)b;
 			if (htip_get(&closed, next->id) != NULL)
 				continue;
Index: meshgraph.h
===================================================================
--- meshgraph.h	(revision 30969)
+++ meshgraph.h	(revision 30970)
@@ -5,7 +5,7 @@
 #include <genht/htip.h>
 
 typedef struct {
-	rnd_box_t bbox;
+	rnd_rnd_box_t bbox;
 	long int id;
 	long int came_from;
 	double gscore, fscore;
@@ -14,13 +14,13 @@
 
 
 typedef struct {
-	pcb_rtree_t ntree;
+	rnd_rtree_t ntree;
 	htip_t id2node;
 	long int next_id;
 } pcb_meshgraph_t;
 
 void pcb_msgr_init(pcb_meshgraph_t *gr);
-long int pcb_msgr_add_node(pcb_meshgraph_t *gr, rnd_box_t *bbox, int score);
+long int pcb_msgr_add_node(pcb_meshgraph_t *gr, rnd_rnd_box_t *bbox, int score);
 int pcb_msgr_astar(pcb_meshgraph_t *gr, long int startid, long int endid);
 
 #endif