Index: act_draw.c
===================================================================
--- act_draw.c	(revision 30902)
+++ act_draw.c	(revision 30903)
@@ -44,7 +44,7 @@
 
 static int flg_error(const char *msg)
 {
-	pcb_message(PCB_MSG_ERROR, "act_draw flag conversion error: %s\n", msg);
+	rnd_message(PCB_MSG_ERROR, "act_draw flag conversion error: %s\n", msg);
 	return 0;
 }
 
@@ -72,7 +72,7 @@
 	pcb_line_t *line;
 	pcb_data_t *data;
 	pcb_layer_t *layer;
-	pcb_coord_t x1, y1, x2, y2, th, cl;
+	rnd_coord_t x1, y1, x2, y2, th, cl;
 	pcb_flag_t flags;
 	DRAWOPTARG;
 
@@ -109,7 +109,7 @@
 	pcb_arc_t *arc;
 	pcb_data_t *data;
 	pcb_layer_t *layer;
-	pcb_coord_t cx, cy, hr, wr, th, cl;
+	rnd_coord_t cx, cy, hr, wr, th, cl;
 	double sa, da;
 	pcb_flag_t flags;
 	DRAWOPTARG;
@@ -149,7 +149,7 @@
 	pcb_text_t *text = NULL;
 	pcb_data_t *data;
 	pcb_layer_t *layer;
-	pcb_coord_t x, y, th;
+	rnd_coord_t x, y, th;
 	int scale, fontid;
 	double rot;
 	pcb_flag_t flags;
@@ -177,7 +177,7 @@
 		text = pcb_text_new(layer, font, x, y, rot, scale, th, str, flags);
 	}
 	else
-		pcb_message(PCB_MSG_ERROR, "NewText: font %d not found\n", fontid);
+		rnd_message(PCB_MSG_ERROR, "NewText: font %d not found\n", fontid);
 
 	if (text != NULL) {
 		RET_IDPATH(text);
@@ -195,7 +195,7 @@
 	pcb_pstk_t *pstk;
 	pcb_data_t *data;
 	long proto;
-	pcb_coord_t x, y, cl;
+	rnd_coord_t x, y, cl;
 	pcb_flag_t flags;
 	DRAWOPTARG;
 
@@ -226,7 +226,7 @@
 	pcb_poly_t *poly;
 	pcb_data_t *data;
 	pcb_layer_t *layer;
-	pcb_coord_t x1, y1, x2, y2, cl;
+	rnd_coord_t x1, y1, x2, y2, cl;
 	pcb_flag_t flags;
 	DRAWOPTARG;
 
@@ -259,7 +259,7 @@
 	long len;
 	char *s, *next, *tmp = pcb_strdup(ptlist);
 	double c[2];
-	pcb_bool success;
+	rnd_bool success;
 
 	s = tmp;
 	while (isspace(*s) || (*s == ',')) s++;
@@ -274,7 +274,7 @@
 		}
 		c[len % 2] = pcb_get_value_ex(s, NULL, NULL, NULL, "mm", &success);
 		if (!success) {
-			pcb_message(PCB_MSG_ERROR, "act_draw ptlist processing: '%s' is not a valid coordinate\n", s);
+			rnd_message(PCB_MSG_ERROR, "act_draw ptlist processing: '%s' is not a valid coordinate\n", s);
 			free(tmp);
 			return -1;
 		}
@@ -283,7 +283,7 @@
 	}
 	free(tmp);
 	if ((len % 2) == 1) {
-		pcb_message(PCB_MSG_ERROR, "act_draw ptlist processing: odd number of points\n");
+		rnd_message(PCB_MSG_ERROR, "act_draw ptlist processing: odd number of points\n");
 		return -1;
 	}
 	return len/2;
@@ -297,7 +297,7 @@
 	pcb_poly_t *poly;
 	pcb_data_t *data;
 	pcb_layer_t *layer;
-	pcb_coord_t cl;
+	rnd_coord_t cl;
 	pcb_flag_t flags;
 	DRAWOPTARG;
 
@@ -334,7 +334,7 @@
 	pcb_poly_t *poly;
 	pcb_data_t *data;
 	pcb_layer_t *layer;
-	pcb_coord_t cl;
+	rnd_coord_t cl;
 	pcb_flag_t flags;
 	DRAWOPTARG;
 	(void)noundo;
@@ -368,7 +368,7 @@
 	RND_PCB_ACT_CONVARG(1+ao, FGW_PTR, PolyNewPoints, poly = argv[1+ao].val.ptr_void);
 	RND_PCB_ACT_CONVARG(2+ao, FGW_STR, PolyNewPoints, ptlist = argv[2+ao].val.str);
 	if (!fgw_ptr_in_domain(&rnd_fgw, &argv[1], PTR_DOMAIN_POLY)) {
-		pcb_message(PCB_MSG_ERROR, "PolyNewPoints: invalid polygon pointer\n");
+		rnd_message(PCB_MSG_ERROR, "PolyNewPoints: invalid polygon pointer\n");
 		RND_ACT_IRES(-1);
 		return 0;
 	}
@@ -394,12 +394,12 @@
 	RND_PCB_ACT_CONVARG(2+ao, FGW_LAYER, PolyNewFromPoints, layer = fgw_layer(&argv[2+ao]));
 	RND_PCB_ACT_CONVARG(3+ao, FGW_PTR, PolyNewPoints, poly = argv[3+ao].val.ptr_void);
 	if (!fgw_ptr_in_domain(&rnd_fgw, &argv[1], PTR_DOMAIN_POLY)) {
-		pcb_message(PCB_MSG_ERROR, "PolyNewEnd: invalid polygon pointer\n");
+		rnd_message(PCB_MSG_ERROR, "PolyNewEnd: invalid polygon pointer\n");
 		RND_ACT_IRES(0);
 		return 0;
 	}
 	if (poly->PointN < 3) {
-		pcb_message(PCB_MSG_ERROR, "PolyNewEnd: can not finish polygon, need at least 3 points\n");
+		rnd_message(PCB_MSG_ERROR, "PolyNewEnd: can not finish polygon, need at least 3 points\n");
 		RND_ACT_IRES(0);
 		return 0;
 	}
@@ -432,7 +432,7 @@
 	RND_PCB_ACT_CONVARG(2+ao, FGW_LAYER, LayerObjDup, layer = fgw_layer(&argv[2+ao]));
 	RND_PCB_ACT_CONVARG(3+ao, FGW_PTR, LayerObjDup, idp = argv[3+ao].val.ptr_void);
 	if (!fgw_ptr_in_domain(&rnd_fgw, &argv[3], RND_PTR_DOMAIN_IDPATH)) {
-		pcb_message(PCB_MSG_ERROR, "LayerObjDup: invalid object pointer\n");
+		rnd_message(PCB_MSG_ERROR, "LayerObjDup: invalid object pointer\n");
 		return FGW_ERR_PTR_DOMAIN;
 	}
 	src = pcb_idpath2obj(PCB, idp);
Index: act_pstk_proto.c
===================================================================
--- act_pstk_proto.c	(revision 30902)
+++ act_pstk_proto.c	(revision 30903)
@@ -119,7 +119,7 @@
 			}
 			RND_PCB_ACT_CONVARG(3+ao, FGW_PTR, PstkProtoTmp, proto = argv[3+ao].val.ptr_void);
 			if (!fgw_ptr_in_domain(&rnd_fgw, &argv[3+ao], PCB_PTR_DOMAIN_PSTK_PROTO) || (proto == NULL)) {
-				pcb_message(PCB_MSG_ERROR, "PstkProtoTmp: invalid proto pointer\n");
+				rnd_message(PCB_MSG_ERROR, "PstkProtoTmp: invalid proto pointer\n");
 				RND_ACT_IRES(-1);
 				return 0;
 			}
@@ -156,7 +156,7 @@
 	pcb_layer_combining_t slyc, dlyc;
 	int src_idx, dst_idx, n;
 	pcb_pstk_tshape_t *ts;
-	pcb_coord_t crd;
+	rnd_coord_t crd;
 	DRAWOPTARG;
 
 	RND_PCB_ACT_CONVARG(1+ao, FGW_PTR, PstkProtoEdit, proto = argv[1+ao].val.ptr_void);
@@ -163,7 +163,7 @@
 	RND_PCB_ACT_CONVARG(2+ao, FGW_STR, PstkProtoEdit, cmd = argv[2+ao].val.str);
 
 	if (!fgw_ptr_in_domain(&rnd_fgw, &argv[1+ao], PCB_PTR_DOMAIN_PSTK_PROTO) || (proto == NULL)) {
-		pcb_message(PCB_MSG_ERROR, "PstkProtoEdit: invalid proto pointer\n");
+		rnd_message(PCB_MSG_ERROR, "PstkProtoEdit: invalid proto pointer\n");
 		RND_ACT_IRES(-1);
 		return 0;
 	}
@@ -214,7 +214,7 @@
 
 		case act_draw_keywords_shape_line:
 			{
-				pcb_coord_t x1, y1, x2, y2, th;
+				rnd_coord_t x1, y1, x2, y2, th;
 				int sq = 0;
 
 				RND_PCB_ACT_CONVARG(3+ao, FGW_STR, PstkProtoEdit, tmp = argv[3+ao].val.str);