Index: bboard.c
===================================================================
--- bboard.c	(revision 5035)
+++ bboard.c	(revision 5036)
@@ -174,7 +174,7 @@
 
 static int bboard_validate_layer(const char *name, int group, int skipsolder)
 {
-	int idx = (group >= 0 && group < max_group) ? PCB->LayerGroups.Entries[group][0] : group;
+	int idx = (group >= 0 && group < pcb_max_group) ? PCB->LayerGroups.Entries[group][0] : group;
 
 	if (name == 0)
 		name = PCB->Data->Layer[idx].Name;
@@ -195,7 +195,7 @@
 		return 0;
 
 
-	if (group >= 0 && group < max_group) {
+	if (group >= 0 && group < pcb_max_group) {
 		if (!group_data[group].draw)
 			return 0;
 		group_data[group].exp = 1;
@@ -515,15 +515,15 @@
 
 	memset(group_data, 0, sizeof(group_data));
 #ifdef SOLDER_LAYER
-	group_data[GetLayerGroupNumberByNumber(max_copper_layer + SOLDER_LAYER)].solder = 1;
-	group_data[GetLayerGroupNumberByNumber(max_copper_layer + COMPONENT_LAYER)].component = 1;
+	group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + SOLDER_LAYER)].solder = 1;
+	group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + COMPONENT_LAYER)].component = 1;
 #else
-	group_data[GetLayerGroupNumberByNumber(max_copper_layer + BOTTOM_SIDE)].solder = 1;
-	group_data[GetLayerGroupNumberByNumber(max_copper_layer + TOP_SIDE)].component = 1;
+	group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + BOTTOM_SIDE)].solder = 1;
+	group_data[GetLayerGroupNumberByNumber(pcb_max_copper_layer + TOP_SIDE)].component = 1;
 #endif
 
 
-	for (i = 0; i < max_copper_layer; i++) {
+	for (i = 0; i < pcb_max_copper_layer; i++) {
 		layer = PCB->Data->Layer + i;
 		if (linelist_length(&layer->Line) > 0)
 			group_data[GetLayerGroupNumberByNumber(i)].draw = 1;
@@ -546,7 +546,7 @@
 	END_LOOP;
 
 	/* draw all wires from all valid layers */
-	for (i = max_copper_layer - 1; i >= 0; i--) {
+	for (i = pcb_max_copper_layer - 1; i >= 0; i--) {
 		if (bboard_validate_layer(PCB->Data->Layer[i].Name, GetLayerGroupNumberByNumber(i), options[HA_skipsolder].int_value)) {
 			bboard_get_layer_color(&(PCB->Data->Layer[i]), &clr_r, &clr_g, &clr_b);
 			bboard_set_color_cairo(clr_r, clr_g, clr_b);