Index: sketch_route.c
===================================================================
--- sketch_route.c	(revision 30969)
+++ sketch_route.c	(revision 30970)
@@ -71,7 +71,7 @@
 	htpp_t terminals; /* key - terminal object; value - cdt point */
 	vtwire_t wires;
 	vtewire_t ewires;
-	pcb_rtree_t *spoke_tree;
+	rnd_rtree_t *spoke_tree;
 	pcb_layer_t *ui_layer_cdt;
 	pcb_layer_t *ui_layer_erbs;
 } sketch_t;
@@ -653,7 +653,7 @@
 	sketch_t *sk;
 };
 
-static pcb_r_dir_t r_search_cb(const rnd_box_t *box, void *cl)
+static pcb_r_dir_t r_search_cb(const rnd_rnd_box_t *box, void *cl)
 {
 	pcb_any_obj_t *obj = (pcb_any_obj_t *) box;
 	struct search_info *i = (struct search_info *) cl;
@@ -690,7 +690,7 @@
 
 static void sketch_create_for_layer(sketch_t *sk, pcb_layer_t *layer)
 {
-	rnd_box_t bbox;
+	rnd_rnd_box_t bbox;
 	struct search_info info;
 	char name[256];
 
@@ -1081,8 +1081,8 @@
 	int i;
 	if (pcb_crosshair.AttachedObject.Type != PCB_OBJ_VOID) {
 		for (i = 0; i < vtp0_len(&attached_path.lines); i++) {
-			pcb_point_t *p1 = &((pcb_attached_line_t *) attached_path.lines.array[i])->Point1;
-			pcb_point_t *p2 = &((pcb_attached_line_t *) attached_path.lines.array[i])->Point2;
+			rnd_point_t *p1 = &((pcb_attached_line_t *) attached_path.lines.array[i])->Point1;
+			rnd_point_t *p2 = &((pcb_attached_line_t *) attached_path.lines.array[i])->Point2;
 			pcb_render->draw_line(pcb_crosshair.GC, p1->X, p1->Y, p2->X, p2->Y);
 		}
 	}
Index: spoke.c
===================================================================
--- spoke.c	(revision 30969)
+++ spoke.c	(revision 30970)
@@ -27,7 +27,7 @@
 
 static void spoke_pos(spoke_t *sp, rnd_coord_t spacing, rnd_coord_t *x, rnd_coord_t *y)
 {
-	rnd_box_t *obj_bbox = &((pointdata_t *) sp->p->data)->obj->bbox_naked;
+	rnd_rnd_box_t *obj_bbox = &((pointdata_t *) sp->p->data)->obj->bbox_naked;
 	rnd_coord_t half_obj_w, half_obj_h;
 
 	half_obj_w = (obj_bbox->X2 - obj_bbox->X1 + 1) / 2;
Index: spoke.h
===================================================================
--- spoke.h	(revision 30969)
+++ spoke.h	(revision 30970)
@@ -18,7 +18,7 @@
 
 struct spoke_s {
   spoke_dir_t dir;
-	rnd_box_t bbox;
+	rnd_rnd_box_t bbox;
 	vtp0_t slots;
   point_t *p;
 };