Index: export_openscad.c
===================================================================
--- export_openscad.c	(revision 30969)
+++ export_openscad.c	(revision 30970)
@@ -429,7 +429,7 @@
 	free(gc);
 }
 
-static void openscad_set_drawing_mode(pcb_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_box_t *screen)
+static void openscad_set_drawing_mode(pcb_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_rnd_box_t *screen)
 {
 	switch(op) {
 		case PCB_HID_COMP_RESET:
@@ -524,7 +524,7 @@
 	openscad_draw_line(gc, x1, y2, x1, y1);
 }
 
-static void openscad_draw_arc(pcb_hid_gc_t gc, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t width, rnd_coord_t height, pcb_angle_t start_angle, pcb_angle_t delta_angle)
+static void openscad_draw_arc(pcb_hid_gc_t gc, rnd_coord_t cx, rnd_coord_t cy, rnd_coord_t width, rnd_coord_t height, rnd_angle_t start_angle, rnd_angle_t delta_angle)
 {
 	double a, step = delta_angle/10.0, end_angle = start_angle + delta_angle;
 	int first;
@@ -621,7 +621,7 @@
 
 	PCB_POLY_ALL_LOOP(PCB->Data); {
 		pcb_poly_it_t it;
-		pcb_polyarea_t *pa;
+		rnd_polyarea_t *pa;
 
 		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon))
 			continue;
Index: scad_draw.c
===================================================================
--- scad_draw.c	(revision 30969)
+++ scad_draw.c	(revision 30970)
@@ -117,8 +117,8 @@
 
 static void scad_draw_drills(void)
 {
-	pcb_rtree_it_t it;
-	rnd_box_t *obj;
+	rnd_rtree_it_t it;
+	rnd_rnd_box_t *obj;
 
 	fprintf(f, "module pcb_drill() {\n");