Index: read.c
===================================================================
--- read.c	(revision 30969)
+++ read.c	(revision 30970)
@@ -52,8 +52,8 @@
 typedef struct {
 	gsxl_dom_t dom;
 	pcb_board_t *pcb;
-	const pcb_unit_t *unit;
-	rnd_box_t bbox; /* board's bbox from the boundary subtrees, in the file's coordinate system */
+	const rnd_unit_t *unit;
+	rnd_rnd_box_t bbox; /* board's bbox from the boundary subtrees, in the file's coordinate system */
 	htsp_t name2layer;
 	htsp_t protos; /* padstack prototypes - allocated for the hash, copied on placement */
 	htsp_t subcs;  /* subc images - allocated for the hash, copied on placement */
@@ -129,9 +129,9 @@
 		} \
 	} while(0)
 
-static const pcb_unit_t *push_unit(dsn_read_t *ctx, gsxl_node_t *nu)
+static const rnd_unit_t *push_unit(dsn_read_t *ctx, gsxl_node_t *nu)
 {
-	const pcb_unit_t *old = ctx->unit;
+	const rnd_unit_t *old = ctx->unit;
 	char *su, *s;
 
 	if ((nu == NULL) || (nu->children == NULL))
@@ -149,7 +149,7 @@
 	return old;
 }
 
-static void pop_unit(dsn_read_t *ctx, const pcb_unit_t *saved)
+static void pop_unit(dsn_read_t *ctx, const rnd_unit_t *saved)
 {
 	ctx->unit = saved;
 }
@@ -156,9 +156,9 @@
 
 /* Search a subtree for a unit descriptor and push it and return the old.
    Returns NULL if nothing found/pushed */
-static const pcb_unit_t *dsn_set_old_unit(dsn_read_t *ctx, gsxl_node_t *nd)
+static const rnd_unit_t *dsn_set_old_unit(dsn_read_t *ctx, gsxl_node_t *nd)
 {
-	const pcb_unit_t *old_unit = NULL;
+	const rnd_unit_t *old_unit = NULL;
 	gsxl_node_t *n;
 
 	for(n = nd; n != NULL; n = n->next) {
@@ -189,7 +189,7 @@
 		rnd_attribute_put(attr, STRE(kv), STRE(kv->children));
 }
 
-static int dsn_parse_rect(dsn_read_t *ctx, rnd_box_t *dst, gsxl_node_t *src, int no_y_flip)
+static int dsn_parse_rect(dsn_read_t *ctx, rnd_rnd_box_t *dst, gsxl_node_t *src, int no_y_flip)
 {
 	rnd_coord_t x, y;
 
@@ -294,7 +294,7 @@
 				boundary_line(oly, lx, ly, x, y, aper);
 		}
 		else if (rnd_strcasecmp(bnd->str, "rect") == 0) {
-			rnd_box_t box;
+			rnd_rnd_box_t box;
 
 			b = gsxl_children(bnd);
 			if ((b->next == NULL) || (b->next->next == NULL)) {
@@ -370,7 +370,7 @@
 	gsxl_node_t *n, *i;
 	pcb_layergrp_t *topcop = NULL, *botcop = NULL, *grp;
 	pcb_layergrp_id_t gid;
-	const pcb_unit_t *old_unit;
+	const rnd_unit_t *old_unit;
 	const pcb_dflgmap_t doclayers[] = {
 		{"top_outline",         PCB_LYT_TOP | PCB_LYT_DOC,    "outline", PCB_LYC_AUTO, 0},
 		{"bot_outline",         PCB_LYT_BOTTOM | PCB_LYT_DOC, "outline", PCB_LYC_AUTO, 0},
@@ -538,7 +538,7 @@
 
 int dsn_parse_pstk_shape_rect(dsn_read_t *ctx, gsxl_node_t *nd, pcb_pstk_shape_t *shp)
 {
-	rnd_box_t box;
+	rnd_rnd_box_t box;
 	gsxl_node_t *args = nd->children->next;
 
 	if (dsn_parse_rect(ctx, &box, args, 1) != 0)
@@ -729,7 +729,7 @@
 
 static int dsn_parse_lib_padstack(dsn_read_t *ctx, gsxl_node_t *wrr)
 {
-	const pcb_unit_t *old_unit;
+	const rnd_unit_t *old_unit;
 	gsxl_node_t *n;
 	pcb_pstk_proto_t *prt;
 	pcb_pstk_shape_t hole;
@@ -954,7 +954,7 @@
 
 static int dsn_parse_lib_image(dsn_read_t *ctx, gsxl_node_t *imr)
 {
-	const pcb_unit_t *old_unit;
+	const rnd_unit_t *old_unit;
 	pcb_subc_t *subc;
 	char *id;
 	int n;
@@ -1049,7 +1049,7 @@
 
 static int dsn_parse_library(dsn_read_t *ctx, gsxl_node_t *wrr)
 {
-	const pcb_unit_t *old_unit;
+	const rnd_unit_t *old_unit;
 	gsxl_node_t *n;
 
 	old_unit = dsn_set_old_unit(ctx, wrr->children);
@@ -1186,7 +1186,7 @@
 
 static int dsn_parse_wire_rect(dsn_read_t *ctx, gsxl_node_t *wrr, pcb_subc_t *subc, pcb_layer_t *force_ly)
 {
-	rnd_box_t box;
+	rnd_rnd_box_t box;
 	gsxl_node_t *net = wrr->children;
 	pcb_layer_t *ly;
 
@@ -1492,7 +1492,7 @@
 
 static int dsn_parse_wiring(dsn_read_t *ctx, gsxl_node_t *wrr)
 {
-	const pcb_unit_t *old_unit;
+	const rnd_unit_t *old_unit;
 
 	old_unit = dsn_set_old_unit(ctx, wrr->children);
 
@@ -1589,7 +1589,7 @@
 
 static int dsn_parse_placement(dsn_read_t *ctx, gsxl_node_t *plr)
 {
-	const pcb_unit_t *old_unit;
+	const rnd_unit_t *old_unit;
 	int mirror_first = 1;
 
 	old_unit = dsn_set_old_unit(ctx, plr->children);