Index: eps.c
===================================================================
--- eps.c	(revision 25200)
+++ eps.c	(revision 25201)
@@ -34,7 +34,7 @@
 static pcb_hid_attribute_t *eps_get_export_options(int *n);
 static void eps_do_export(pcb_hid_attr_val_t * options);
 static int eps_parse_arguments(int *argc, char ***argv);
-static int eps_set_layer_group(pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform);
+static int eps_set_layer_group(pcb_hidlib_t *hidlib, pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform);
 static pcb_hid_gc_t eps_make_gc(void);
 static void eps_destroy_gc(pcb_hid_gc_t gc);
 static void eps_set_color(pcb_hid_gc_t gc, const pcb_color_t *name);
@@ -383,7 +383,7 @@
 static int is_paste;
 static int is_drill;
 
-static int eps_set_layer_group(pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform)
+static int eps_set_layer_group(pcb_hidlib_t *hidlib, pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform)
 {
 	gds_t tmp_ln;
 	const char *name;
Index: ps.c
===================================================================
--- ps.c	(revision 25200)
+++ ps.c	(revision 25201)
@@ -34,7 +34,7 @@
 
 const char *ps_cookie = "ps HID";
 
-static int ps_set_layer_group(pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform);
+static int ps_set_layer_group(pcb_hidlib_t *hidlib, pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform);
 static void use_gc(pcb_hid_gc_t gc);
 
 typedef struct hid_gc_s {
@@ -575,7 +575,7 @@
 
 	global.linewidth = -1;
 	/* reset static vars */
-	ps_set_layer_group(-1, NULL, -1, -1, 0, -1, NULL);
+	ps_set_layer_group(&PCB->hidlib, -1, NULL, -1, -1, 0, -1, NULL);
 	use_gc(NULL);
 
 	global.exps.view.X1 = 0;
@@ -598,7 +598,7 @@
 
 	global.pagecount = 1;					/* Reset 'pagecount' if single file */
 	global.doing_toc = 0;
-	ps_set_layer_group(-1, NULL, -1, -1, 0, -1, NULL); /* reset static vars */
+	ps_set_layer_group(&PCB->hidlib, -1, NULL, -1, -1, 0, -1, NULL); /* reset static vars */
 	pcb_hid_expose_all(&ps_hid, &global.exps, NULL);
 
 	if (the_file)
@@ -691,7 +691,7 @@
 	fprintf(fh, "stroke grestore\n");
 }
 
-static int ps_set_layer_group(pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform)
+static int ps_set_layer_group(pcb_hidlib_t *hidlib, pcb_layergrp_id_t group, const char *purpose, int purpi, pcb_layer_id_t layer, unsigned int flags, int is_empty, pcb_xform_t **xform)
 {
 	gds_t tmp_ln;
 	static int lastgroup = -1;