Index: read.c
===================================================================
--- read.c	(revision 30969)
+++ read.c	(revision 30970)
@@ -74,7 +74,7 @@
 };
 
 typedef struct {
-	const pcb_unit_t *unit;
+	const rnd_unit_t *unit;
 	node_t *subtree;
 	unsigned valid:1; /* whether it's already parsed */
 	pcb_pstk_shape_t shp;
@@ -81,7 +81,7 @@
 } hkp_shape_t;
 
 typedef struct {
-	const pcb_unit_t *unit;
+	const rnd_unit_t *unit;
 	node_t *subtree;
 	unsigned valid:1; /* whether it's already parsed */
 	unsigned plated:1;
@@ -90,7 +90,7 @@
 } hkp_hole_t;
 
 typedef struct {
-	const pcb_unit_t *unit;
+	const rnd_unit_t *unit;
 	node_t *subtree;
 	unsigned valid:1; /* whether it's already parsed */
 	pcb_pstk_proto_t proto;
@@ -113,8 +113,8 @@
 
 	int num_cop_layers;
 
-	const pcb_unit_t *unit;      /* default unit used while converting coords any given time */
-	const pcb_unit_t *pstk_unit; /* default unit for the padstacks file */
+	const rnd_unit_t *unit;      /* default unit used while converting coords any given time */
+	const rnd_unit_t *pstk_unit; /* default unit for the padstacks file */
 
 	hkp_netclass_t nc_dflt; /* for default clearances */
 
@@ -1123,7 +1123,7 @@
 
 		if (dt->subc_tree == NULL)
 			dt->subc_tree = pcb_r_create_tree();
-		pcb_r_insert_entry(dt->subc_tree, (rnd_box_t *)subc);
+		pcb_r_insert_entry(dt->subc_tree, (rnd_rnd_box_t *)subc);
 
 		pcb_subc_rebind(ctx->pcb, subc);
 	}
@@ -1158,7 +1158,7 @@
 	}
 }
 
-static const pcb_unit_t *parse_units(const char *ust)
+static const rnd_unit_t *parse_units(const char *ust)
 {
 	if (strcmp(ust, "MIL") == 0) return get_unit_struct("mil");
 	if (strcmp(ust, "TH") == 0)  return get_unit_struct("mil");
@@ -1260,7 +1260,7 @@
 
 	/* 'autocrop' the board for now (required by y mirror and unknown extents) */
 	{
-		rnd_box_t bb;
+		rnd_rnd_box_t bb;
 		pcb_data_normalize(ctx->pcb->Data);
 		pcb_data_bbox(&bb, ctx->pcb->Data, 0);
 		ctx->pcb->hidlib.size_x = bb.X2;
Index: read_pstk.c
===================================================================
--- read_pstk.c	(revision 30969)
+++ read_pstk.c	(revision 30970)
@@ -40,7 +40,7 @@
 
 static hkp_hole_t *parse_hole(hkp_ctx_t *ctx, const char *name)
 {
-	const pcb_unit_t *old_unit;
+	const rnd_unit_t *old_unit;
 	node_t *hr, *ho;
 	hkp_hole_t *h = htsp_get(&ctx->holes, name);
 
@@ -102,7 +102,7 @@
 } while(0)
 static hkp_shape_t *parse_shape(hkp_ctx_t *ctx, const char *name)
 {
-	const pcb_unit_t *old_unit;
+	const rnd_unit_t *old_unit;
 	node_t *n, *on, *tmp;
 	rnd_coord_t ox = 0, oy = 0;
 	hkp_shape_t *s = htsp_get(&ctx->shapes, name);
@@ -229,7 +229,7 @@
 
 static hkp_pstk_t *parse_pstk(hkp_ctx_t *ctx, const char *ps)
 {
-	const pcb_unit_t *old_unit;
+	const rnd_unit_t *old_unit;
 	rnd_coord_t ox = 0, oy = 0;
 	node_t *n, *hn, *on, *tn;
 	hkp_pstk_t *p = htsp_get(&ctx->pstks, ps);