Index: layer_menu.c
===================================================================
--- layer_menu.c	(revision 26791)
+++ layer_menu.c	(revision 26792)
@@ -80,12 +80,12 @@
 			sprintf(chk, "ChkView(ui:%d)", idx);
 
 			pcb_snprintf(end, len_avail, "  %s", ly->name);
-			pcb_gui->create_menu(path, &props);
+			pcb_gui->create_menu(pcb_gui, path, &props);
 		}
 
 		props.checked = NULL;
 		pcb_snprintf(end, len_avail, "[UI]");
-		pcb_gui->create_menu(path, &props);
+		pcb_gui->create_menu(pcb_gui, path, &props);
 	}
 
 	/* menu-only virtual layers; have to go reverse to keep order because this will insert items */
@@ -104,12 +104,12 @@
 			sprintf(chk, "ChkLayer(%s)", ml->abbrev);
 		}
 		pcb_snprintf(end, len_avail, "  %s", ml->name);
-		pcb_gui->create_menu(path, &props);
+		pcb_gui->create_menu(pcb_gui, path, &props);
 	}
 
 	props.checked = NULL;
 	pcb_snprintf(end, len_avail, "[virtual]");
-	pcb_gui->create_menu(path, &props);
+	pcb_gui->create_menu(pcb_gui, path, &props);
 
 
 	/* have to go reverse to keep order because this will insert items */
@@ -121,7 +121,7 @@
 		props.checked = NULL;
 		*act = '\0';
 		*chk = '\0';
-		pcb_gui->create_menu(path, &props);
+		pcb_gui->create_menu(pcb_gui, path, &props);
 
 		for(gid = pcb_max_group(PCB)-1; gid >= 0; gid--) {
 			pcb_layergrp_t *g = &PCB->LayerGroups.grp[gid];
@@ -150,7 +150,7 @@
 					sprintf(chk, "ChkLayer(%ld)", lid+1);
 				}
 				pcb_snprintf(end, len_avail, "  %s", l->name);
-				pcb_gui->create_menu(path, &props);
+				pcb_gui->create_menu(pcb_gui, path, &props);
 			}
 
 			props.foreground = NULL;
@@ -157,7 +157,7 @@
 			props.background = NULL;
 			props.checked = NULL;
 			pcb_snprintf(end, len_avail, "[%s]", g->name);
-			pcb_gui->create_menu(path, &props);
+			pcb_gui->create_menu(pcb_gui, path, &props);
 		}
 	}
 
@@ -184,12 +184,12 @@
 {
 	layer_install_menu();
 	if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL))
-		pcb_gui->update_menu_checkbox(NULL);
+		pcb_gui->update_menu_checkbox(pcb_gui, NULL);
 }
 
 void pcb_layer_menu_vis_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[])
 {
 	if ((pcb_gui != NULL) && (pcb_gui->update_menu_checkbox != NULL))
-		pcb_gui->update_menu_checkbox(NULL);
+		pcb_gui->update_menu_checkbox(pcb_gui, NULL);
 }
 
Index: routest.c
===================================================================
--- routest.c	(revision 26791)
+++ routest.c	(revision 26792)
@@ -75,7 +75,7 @@
 		sprintf(act, "RouteStyle(%d)", idx+1); /* for historical reasons this action counts from 1 */
 		sprintf(chk, "ChkRst(%d)", idx);
 		strcpy(end, PCB->RouteStyle.array[idx].name);
-		pcb_gui->create_menu(path, &props);
+		pcb_gui->create_menu(pcb_gui, path, &props);
 	}
 }
 
@@ -220,7 +220,7 @@
 {
 	if ((PCB != NULL) && (pcb_gui != NULL)) {
 		if (pcb_gui->update_menu_checkbox != NULL)
-			pcb_gui->update_menu_checkbox(NULL);
+			pcb_gui->update_menu_checkbox(pcb_gui, NULL);
 		if (rst.sub_inited)
 			rst_force_update_chk_and_dlg();
 	}
Index: toolbar.c
===================================================================
--- toolbar.c	(revision 26791)
+++ toolbar.c	(revision 26792)
@@ -166,7 +166,7 @@
 
 static void toolbar_create(void)
 {
-	pcb_hid_cfg_t *cfg = pcb_gui->get_menu_cfg();
+	pcb_hid_cfg_t *cfg = pcb_gui->get_menu_cfg(pcb_gui);
 	if (cfg == NULL)
 		return;
 	toolbar_docked_create(cfg);