Index: toolpath.c
===================================================================
--- toolpath.c	(revision 30911)
+++ toolpath.c	(revision 30912)
@@ -238,7 +238,7 @@
 		pcb_line_t *line;
 		pcb_arc_t *arc;
 		pcb_rtree_it_t it;
-		pcb_box_t otlbb;
+		rnd_box_t otlbb;
 		pcb_layer_id_t lid;
 		
 		otlbb.X1 = otlbb.Y1 = PCB_MAX_COORD;
@@ -254,11 +254,11 @@
 				continue;
 
 			for(line = (pcb_line_t *)pcb_r_first(l->line_tree, &it); line != NULL; line = (pcb_line_t *)pcb_r_next(&it))
-				rnd_box_bump_box(&otlbb, (pcb_box_t *)line);
+				rnd_box_bump_box(&otlbb, (rnd_box_t *)line);
 			pcb_r_end(&it);
 
 			for(arc = (pcb_arc_t *)pcb_r_first(l->arc_tree, &it); arc != NULL; arc = (pcb_arc_t *)pcb_r_next(&it))
-				rnd_box_bump_box(&otlbb, (pcb_box_t *)arc);
+				rnd_box_bump_box(&otlbb, (rnd_box_t *)arc);
 			pcb_r_end(&it);
 		}
 		result->fill = pcb_poly_new_from_rectangle(result->res_ply, otlbb.X1, otlbb.Y1, otlbb.X2, otlbb.Y2, 0, pcb_flag_make(PCB_FLAG_FULLPOLY));
@@ -351,7 +351,7 @@
 {
 	pline_ctx_t *ctx = ctx_;
 	pcb_line_t *l = (pcb_line_t *)ctx->cut, lo, vl;
-	pcb_box_t ip;
+	rnd_box_t ip;
 	double offs[2], ox, oy, vx, vy, len, r;
 
 	assert(ctx->cut->type == PCB_OBJ_LINE); /* need to handle arc later */