Index: xy.c
===================================================================
--- xy.c	(revision 30902)
+++ xy.c	(revision 30903)
@@ -114,7 +114,7 @@
 		int len;
 
 		if (sep == NULL) {
-			pcb_message(PCB_MSG_ERROR, "export_xy: ignoring invalid template name (missing period): '%s'\n", li->name);
+			rnd_message(PCB_MSG_ERROR, "export_xy: ignoring invalid template name (missing period): '%s'\n", li->name);
 			continue;
 		}
 		if (strcmp(sep+1, "name") != 0)
@@ -121,7 +121,7 @@
 			continue;
 		len = sep - li->name;
 		if (len > sizeof(id)-1) {
-			pcb_message(PCB_MSG_ERROR, "export_xy: ignoring invalid template name (too long): '%s'\n", li->name);
+			rnd_message(PCB_MSG_ERROR, "export_xy: ignoring invalid template name (too long): '%s'\n", li->name);
 			continue;
 		}
 		memcpy(id, li->name, len);
@@ -131,7 +131,7 @@
 	}
 
 	if (fmt_names.used == 0) {
-		pcb_message(PCB_MSG_ERROR, "export_xy: can not set up export options: no template available\n");
+		rnd_message(PCB_MSG_ERROR, "export_xy: can not set up export options: no template available\n");
 		return NULL;
 	}
 
@@ -164,18 +164,18 @@
 	char utcTime[64];
 	char *name, *descr, *value;
 	const char *pad_netname;
-	pcb_coord_t x, y;
+	rnd_coord_t x, y;
 	double theta, xray_theta;
 	pcb_subc_t *subc;
-	pcb_coord_t pad_cx, pad_cy;
-	pcb_coord_t pad_w, pad_h;
-	pcb_coord_t prpad_cx, prpad_cy;
-	pcb_coord_t prpad_w, prpad_h;
+	rnd_coord_t pad_cx, pad_cy;
+	rnd_coord_t pad_w, pad_h;
+	rnd_coord_t prpad_cx, prpad_cy;
+	rnd_coord_t prpad_w, prpad_h;
 	pcb_cardinal_t count;
-	pcb_coord_t ox, oy;
+	rnd_coord_t ox, oy;
 	int origin_score;
 	char *origin_tmp;
-	pcb_bool front;
+	rnd_bool front;
 } subst_ctx_t;
 
 /* Find the pick and place 0;0 mark, if there is any */
@@ -208,7 +208,7 @@
 	}
 }
 
-static void calc_pad_bbox_(subst_ctx_t *ctx, pcb_coord_t *pw, pcb_coord_t *ph, pcb_coord_t *pcx, pcb_coord_t *pcy)
+static void calc_pad_bbox_(subst_ctx_t *ctx, rnd_coord_t *pw, rnd_coord_t *ph, rnd_coord_t *pcx, rnd_coord_t *pcy)
 {
 	pcb_box_t box;
 	box.X1 = box.Y1 = PCB_MAX_COORD;
@@ -282,7 +282,7 @@
 	}
 }
 
-static void calc_pad_bbox(subst_ctx_t *ctx, int prerot, pcb_coord_t *pw, pcb_coord_t *ph, pcb_coord_t *pcx, pcb_coord_t *pcy)
+static void calc_pad_bbox(subst_ctx_t *ctx, int prerot, rnd_coord_t *pw, rnd_coord_t *ph, rnd_coord_t *pcx, rnd_coord_t *pcy)
 {
 	if (prerot) {
 		pcb_subc_t *save, *sc_rot0;
@@ -391,7 +391,7 @@
 			end = strpbrk(*input, "?|%");
 			len = end - *input;
 			if (len >= sizeof(aname) - 1) {
-				pcb_message(PCB_MSG_ERROR, "xy tempalte error: attribute name '%s' too long\n", *input);
+				rnd_message(PCB_MSG_ERROR, "xy tempalte error: attribute name '%s' too long\n", *input);
 				return 1;
 			}
 			memcpy(aname, *input, len);
@@ -401,7 +401,7 @@
 				end = strchr(*input, '%');
 				len = end - *input;
 				if (len >= sizeof(unk_buf) - 1) {
-					pcb_message(PCB_MSG_ERROR, "xy tempalte error: elem atribute '|unknown' field '%s' too long\n", *input);
+					rnd_message(PCB_MSG_ERROR, "xy tempalte error: elem atribute '|unknown' field '%s' too long\n", *input);
 					return 1;
 				}
 				memcpy(unk_buf, *input, len);
@@ -414,7 +414,7 @@
 				end = strchr(*input, '%');
 				len = end - *input;
 				if (len >= sizeof(unk_buf) - 1) {
-					pcb_message(PCB_MSG_ERROR, "xy tempalte error: elem atribute trenary field '%s' too long\n", *input);
+					rnd_message(PCB_MSG_ERROR, "xy tempalte error: elem atribute trenary field '%s' too long\n", *input);
 					return 1;
 				}
 
@@ -646,7 +646,7 @@
 	}
 }
 
-static void xy_translate(subst_ctx_t *ctx, pcb_coord_t *x, pcb_coord_t *y)
+static void xy_translate(subst_ctx_t *ctx, rnd_coord_t *x, rnd_coord_t *y)
 {
 		/* translate the xy coords using explicit or implicit origin; implicit origin
 		   is lower left corner (looking from top) of board extents */
@@ -670,7 +670,7 @@
 
 	fp = pcb_fopen_askovr(&PCB->hidlib, xy_filename, "w", NULL);
 	if (!fp) {
-		pcb_message(PCB_MSG_ERROR, "Cannot open file %s for writing\n", xy_filename);
+		rnd_message(PCB_MSG_ERROR, "Cannot open file %s for writing\n", xy_filename);
 		return 1;
 	}
 
@@ -700,10 +700,10 @@
 		/* prefer the pnp-origin but if that doesn't exist, pick the subc origin */
 		if (!pcb_subc_find_aux_point(subc, "pnp-origin", &ctx.x, &ctx.y))
 			if (pcb_subc_get_origin(subc, &ctx.x, &ctx.y) != 0)
-				pcb_message(PCB_MSG_ERROR, "xy: can't get subc origin for %s\n", ctx.name);
+				rnd_message(PCB_MSG_ERROR, "xy: can't get subc origin for %s\n", ctx.name);
 
-		if (pcb_subc_get_rotation(subc, &ctx.theta) != 0) pcb_message(PCB_MSG_ERROR, "xy: can't get subc rotation for %s\n", ctx.name);
-		if (pcb_subc_get_side(subc, &bott) != 0) pcb_message(PCB_MSG_ERROR, "xy: can't get subc side for %s\n", ctx.name);
+		if (pcb_subc_get_rotation(subc, &ctx.theta) != 0) rnd_message(PCB_MSG_ERROR, "xy: can't get subc rotation for %s\n", ctx.name);
+		if (pcb_subc_get_side(subc, &bott) != 0) rnd_message(PCB_MSG_ERROR, "xy: can't get subc side for %s\n", ctx.name);
 
 		ctx.theta = -ctx.theta;
 		if (ctx.theta == -0)
@@ -759,7 +759,7 @@
 		char buff[256], *id, *sect;
 		int nl = strlen(i->name);
 		if (nl > sizeof(buff)-1) {
-			pcb_message(PCB_MSG_ERROR, "export_xy: ignoring template '%s': name too long\n", i->name);
+			rnd_message(PCB_MSG_ERROR, "export_xy: ignoring template '%s': name too long\n", i->name);
 			continue;
 		}
 		memcpy(buff, i->name, nl+1);
@@ -766,7 +766,7 @@
 		id = buff;
 		sect = strchr(id, '.');
 		if (sect == NULL) {
-			pcb_message(PCB_MSG_ERROR, "export_xy: ignoring template '%s': does not have a .section suffix\n", i->name);
+			rnd_message(PCB_MSG_ERROR, "export_xy: ignoring template '%s': does not have a .section suffix\n", i->name);
 			continue;
 		}
 		*sect = '\0';
@@ -819,7 +819,7 @@
 
 	tid = vts0_get(&fmt_ids, options[HA_format].lng, 0);
 	if ((tid == NULL) || (*tid == NULL)) {
-		pcb_message(PCB_MSG_ERROR, "export_xy: invalid template selected\n");
+		rnd_message(PCB_MSG_ERROR, "export_xy: invalid template selected\n");
 		return;
 	}
 	templ.hdr  = get_templ(*tid, "hdr");