Index: propdlg.c
===================================================================
--- propdlg.c	(revision 30902)
+++ propdlg.c	(revision 30903)
@@ -216,7 +216,7 @@
 }
 
 
-static pcb_bool prop_prv_mouse_cb(pcb_hid_attribute_t *attrib, pcb_hid_preview_t *prv, pcb_hid_mouse_ev_t kind, pcb_coord_t x, pcb_coord_t y)
+static rnd_bool prop_prv_mouse_cb(pcb_hid_attribute_t *attrib, pcb_hid_preview_t *prv, pcb_hid_mouse_ev_t kind, rnd_coord_t x, rnd_coord_t y)
 {
 	return pcb_false; /* don't redraw */
 }
@@ -421,15 +421,15 @@
 	propdlg_t *ctx = caller_data;
 	pcb_hid_row_t *r = pcb_dad_tree_get_selected(&ctx->dlg[ctx->wtree]);
 	if (r == NULL) {
-		pcb_message(PCB_MSG_ERROR, "can not delete: no attribute selected\n");
+		rnd_message(PCB_MSG_ERROR, "can not delete: no attribute selected\n");
 		return;
 	}
 	if (r->path[0] != 'a') {
-		pcb_message(PCB_MSG_ERROR, "Only atributes (a/ subtree) can be deleted.\n");
+		rnd_message(PCB_MSG_ERROR, "Only atributes (a/ subtree) can be deleted.\n");
 		return;
 	}
 	if (pcb_propsel_del(&ctx->pe, r->path) < 1) {
-		pcb_message(PCB_MSG_ERROR, "Failed to remove the attribute from any object.\n");
+		rnd_message(PCB_MSG_ERROR, "Failed to remove the attribute from any object.\n");
 		return;
 	}
 	prop_refresh(ctx);
Index: propedit.c
===================================================================
--- propedit.c	(revision 30902)
+++ propedit.c	(revision 30903)
@@ -56,7 +56,7 @@
 		pcb_objtype_t type = pcb_search_obj_by_location(PCB_OBJ_SUBC, &o1, &o2, &o3, pcb_crosshair.X, pcb_crosshair.Y, PCB_SLOP);
 		if (type == 0) {
 			if (!quiet)
-				pcb_message(PCB_MSG_ERROR, "No object under the cursor\n");
+				rnd_message(PCB_MSG_ERROR, "No object under the cursor\n");
 			return FGW_ERR_ARG_CONV;
 		}
 		goto object_scope;
@@ -66,7 +66,7 @@
 			idp = pcb_str2idpath(pe->pcb, cmd+7);
 			if (idp == NULL) {
 				if (!quiet)
-					pcb_message(PCB_MSG_ERROR, "Failed to convert object ID: '%s'\n", cmd+7);
+					rnd_message(PCB_MSG_ERROR, "Failed to convert object ID: '%s'\n", cmd+7);
 				return FGW_ERR_ARG_CONV;
 			}
 			pcb_idpath_list_append(&pe->objs, idp);
@@ -80,7 +80,7 @@
 				type = pcb_search_obj_by_location(PCB_OBJ_CLASS_REAL, &o1, &o2, &o3, pcb_crosshair.X, pcb_crosshair.Y, PCB_SLOP);
 			if (type == 0) {
 				if (!quiet)
-					pcb_message(PCB_MSG_ERROR, "No object under the cursor\n");
+					rnd_message(PCB_MSG_ERROR, "No object under the cursor\n");
 				return FGW_ERR_ARG_CONV;
 			}
 			object_scope:;
@@ -87,7 +87,7 @@
 			idp = pcb_obj2idpath(o2);
 			if (idp == NULL) {
 				if (!quiet)
-					pcb_message(PCB_MSG_ERROR, "Object under the cursor has no idpath\n");
+					rnd_message(PCB_MSG_ERROR, "Object under the cursor has no idpath\n");
 				return FGW_ERR_ARG_CONV;
 			}
 			pcb_idpath_list_append(&pe->objs, idp);
@@ -99,7 +99,7 @@
 				id = pcb_layergrp_str2id(pe->pcb, cmd+9);
 				if (id < 0) {
 					if (!quiet)
-						pcb_message(PCB_MSG_ERROR, "Invalid layergrp ID '%s'\n", cmd+9);
+						rnd_message(PCB_MSG_ERROR, "Invalid layergrp ID '%s'\n", cmd+9);
 					return FGW_ERR_ARG_CONV;
 				}
 			}
@@ -116,7 +116,7 @@
 			id = pcb_layer_str2id(pe->data, cmd+6);
 			if (id < 0) {
 				if (!quiet)
-					pcb_message(PCB_MSG_ERROR, "Invalid layer ID '%s'\n", cmd+6);
+					rnd_message(PCB_MSG_ERROR, "Invalid layer ID '%s'\n", cmd+6);
 				return FGW_ERR_ARG_CONV;
 			}
 			vtl0_append(&pe->layers, id);
@@ -147,7 +147,7 @@
 			return 0;
 		}
 		if (!quiet)
-			pcb_message(PCB_MSG_ERROR, "Invalid scope: %s\n", cmd);
+			rnd_message(PCB_MSG_ERROR, "Invalid scope: %s\n", cmd);
 		return FGW_ERR_ARG_CONV;
 	}
 	return 0;
@@ -355,12 +355,12 @@
 	PCB_API_CHK_VER;
 
 	if (sizeof(long) < sizeof(pcb_layer_id_t)) {
-		pcb_message(PCB_MSG_ERROR, "can't load propedig: layer id type wider than long\n");
+		rnd_message(PCB_MSG_ERROR, "can't load propedig: layer id type wider than long\n");
 		return -1;
 	}
 
 	if (sizeof(long) < sizeof(pcb_layergrp_id_t)) {
-		pcb_message(PCB_MSG_ERROR, "can't load propedig: layergrp id type wider than long\n");
+		rnd_message(PCB_MSG_ERROR, "can't load propedig: layergrp id type wider than long\n");
 		return -1;
 	}
 
Index: props.h
===================================================================
--- props.h	(revision 30902)
+++ props.h	(revision 30903)
@@ -55,7 +55,7 @@
 
 typedef union {
 	const char *string;
-	pcb_coord_t coord;
+	rnd_coord_t coord;
 	pcb_angle_t angle;
 	int i;
 	pcb_color_t clr;
Index: propsel.c
===================================================================
--- propsel.c	(revision 30902)
+++ propsel.c	(revision 30903)
@@ -50,7 +50,7 @@
 
 /*********** map ***********/
 #define type2field_String string
-#define type2field_pcb_coord_t coord
+#define type2field_rnd_coord_t coord
 #define type2field_pcb_angle_t angle
 #define type2field_int i
 #define type2field_bool i
@@ -57,7 +57,7 @@
 #define type2field_color clr
 
 #define type2TYPE_String PCB_PROPT_STRING
-#define type2TYPE_pcb_coord_t PCB_PROPT_COORD
+#define type2TYPE_rnd_coord_t PCB_PROPT_COORD
 #define type2TYPE_pcb_angle_t PCB_PROPT_ANGLE
 #define type2TYPE_int PCB_PROPT_INT
 #define type2TYPE_bool PCB_PROPT_BOOL
@@ -125,8 +125,8 @@
 {
 	map_add_prop(ctx, "p/board/name",   String, pcb->hidlib.name);
 	map_add_prop(ctx, "p/board/filename",   String, pcb->hidlib.filename);
-	map_add_prop(ctx, "p/board/width", pcb_coord_t, pcb->hidlib.size_x);
-	map_add_prop(ctx, "p/board/height", pcb_coord_t, pcb->hidlib.size_y);
+	map_add_prop(ctx, "p/board/width", rnd_coord_t, pcb->hidlib.size_x);
+	map_add_prop(ctx, "p/board/height", rnd_coord_t, pcb->hidlib.size_y);
 	map_attr(ctx, &pcb->Attributes);
 }
 
@@ -172,44 +172,44 @@
 
 static void map_line(pcb_propedit_t *ctx, pcb_line_t *line)
 {
-	map_add_prop(ctx, "p/trace/thickness", pcb_coord_t, line->Thickness);
-	map_add_prop(ctx, "p/trace/clearance", pcb_coord_t, line->Clearance/2);
+	map_add_prop(ctx, "p/trace/thickness", rnd_coord_t, line->Thickness);
+	map_add_prop(ctx, "p/trace/clearance", rnd_coord_t, line->Clearance/2);
 	map_common(ctx, (pcb_any_obj_t *)line);
 	map_attr(ctx, &line->Attributes);
 	if (ctx->geo) {
-		map_add_prop(ctx, "p/line/x1", pcb_coord_t, line->Point1.X);
-		map_add_prop(ctx, "p/line/y1", pcb_coord_t, line->Point1.Y);
-		map_add_prop(ctx, "p/line/x2", pcb_coord_t, line->Point2.X);
-		map_add_prop(ctx, "p/line/y2", pcb_coord_t, line->Point2.Y);
+		map_add_prop(ctx, "p/line/x1", rnd_coord_t, line->Point1.X);
+		map_add_prop(ctx, "p/line/y1", rnd_coord_t, line->Point1.Y);
+		map_add_prop(ctx, "p/line/x2", rnd_coord_t, line->Point2.X);
+		map_add_prop(ctx, "p/line/y2", rnd_coord_t, line->Point2.Y);
 	}
 }
 
 static void map_arc(pcb_propedit_t *ctx, pcb_arc_t *arc)
 {
-	map_add_prop(ctx, "p/trace/thickness", pcb_coord_t, arc->Thickness);
-	map_add_prop(ctx, "p/trace/clearance", pcb_coord_t, arc->Clearance/2);
-	map_add_prop(ctx, "p/arc/width",       pcb_coord_t, arc->Width);
-	map_add_prop(ctx, "p/arc/height",      pcb_coord_t, arc->Height);
+	map_add_prop(ctx, "p/trace/thickness", rnd_coord_t, arc->Thickness);
+	map_add_prop(ctx, "p/trace/clearance", rnd_coord_t, arc->Clearance/2);
+	map_add_prop(ctx, "p/arc/width",       rnd_coord_t, arc->Width);
+	map_add_prop(ctx, "p/arc/height",      rnd_coord_t, arc->Height);
 	map_add_prop(ctx, "p/arc/angle/start", pcb_angle_t, arc->StartAngle);
 	map_add_prop(ctx, "p/arc/angle/delta", pcb_angle_t, arc->Delta);
 	map_common(ctx, (pcb_any_obj_t *)arc);
 	map_attr(ctx, &arc->Attributes);
 	if (ctx->geo) {
-		map_add_prop(ctx, "p/arc/x", pcb_coord_t, arc->X);
-		map_add_prop(ctx, "p/arc/y", pcb_coord_t, arc->Y);
+		map_add_prop(ctx, "p/arc/x", rnd_coord_t, arc->X);
+		map_add_prop(ctx, "p/arc/y", rnd_coord_t, arc->Y);
 	}
 }
 
 static void map_gfx(pcb_propedit_t *ctx, pcb_gfx_t *gfx)
 {
-	map_add_prop(ctx, "p/gfx/sx",      pcb_coord_t, gfx->sx);
-	map_add_prop(ctx, "p/gfx/sy",      pcb_coord_t, gfx->sy);
+	map_add_prop(ctx, "p/gfx/sx",      rnd_coord_t, gfx->sx);
+	map_add_prop(ctx, "p/gfx/sy",      rnd_coord_t, gfx->sy);
 	map_add_prop(ctx, "p/gfx/rot",     pcb_angle_t, gfx->rot);
 	map_common(ctx, (pcb_any_obj_t *)gfx);
 	map_attr(ctx, &gfx->Attributes);
 	if (ctx->geo) {
-		map_add_prop(ctx, "p/gfx/cx",      pcb_coord_t, gfx->cx);
-		map_add_prop(ctx, "p/gfx/cy",      pcb_coord_t, gfx->cy);
+		map_add_prop(ctx, "p/gfx/cx",      rnd_coord_t, gfx->cx);
+		map_add_prop(ctx, "p/gfx/cy",      rnd_coord_t, gfx->cy);
 	}
 }
 
@@ -218,13 +218,13 @@
 	map_add_prop(ctx, "p/text/scale", int, text->Scale);
 	map_add_prop(ctx, "p/text/fid", int, text->fid);
 	map_add_prop(ctx, "p/text/rotation",  pcb_angle_t, text->rot);
-	map_add_prop(ctx, "p/text/thickness", pcb_coord_t, text->thickness);
+	map_add_prop(ctx, "p/text/thickness", rnd_coord_t, text->thickness);
 	map_add_prop(ctx, "p/text/string", String, text->TextString);
 	map_common(ctx, (pcb_any_obj_t *)text);
 	map_attr(ctx, &text->Attributes);
 	if (ctx->geo) {
-		map_add_prop(ctx, "p/text/x", pcb_coord_t, text->X);
-		map_add_prop(ctx, "p/text/y", pcb_coord_t, text->Y);
+		map_add_prop(ctx, "p/text/x", rnd_coord_t, text->X);
+		map_add_prop(ctx, "p/text/y", rnd_coord_t, text->Y);
 	}
 }
 
@@ -232,7 +232,7 @@
 {
 	map_attr(ctx, &poly->Attributes);
 	map_common(ctx, (pcb_any_obj_t *)poly);
-	map_add_prop(ctx, "p/trace/clearance", pcb_coord_t, poly->Clearance/2);
+	map_add_prop(ctx, "p/trace/clearance", rnd_coord_t, poly->Clearance/2);
 }
 
 static void map_pstk(pcb_propedit_t *ctx, pcb_pstk_t *ps)
@@ -239,14 +239,14 @@
 {
 	pcb_pstk_proto_t *proto;
 
-	map_add_prop(ctx, "p/padstack/xmirror", pcb_coord_t, ps->xmirror);
-	map_add_prop(ctx, "p/padstack/smirror", pcb_coord_t, ps->smirror);
+	map_add_prop(ctx, "p/padstack/xmirror", rnd_coord_t, ps->xmirror);
+	map_add_prop(ctx, "p/padstack/smirror", rnd_coord_t, ps->smirror);
 	map_add_prop(ctx, "p/padstack/rotation", pcb_angle_t, ps->rot);
-	map_add_prop(ctx, "p/padstack/proto", pcb_coord_t, ps->proto);
+	map_add_prop(ctx, "p/padstack/proto", rnd_coord_t, ps->proto);
 
 	proto = pcb_pstk_get_proto(ps);
-	map_add_prop(ctx, "p/padstack/clearance", pcb_coord_t, ps->Clearance);
-	map_add_prop(ctx, "p/padstack/hole", pcb_coord_t, proto->hdia);
+	map_add_prop(ctx, "p/padstack/clearance", rnd_coord_t, ps->Clearance);
+	map_add_prop(ctx, "p/padstack/hole", rnd_coord_t, proto->hdia);
 	map_add_prop(ctx, "p/padstack/plated", int, proto->hplated);
 	map_add_prop(ctx, "p/padstack/htop", int, proto->htop);
 	map_add_prop(ctx, "p/padstack/hbottom", int, proto->hbottom);
@@ -255,8 +255,8 @@
 	map_common(ctx, (pcb_any_obj_t *)ps);
 
 	if (ctx->geo) {
-		map_add_prop(ctx, "p/padstack/x", pcb_coord_t, ps->x);
-		map_add_prop(ctx, "p/padstack/y", pcb_coord_t, ps->y);
+		map_add_prop(ctx, "p/padstack/x", rnd_coord_t, ps->x);
+		map_add_prop(ctx, "p/padstack/y", rnd_coord_t, ps->y);
 	}
 }
 
@@ -290,10 +290,10 @@
 	map_common(ctx, (pcb_any_obj_t *)msubc);
 
 	if (ctx->geo) {
-		pcb_coord_t x, y;
+		rnd_coord_t x, y;
 		if (pcb_subc_get_origin(msubc, &x, &y) == 0) {
-			map_add_prop(ctx, "p/subcircuit/x", pcb_coord_t, x);
-			map_add_prop(ctx, "p/subcircuit/y", pcb_coord_t, y);
+			map_add_prop(ctx, "p/subcircuit/x", rnd_coord_t, x);
+			map_add_prop(ctx, "p/subcircuit/y", rnd_coord_t, y);
 		}
 	}
 }
@@ -391,7 +391,7 @@
 	return 0;
 }
 
-static int brd_resize(pcb_coord_t w, pcb_coord_t h)
+static int brd_resize(rnd_coord_t w, rnd_coord_t h)
 {
 	pcb_board_resize(w, h, 0);
 	return 1;
@@ -792,7 +792,7 @@
 
 	if (strncmp(st->name, "p/subcircuit/", 13) == 0) {
 		pcb_opctx_t op;
-		pcb_coord_t x = 0, y = 0;
+		rnd_coord_t x = 0, y = 0;
 		const char *pn = st->name + 13;
 
 		pcb_subc_get_origin(ssubc, &x, &y);
Index: propsel.h
===================================================================
--- propsel.h	(revision 30902)
+++ propsel.h	(revision 30903)
@@ -29,10 +29,10 @@
 
 typedef struct set_ctx_s {
 	const char *s; /* only for string */
-	pcb_coord_t c; /* also int */
+	rnd_coord_t c; /* also int */
 	double d;
 	pcb_color_t color;
-	pcb_bool c_absolute, d_absolute, c_valid, d_valid, clr_valid;
+	rnd_bool c_absolute, d_absolute, c_valid, d_valid, clr_valid;
 
 	/* private */
 	unsigned is_trace:1;