Index: eps.c
===================================================================
--- eps.c	(revision 25489)
+++ eps.c	(revision 25490)
@@ -323,7 +323,7 @@
 		eps_print_header(f, pcb_hid_export_fn(filename));
 
 	ctx.view = *bounds;
-	pcb_hid_expose_all(&eps_hid, &ctx, NULL);
+	pcbhl_expose_main(&eps_hid, &ctx, NULL);
 
 	eps_print_footer(f);
 
Index: ps.c
===================================================================
--- ps.c	(revision 25489)
+++ ps.c	(revision 25490)
@@ -591,14 +591,14 @@
 		fprintf(the_file, "/tocp { /y y 12 sub def 90 y moveto rightshow } bind def\n");
 
 		global.doing_toc = 1;
-		global.pagecount = 1;				/* 'pagecount' is modified by pcb_hid_expose_all() call */
-		pcb_hid_expose_all(&ps_hid, &global.exps, NULL);
+		global.pagecount = 1;				/* 'pagecount' is modified by pcbhl_expose_main() call */
+		pcbhl_expose_main(&ps_hid, &global.exps, NULL);
 	}
 
 	global.pagecount = 1;					/* Reset 'pagecount' if single file */
 	global.doing_toc = 0;
 	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);
+	pcbhl_expose_main(&ps_hid, &global.exps, NULL);
 
 	if (the_file)
 		fprintf(the_file, "showpage\n");