Index: excitation.c
===================================================================
--- excitation.c	(revision 30969)
+++ excitation.c	(revision 30970)
@@ -145,7 +145,7 @@
 
 static rnd_bool to_hz(const char *s, double *out)
 {
-	const pcb_unit_t *u;
+	const rnd_unit_t *u;
 	double d;
 	if (!pcb_get_value_unit(s, NULL, 0, &d, &u))
 		return pcb_false;
Index: export_openems.c
===================================================================
--- export_openems.c	(revision 30969)
+++ export_openems.c	(revision 30970)
@@ -708,7 +708,7 @@
 	free(gc);
 }
 
-static void openems_set_drawing_mode(pcb_hid_t *hid, pcb_composite_op_t op, rnd_bool direct, const rnd_box_t *screen)
+static void openems_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:
@@ -752,7 +752,7 @@
 {
 }
 
-static void openems_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 openems_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)
 {
 }
 
Index: mesh.c
===================================================================
--- mesh.c	(revision 30969)
+++ mesh.c	(revision 30970)
@@ -386,7 +386,7 @@
 
 	polylist_foreach(&layer->Polygon, &it, poly) {
 		pcb_poly_it_t it;
-		pcb_polyarea_t *pa;
+		rnd_polyarea_t *pa;
 
 		for(pa = pcb_poly_island_first(poly, &it); pa != NULL; pa = pcb_poly_island_next(&it)) {
 			rnd_coord_t x, y;