Index: read.c
===================================================================
--- read.c	(revision 30970)
+++ read.c	(revision 30971)
@@ -321,7 +321,7 @@
 static int dsn_parse_boundary(dsn_read_t *ctx, gsxl_node_t *bnd)
 {
 	int res;
-	pcb_layer_id_t olid;
+	rnd_layer_id_t olid;
 	pcb_layer_t *oly;
 
 	if (bnd == NULL)
@@ -369,7 +369,7 @@
 	const pcb_dflgmap_t *m;
 	gsxl_node_t *n, *i;
 	pcb_layergrp_t *topcop = NULL, *botcop = NULL, *grp;
-	pcb_layergrp_id_t gid;
+	rnd_layergrp_id_t gid;
 	const rnd_unit_t *old_unit;
 	const pcb_dflgmap_t doclayers[] = {
 		{"top_outline",         PCB_LYT_TOP | PCB_LYT_DOC,    "outline", PCB_LYC_AUTO, 0},
Index: write.c
===================================================================
--- write.c	(revision 30970)
+++ write.c	(revision 30971)
@@ -48,7 +48,7 @@
 
 #define GNAME_MAX 64
 
-static void group_name(char *dst, const char *src, pcb_layergrp_id_t gid)
+static void group_name(char *dst, const char *src, rnd_layergrp_id_t gid)
 {
 	int n;
 	char *d;
@@ -70,7 +70,7 @@
 
 static int dsn_write_structure(dsn_write_t *wctx)
 {
-	pcb_layergrp_id_t gid;
+	rnd_layergrp_id_t gid;
 	pcb_layergrp_t *lg;
 
 	fprintf(wctx->f, "  (structure\n");
@@ -88,13 +88,13 @@
 
 static int dsn_write_wiring(dsn_write_t *wctx)
 {
-	pcb_layer_id_t lid;
+	rnd_layer_id_t lid;
 	pcb_layer_t *ly;
 
 	fprintf(wctx->f, "  (wiring\n");
 	for(ly = wctx->pcb->Data->Layer, lid = 0; lid < wctx->pcb->Data->LayerN; lid++,ly++) {
 		char gname[GNAME_MAX];
-		pcb_layergrp_id_t gid = pcb_layer_get_group_(ly);
+		rnd_layergrp_id_t gid = pcb_layer_get_group_(ly);
 		pcb_layergrp_t *lg = pcb_get_layergrp(wctx->pcb, gid);
 		pcb_net_t *net;