Index: data.h
===================================================================
--- data.h	(revision 5044)
+++ data.h	(revision 5045)
@@ -47,7 +47,7 @@
 	pcb_rtree_t *via_tree, *element_tree, *pin_tree, *pad_tree, *name_tree[3],	/* for element names */
 	 *rat_tree;
 	pcb_board_t *pcb;
-	pcb_layer_t Layer[MAX_LAYER + 2];    /* add 2 silkscreen layers */
+	pcb_layer_t Layer[PCB_MAX_LAYER + 2];    /* add 2 silkscreen layers */
 	pcb_plug_io_t *loader;
 	ratlist_t Rat;
 };
@@ -58,9 +58,9 @@
 #define pcb_solder_silk_layer (pcb_max_copper_layer + SOLDER_LAYER)
 #define pcb_component_silk_layer (pcb_max_copper_layer + COMPONENT_LAYER)
 
-extern pcb_buffer_t pcb_buffers[MAX_BUFFER];
+extern pcb_buffer_t pcb_buffers[PCB_MAX_BUFFER];
 extern int pcb_added_lines;
-extern int pcb_layer_stack[MAX_LAYER];
+extern int pcb_layer_stack[PCB_MAX_LAYER];
 
 extern pcb_bool pcb_bumped;