Index: trunk/src/find_misc.c
===================================================================
--- trunk/src/find_misc.c	(revision 5502)
+++ trunk/src/find_misc.c	(revision 5503)
@@ -168,7 +168,7 @@
 
 	case PCB_TYPE_LINE:
 		{
-			int layer = pcb_layer_id(PCB->Data,
+			pcb_layer_id_t layer = pcb_layer_id(PCB->Data,
 																 (pcb_layer_t *) ptr1);
 
 			if (ADD_LINE_TO_LIST(layer, (pcb_line_t *) ptr2, 0, NULL, PCB_FCT_START))
@@ -178,9 +178,7 @@
 
 	case PCB_TYPE_ARC:
 		{
-			int layer = pcb_layer_id(PCB->Data,
-																 (pcb_layer_t *) ptr1);
-
+			pcb_layer_id_t layer = pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1);
 			if (ADD_ARC_TO_LIST(layer, (pcb_arc_t *) ptr2, 0, NULL, PCB_FCT_START))
 				return pcb_true;
 			break;
@@ -188,8 +186,7 @@
 
 	case PCB_TYPE_POLYGON:
 		{
-			int layer = pcb_layer_id(PCB->Data,
-																 (pcb_layer_t *) ptr1);
+			pcb_layer_id_t layer = pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1);
 
 			if (ADD_POLYGON_TO_LIST(layer, (pcb_polygon_t *) ptr2, 0, NULL, PCB_FCT_START))
 				return pcb_true;
@@ -230,8 +227,7 @@
 		if (type == PCB_TYPE_NONE)
 			return;
 		if (type & PCB_SILK_TYPE) {
-			int laynum = pcb_layer_id(PCB->Data,
-																	(pcb_layer_t *) ptr1);
+			pcb_layer_id_t laynum = pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1);
 
 			/* don't mess with non-conducting objects! */
 			if (laynum >= pcb_max_copper_layer || ((pcb_layer_t *) ptr1)->no_drc)
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 5502)
+++ trunk/src/obj_poly.c	(revision 5503)
@@ -475,7 +475,7 @@
 }
 
 struct mptlc {
-	pcb_cardinal_t snum, dnum;
+	pcb_layer_id_t snum, dnum;
 	int type;
 	pcb_polygon_t *polygon;
 } mptlc;
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 5502)
+++ trunk/src/polygon.c	(revision 5503)
@@ -779,7 +779,7 @@
 static int SubtractPin(pcb_data_t * d, pcb_pin_t * pin, pcb_layer_t * l, pcb_polygon_t * p)
 {
 	pcb_polyarea_t *np;
-	pcb_cardinal_t i;
+	pcb_layer_id_t i;
 
 	if (pin->Clearance == 0)
 		return 0;
@@ -876,7 +876,7 @@
 	pcb_polygon_t *polygon;
 	pcb_polyarea_t *np;
 	pcb_polyarea_t *merged;
-	pcb_cardinal_t i;
+	pcb_layer_id_t i;
 
 	/* don't subtract the object that was put back! */
 	if (b == info->other)
@@ -990,7 +990,7 @@
 	return PCB_R_DIR_FOUND_CONTINUE;
 }
 
-static int Group(pcb_data_t *Data, pcb_cardinal_t layer)
+static int Group(pcb_data_t *Data, pcb_layer_id_t layer)
 {
 	pcb_cardinal_t i, j;
 	for (i = 0; i < pcb_max_group; i++)
Index: trunk/src/undo.c
===================================================================
--- trunk/src/undo.c	(revision 5502)
+++ trunk/src/undo.c	(revision 5503)
@@ -645,7 +645,8 @@
 static pcb_bool UndoMoveToLayer(UndoListTypePtr Entry)
 {
 	void *ptr1, *ptr2, *ptr3;
-	int type, swap;
+	int type;
+	pcb_layer_id_t swap;
 
 	/* lookup entry by it's ID */
 	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c
===================================================================
--- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c	(revision 5502)
+++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layers.c	(revision 5503)
@@ -20,7 +20,7 @@
 	pcb_redraw();
 }
 
-int layout_get_current_layer()
+pcb_layer_id_t layout_get_current_layer()
 {
 	return pcb_layer_id(PCB->Data, CURRENT);
 }
Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h
===================================================================
--- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h	(revision 5502)
+++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/layout.h	(revision 5503)
@@ -181,7 +181,7 @@
 void layout_switch_to_layer(int layer);
 
 /* returns the number of the current layer */
-int layout_get_current_layer();
+pcb_layer_id_t layout_get_current_layer();
 
 /* resolve layer number by name (case sensitive); returns negative number if not found */
 int layout_resolve_layer(const char *name);