Index: data.h
===================================================================
--- data.h	(revision 28094)
+++ data.h	(revision 28095)
@@ -68,12 +68,10 @@
 };
 
 #define pcb_max_group(pcb) ((pcb)->LayerGroups.len)
+#define pcb_max_layer(pcb) ((pcb)->Data->LayerN)
 
-/* DO NOT USE this macro, it is not PCB-safe */
-#define pcb_max_layer (PCB->Data->LayerN)
 
 
-
 extern pcb_buffer_t pcb_buffers[PCB_MAX_BUFFER];
 extern int pcb_added_lines;
 extern int pcb_layer_stack[PCB_MAX_LAYER];