Index: layer_it.h
===================================================================
--- layer_it.h	(revision 30970)
+++ layer_it.h	(revision 30971)
@@ -35,17 +35,17 @@
 typedef struct pcb_layer_it_s pcb_layer_it_t;
 
 /* Start an iteration matching exact flags or any of the flags; returns -1 if over */
-RND_INLINE pcb_layer_id_t pcb_layer_first(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int exact_mask);
-RND_INLINE pcb_layer_id_t pcb_layer_first_any(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int any_mask);
+RND_INLINE rnd_layer_id_t pcb_layer_first(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int exact_mask);
+RND_INLINE rnd_layer_id_t pcb_layer_first_any(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int any_mask);
 
 /* next iteration; returns -1 if over */
-RND_INLINE pcb_layer_id_t pcb_layer_next(pcb_layer_it_t *it);
+RND_INLINE rnd_layer_id_t pcb_layer_next(pcb_layer_it_t *it);
 
 
 /*************** inline implementation *************************/
 struct pcb_layer_it_s {
 	pcb_layer_stack_t *stack;
-	pcb_layergrp_id_t gid;
+	rnd_layergrp_id_t gid;
 	rnd_cardinal_t lidx;
 	unsigned int mask;
 	unsigned int exact:1;
@@ -52,7 +52,7 @@
 	unsigned int global:1;
 };
 
-RND_INLINE pcb_layer_id_t pcb_layer_next(pcb_layer_it_t *it)
+RND_INLINE rnd_layer_id_t pcb_layer_next(pcb_layer_it_t *it)
 {
 	if (it->global) {
 		/* over all layers, random order, without any checks - go the cheap way, bypassing groups */
@@ -62,7 +62,7 @@
 	}
 	else for(;;) {
 		pcb_layergrp_t *g = &(it->stack->grp[it->gid]);
-		pcb_layer_id_t lid;
+		rnd_layer_id_t lid;
 		unsigned int hit;
 		if (it->lidx >= g->len) { /* layer list over in this group */
 			it->gid++;
@@ -87,7 +87,7 @@
 	}
 }
 
-RND_INLINE pcb_layer_id_t pcb_layer_first(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int exact_mask)
+RND_INLINE rnd_layer_id_t pcb_layer_first(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int exact_mask)
 {
 	it->stack = stack;
 	it->mask = exact_mask;
@@ -98,7 +98,7 @@
 	return pcb_layer_next(it);
 }
 
-RND_INLINE pcb_layer_id_t pcb_layer_first_any(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int any_mask)
+RND_INLINE rnd_layer_id_t pcb_layer_first_any(pcb_layer_stack_t *stack, pcb_layer_it_t *it, unsigned int any_mask)
 {
 	it->stack = stack;
 	it->mask = any_mask;
@@ -109,7 +109,7 @@
 	return pcb_layer_next(it);
 }
 
-RND_INLINE pcb_layer_id_t pcb_layer_first_all(pcb_layer_stack_t *stack, pcb_layer_it_t *it)
+RND_INLINE rnd_layer_id_t pcb_layer_first_all(pcb_layer_stack_t *stack, pcb_layer_it_t *it)
 {
 	it->stack = stack;
 	it->lidx = 0;