Index: read.c
===================================================================
--- read.c	(revision 30970)
+++ read.c	(revision 30971)
@@ -886,7 +886,7 @@
 		return -1;
 
 	if (subc == NULL) {
-		pcb_layer_id_t lid;
+		rnd_layer_id_t lid;
 		if (purpose == NULL) {
 			if (pcb_layer_list(ctx->pcb, side | type, &lid, 1) != 1)
 				return 0;
@@ -911,7 +911,7 @@
 	char *name = NULL;
 
 	if (user) { /* user layers are DOC layers identified by name and are allocated on the go */
-		pcb_layer_id_t lid;
+		rnd_layer_id_t lid;
 		pcb_dflgmap_t map[2];
 		int retry;
 
@@ -934,7 +934,7 @@
 	if (strncmp(ln, "LYR_", 4) == 0) {
 		int cidx;
 		char *end;
-		pcb_layergrp_id_t gid;
+		rnd_layergrp_id_t gid;
 
 		TODO("can a subcircuit have intern copper objects? assume NO for now:");
 		assert(subc == NULL);
@@ -1003,7 +1003,7 @@
 			ly->meta.bound.purpose = rnd_strdup(purpose);
 	}
 	else {
-		pcb_layer_id_t lid;
+		rnd_layer_id_t lid;
 		int ln = pcb_layer_listp(ctx->pcb, lyt, &lid, 1, -1, purpose);
 		if (ln == 0)
 			return NULL;
Index: read_net.c
===================================================================
--- read_net.c	(revision 30970)
+++ read_net.c	(revision 30971)
@@ -28,7 +28,7 @@
  */
 
 
-static rnd_coord_t net_get_clearance_(hkp_ctx_t *ctx, pcb_layer_id_t lid, const hkp_netclass_t *nc, hkp_clearance_type_t type, node_t *errnode)
+static rnd_coord_t net_get_clearance_(hkp_ctx_t *ctx, rnd_layer_id_t lid, const hkp_netclass_t *nc, hkp_clearance_type_t type, node_t *errnode)
 {
 	if ((lid < 0) || (lid >= PCB_MAX_LAYER)) {
 		hkp_error(errnode, "failed to determine clearance, falling back to default value\n");
@@ -39,7 +39,7 @@
 
 static rnd_coord_t net_get_clearance(hkp_ctx_t *ctx, pcb_layer_t *ly, const hkp_netclass_t *nc, hkp_clearance_type_t type, node_t *errnode)
 {
-	pcb_layer_id_t lid;
+	rnd_layer_id_t lid;
 
 	if (ly == NULL) /* typically non-copper layer: clearance is 0 */
 		return 0;
@@ -97,7 +97,7 @@
 
 	/* load default CLEARANCE_RULE_SET's children */
 	for(ns = ncrs->first_child; ns != NULL; ns = ns->next) {
-		pcb_layergrp_id_t gid;
+		rnd_layergrp_id_t gid;
 		pcb_layergrp_t *grp;
 		rnd_coord_t val;
 		int i;
@@ -127,7 +127,7 @@
 			else continue; /* ignore the rest for now */
 
 			for(i = 0; i < grp->len; i++) {
-				pcb_layer_id_t lid = grp->lid[i];
+				rnd_layer_id_t lid = grp->lid[i];
 				ctx->nc_dflt.clearance[lid][type] = val;
 			}
 		}