Index: act_draw.c
===================================================================
--- act_draw.c	(revision 30897)
+++ act_draw.c	(revision 30898)
@@ -59,7 +59,7 @@
 	do { \
 		pcb_idpath_t *idp = pcb_obj2idpath((pcb_any_obj_t *)obj); \
 		res->type = FGW_IDPATH; \
-		fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); \
+		fgw_ptr_reg(&rnd_fgw, res, RND_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp); \
 	} while(0)
 
 #include "act_pstk_proto.c"
@@ -352,7 +352,7 @@
 	poly = pcb_poly_new(layer, cl*2, flags);
 
 	if (poly != NULL)
-		fgw_ptr_reg(&pcb_fgw, res, PTR_DOMAIN_POLY, FGW_PTR, poly);
+		fgw_ptr_reg(&rnd_fgw, res, PTR_DOMAIN_POLY, FGW_PTR, poly);
 	return 0;
 }
 
@@ -367,7 +367,7 @@
 
 	PCB_ACT_CONVARG(1+ao, FGW_PTR, PolyNewPoints, poly = argv[1+ao].val.ptr_void);
 	PCB_ACT_CONVARG(2+ao, FGW_STR, PolyNewPoints, ptlist = argv[2+ao].val.str);
-	if (!fgw_ptr_in_domain(&pcb_fgw, &argv[1], PTR_DOMAIN_POLY)) {
+	if (!fgw_ptr_in_domain(&rnd_fgw, &argv[1], PTR_DOMAIN_POLY)) {
 		pcb_message(PCB_MSG_ERROR, "PolyNewPoints: invalid polygon pointer\n");
 		PCB_ACT_IRES(-1);
 		return 0;
@@ -393,7 +393,7 @@
 	PCB_ACT_CONVARG(1+ao, FGW_DATA, PolyNewFromPoints, data = fgw_data(&argv[1+ao]));
 	PCB_ACT_CONVARG(2+ao, FGW_LAYER, PolyNewFromPoints, layer = fgw_layer(&argv[2+ao]));
 	PCB_ACT_CONVARG(3+ao, FGW_PTR, PolyNewPoints, poly = argv[3+ao].val.ptr_void);
-	if (!fgw_ptr_in_domain(&pcb_fgw, &argv[1], PTR_DOMAIN_POLY)) {
+	if (!fgw_ptr_in_domain(&rnd_fgw, &argv[1], PTR_DOMAIN_POLY)) {
 		pcb_message(PCB_MSG_ERROR, "PolyNewEnd: invalid polygon pointer\n");
 		PCB_ACT_IRES(0);
 		return 0;
@@ -410,7 +410,7 @@
 	RET_IDPATH(poly);
 	if (!noundo)
 		pcb_undo_add_obj_to_create(PCB_OBJ_POLY, layer, poly, poly);
-	fgw_ptr_unreg(&pcb_fgw, &argv[1], PTR_DOMAIN_POLY);
+	fgw_ptr_unreg(&rnd_fgw, &argv[1], PTR_DOMAIN_POLY);
 	return 0;
 }
 
@@ -431,7 +431,7 @@
 	PCB_ACT_CONVARG(1+ao, FGW_DATA, LayerObjDup, data = fgw_data(&argv[1+ao]));
 	PCB_ACT_CONVARG(2+ao, FGW_LAYER, LayerObjDup, layer = fgw_layer(&argv[2+ao]));
 	PCB_ACT_CONVARG(3+ao, FGW_PTR, LayerObjDup, idp = argv[3+ao].val.ptr_void);
-	if (!fgw_ptr_in_domain(&pcb_fgw, &argv[3], PCB_PTR_DOMAIN_IDPATH)) {
+	if (!fgw_ptr_in_domain(&rnd_fgw, &argv[3], RND_PTR_DOMAIN_IDPATH)) {
 		pcb_message(PCB_MSG_ERROR, "LayerObjDup: invalid object pointer\n");
 		return FGW_ERR_PTR_DOMAIN;
 	}
@@ -450,7 +450,7 @@
 
 	if (dst != NULL) {
 		idp = pcb_obj2idpath(dst);
-		fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp);
+		fgw_ptr_reg(&rnd_fgw, res, RND_PTR_DOMAIN_IDPATH, FGW_PTR | FGW_STRUCT, idp);
 
 		pcb_poly_clear_from_poly(data, dst->type, layer, dst);
 	}
@@ -458,7 +458,7 @@
 	return 0;
 }
 
-pcb_action_t act_draw_action_list[] = {
+rnd_action_t act_draw_action_list[] = {
 	{"LineNew", pcb_act_LineNew, pcb_acth_LineNew, pcb_acts_LineNew},
 	{"ArcNew", pcb_act_ArcNew, pcb_acth_ArcNew, pcb_acts_ArcNew},
 	{"TextNew", pcb_act_TextNew, pcb_acth_TextNew, pcb_acts_TextNew},
@@ -479,7 +479,7 @@
 
 void pplg_uninit_act_draw(void)
 {
-	pcb_remove_actions_by_cookie(act_draw_cookie);
+	rnd_remove_actions_by_cookie(act_draw_cookie);
 }
 
 int pplg_init_act_draw(void)
Index: act_pstk_proto.c
===================================================================
--- act_pstk_proto.c	(revision 30897)
+++ act_pstk_proto.c	(revision 30898)
@@ -51,7 +51,7 @@
 	}
 
 	PCB_ACT_CONVARG(aidx, FGW_IDPATH, PstkProtoTmp, idp = fgw_idpath(&argv[aidx]));
-	if ((idp == NULL) || !fgw_ptr_in_domain(&pcb_fgw, &argv[aidx], PCB_PTR_DOMAIN_IDPATH))
+	if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[aidx], RND_PTR_DOMAIN_IDPATH))
 		return FGW_ERR_PTR_DOMAIN;
 	obj = pcb_idpath2obj(PCB, idp);
 	if ((obj == NULL) || (obj->type != PCB_OBJ_PSTK) || (obj->parent_type != PCB_PARENT_DATA))
@@ -80,7 +80,7 @@
 	switch(cmdi) {
 		case act_draw_keywords_new:
 			proto = calloc(sizeof(pcb_pstk_proto_t), 1);
-			fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_PSTK_PROTO, FGW_PTR | FGW_STRUCT, proto);
+			fgw_ptr_reg(&rnd_fgw, res, PCB_PTR_DOMAIN_PSTK_PROTO, FGW_PTR | FGW_STRUCT, proto);
 			res->val.ptr_void = proto;
 			pcb_vtpadstack_tshape_init(&proto->tr);
 			pcb_vtpadstack_tshape_alloc_append(&proto->tr, 1);
@@ -104,7 +104,7 @@
 			if (src == NULL)
 				return 0;
 			proto = calloc(sizeof(pcb_pstk_proto_t), 1);
-			fgw_ptr_reg(&pcb_fgw, res, PCB_PTR_DOMAIN_PSTK_PROTO, FGW_PTR | FGW_STRUCT, proto);
+			fgw_ptr_reg(&rnd_fgw, res, PCB_PTR_DOMAIN_PSTK_PROTO, FGW_PTR | FGW_STRUCT, proto);
 			pcb_pstk_proto_copy(proto, src);
 			res->val.ptr_void = proto;
 			return 0;
@@ -118,7 +118,7 @@
 				return 0;
 			}
 			PCB_ACT_CONVARG(3+ao, FGW_PTR, PstkProtoTmp, proto = argv[3+ao].val.ptr_void);
-			if (!fgw_ptr_in_domain(&pcb_fgw, &argv[3+ao], PCB_PTR_DOMAIN_PSTK_PROTO) || (proto == NULL)) {
+			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");
 				PCB_ACT_IRES(-1);
 				return 0;
@@ -162,7 +162,7 @@
 	PCB_ACT_CONVARG(1+ao, FGW_PTR, PstkProtoEdit, proto = argv[1+ao].val.ptr_void);
 	PCB_ACT_CONVARG(2+ao, FGW_STR, PstkProtoEdit, cmd = argv[2+ao].val.str);
 
-	if (!fgw_ptr_in_domain(&pcb_fgw, &argv[1+ao], PCB_PTR_DOMAIN_PSTK_PROTO) || (proto == NULL)) {
+	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");
 		PCB_ACT_IRES(-1);
 		return 0;