Index: layer_compat.c
===================================================================
--- layer_compat.c	(revision 30970)
+++ layer_compat.c	(revision 30971)
@@ -47,10 +47,10 @@
 }
 #endif
 
-int pcb_layer_swap(pcb_board_t *pcb, pcb_layer_id_t lid1, pcb_layer_id_t lid2)
+int pcb_layer_swap(pcb_board_t *pcb, rnd_layer_id_t lid1, rnd_layer_id_t lid2)
 {
 	pcb_layer_t l1tmp, l2tmp;
-	pcb_layergrp_id_t gid;
+	rnd_layergrp_id_t gid;
 
 	if (lid1 == lid2)
 		return 0;
Index: layer_compat.h
===================================================================
--- layer_compat.h	(revision 30970)
+++ layer_compat.h	(revision 30971)
@@ -35,5 +35,5 @@
 
 /* Swap two layers in pcb; useful only in writing the old .pcb format,
    because silk layers must be the last 2 layers there */
-int pcb_layer_swap(pcb_board_t *pcb, pcb_layer_id_t lid1, pcb_layer_id_t lid2);
+int pcb_layer_swap(pcb_board_t *pcb, rnd_layer_id_t lid1, rnd_layer_id_t lid2);
 #endif