Index: read.c
===================================================================
--- read.c	(revision 30970)
+++ read.c	(revision 30971)
@@ -105,7 +105,7 @@
 	pcb_board_t *pcb;
 	const char *Filename;
 	rnd_conf_role_t settings_dest;
-	pcb_layer_id_t protel_to_stackup[14];
+	rnd_layer_id_t protel_to_stackup[14];
 	int lineno;
 	rnd_coord_t mask_clearance;
 	rnd_coord_t copper_clearance;
@@ -302,7 +302,7 @@
 	rnd_angle_t delta = 360.0;
 
 	pcb_flag_t Flags = pcb_flag_make(0); /* start with something bland here */
-	pcb_layer_id_t PCB_layer;
+	rnd_layer_id_t PCB_layer;
 
 	Thickness = 0;
 	Clearance = st->copper_clearance; /* start with sane default */
@@ -762,11 +762,11 @@
 	return -1;
 }
 
-static pcb_layer_id_t autotrax_reg_layer(read_state_t *st, const char *autotrax_layer, unsigned int mask)
+static rnd_layer_id_t autotrax_reg_layer(read_state_t *st, const char *autotrax_layer, unsigned int mask)
 {
-	pcb_layer_id_t id;
+	rnd_layer_id_t id;
 	if (pcb_layer_list(st->pcb, mask, &id, 1) != 1) {
-		pcb_layergrp_id_t gid;
+		rnd_layergrp_id_t gid;
 		pcb_layergrp_list(st->pcb, mask, &gid, 1);
 		id = pcb_layer_create(st->pcb, gid, autotrax_layer, 0);
 	}
@@ -778,7 +778,7 @@
 {
 
 	pcb_layergrp_t *g;
-	pcb_layer_id_t id;
+	rnd_layer_id_t id;
 
 	pcb_layer_group_setup_default(st->pcb);
 
@@ -789,7 +789,7 @@
 	st->protel_to_stackup[6] = autotrax_reg_layer(st, "bottom copper", PCB_LYT_COPPER | PCB_LYT_BOTTOM);
 
 	if (pcb_layer_list(st->pcb, PCB_LYT_SILK | PCB_LYT_TOP, &id, 1) == 1) {
-		pcb_layergrp_id_t gid;
+		rnd_layergrp_id_t gid;
 		pcb_layergrp_list(st->pcb, PCB_LYT_SILK | PCB_LYT_TOP, &gid, 1);
 		st->protel_to_stackup[11] = pcb_layer_create(st->pcb, gid, "Board", 0); /* != outline, cutouts */
 		pcb_layergrp_list(st->pcb, PCB_LYT_SILK | PCB_LYT_TOP, &gid, 1);
Index: write.c
===================================================================
--- write.c	(revision 30970)
+++ write.c	(revision 30971)
@@ -74,7 +74,7 @@
 
 static int wrax_layer2id(wctx_t *ctx, pcb_layer_t *ly)
 {
-	pcb_layergrp_id_t gid = pcb_layer_get_group_(ly);
+	rnd_layergrp_id_t gid = pcb_layer_get_group_(ly);
 	if ((gid >= 0) && (gid < PCB_MAX_LAYERGRP))
 		return ctx->grp2id[gid];
 	return 0;