Index: polygon.c
===================================================================
--- polygon.c	(revision 30970)
+++ polygon.c	(revision 30971)
@@ -352,7 +352,7 @@
 static int SubtractPadstack(pcb_data_t *d, pcb_pstk_t *ps, pcb_layer_t *l, pcb_poly_t *p)
 {
 	rnd_polyarea_t *np;
-	pcb_layer_id_t i;
+	rnd_layer_id_t i;
 
 	/* ps->Clearance == 0 doesn't mean no clearance because of the per shape clearances */
 	if (!PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, ps))
@@ -490,7 +490,7 @@
 	pcb_poly_t *polygon;
 	rnd_polyarea_t *np;
 	rnd_polyarea_t *merged;
-	pcb_layer_id_t i;
+	rnd_layer_id_t i;
 
 	/* don't subtract the object that was put back! */
 	if (b == info->other)
@@ -758,7 +758,7 @@
 	int seen;
 	rnd_rnd_box_t region;
 	struct cpInfo info;
-	pcb_layergrp_id_t group;
+	rnd_layergrp_id_t group;
 	unsigned int gflg;
 	pcb_layer_type_t lf;
 	int old_noop;