Index: trunk/src/layer.h
===================================================================
--- trunk/src/layer.h	(revision 28093)
+++ trunk/src/layer.h	(revision 28094)
@@ -187,7 +187,6 @@
 /************ OLD API - new code should not use these **************/
 
 #define CURRENT             (&PCB->Data->Layer[pcb_layer_stack[0]])
-#define INDEXOFCURRENT      (pcb_layer_stack[0])
 
 #define LAYER_LOOP(data, ml) \
 	do { \
Index: trunk/src_plugins/acompnet/meshgraph.c
===================================================================
--- trunk/src_plugins/acompnet/meshgraph.c	(revision 28093)
+++ trunk/src_plugins/acompnet/meshgraph.c	(revision 28094)
@@ -71,7 +71,7 @@
 	np.Y = next->bbox.Y1;
 	cp.X = curr->bbox.X1;
 	cp.Y = curr->bbox.Y1;
-	pcb_route_calculate(PCB, &route, &np, &cp, INDEXOFCURRENT, conf_core.design.line_thickness, conf_core.design.bloat, pcb_flag_make(PCB_FLAG_CLEARLINE), 0, 0);
+	pcb_route_calculate(PCB, &route, &np, &cp, PCB_CURRLID(PCB), conf_core.design.line_thickness, conf_core.design.bloat, pcb_flag_make(PCB_FLAG_CLEARLINE), 0, 0);
 
 	pcb_trace("size=%d\n", route.size);
 
Index: trunk/src_plugins/cam/cam_compile.c
===================================================================
--- trunk/src_plugins/cam/cam_compile.c	(revision 28093)
+++ trunk/src_plugins/cam/cam_compile.c	(revision 28094)
@@ -141,7 +141,7 @@
 
 static int cam_exec(cam_ctx_t *ctx)
 {
-	int res = 0, n, have_gui, currly = INDEXOFCURRENT;
+	int res = 0, n, have_gui, currly = PCB_CURRLID(PCB);
 	int save_l_ons[PCB_MAX_LAYER], save_g_ons[PCB_MAX_LAYERGRP];
 	int ovr = 0, *old_ovr;
 
Index: trunk/src_plugins/dialogs/dlg_export.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_export.c	(revision 28093)
+++ trunk/src_plugins/dialogs/dlg_export.c	(revision 28094)
@@ -72,7 +72,7 @@
 {
 	export_ctx_t *export_ctx = caller_data;
 	int h, wid;
-	int have_gui, currly = INDEXOFCURRENT;
+	int have_gui, currly = PCB_CURRLID(PCB);
 	int save_l_ons[PCB_MAX_LAYER], save_g_ons[PCB_MAX_LAYERGRP];
 	
 	have_gui = (pcb_gui != NULL) && pcb_gui->gui;
Index: trunk/src_plugins/import_mucs/mucs.c
===================================================================
--- trunk/src_plugins/import_mucs/mucs.c	(revision 28093)
+++ trunk/src_plugins/import_mucs/mucs.c	(revision 28094)
@@ -66,7 +66,7 @@
 
 	PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadMucsFrom, fname = argv[1].val.str);
 
-	if (!(pcb_layer_flags(PCB, INDEXOFCURRENT) & PCB_LYT_COPPER)) {
+	if (!(pcb_layer_flags(PCB, PCB_CURRLID(PCB)) & PCB_LYT_COPPER)) {
 		pcb_message(PCB_MSG_ERROR, "The currently active layer is not a copper layer.\n");
 		PCB_ACT_IRES(1);
 		return 0;
Index: trunk/src_plugins/propedit/propedit.c
===================================================================
--- trunk/src_plugins/propedit/propedit.c	(revision 28093)
+++ trunk/src_plugins/propedit/propedit.c	(revision 28094)
@@ -103,7 +103,7 @@
 			vtl0_append(&pe->layers, id);
 		}
 		else {
-			vtl0_append(&pe->layers, INDEXOFCURRENT);
+			vtl0_append(&pe->layers, PCB_CURRLID(pe->pcb));
 		}
 	}
 	else if (strncmp(cmd, "net:", 4) == 0) {