Index: trunk/src/librnd/core/hid_dlg.c
===================================================================
--- trunk/src/librnd/core/hid_dlg.c	(revision 30998)
+++ trunk/src/librnd/core/hid_dlg.c	(revision 30999)
@@ -251,7 +251,7 @@
 	if ((rnd_gui->gui) && (RND_HAVE_GUI_ATTR_DLG) && (hid_dlg_gui_inited || rnd_gui->allow_dad_before_init))
 		return pcb_gui_progress(so_far, total, message);
 
-	return pcb_nogui_progress(so_far, total, message);
+	return rnd_nogui_progress(so_far, total, message);
 }
 
 static const char pcb_acts_Print[] = "Print()";
Index: trunk/src/librnd/core/hid_init.c
===================================================================
--- trunk/src/librnd/core/hid_init.c	(revision 30998)
+++ trunk/src/librnd/core/hid_init.c	(revision 30999)
@@ -87,7 +87,7 @@
 	char *tmp;
 
 	/* Setup a "nogui" default HID */
-	rnd_render = rnd_gui = pcb_hid_nogui_get_hid();
+	rnd_render = rnd_gui = rnd_hid_nogui_get_hid();
 
 TODO("make this configurable - add to conf_board_ignores avoid plugin injection")
 	tmp = pcb_concat(pcbhl_conf.rc.path.exec_prefix, RND_DIR_SEPARATOR_S, "lib", RND_DIR_SEPARATOR_S, "pcb-rnd", RND_DIR_SEPARATOR_S, "plugins", RND_DIR_SEPARATOR_S, HOST, NULL);
Index: trunk/src/librnd/core/hid_nogui.c
===================================================================
--- trunk/src/librnd/core/hid_nogui.c	(revision 30998)
+++ trunk/src/librnd/core/hid_nogui.c	(revision 30999)
@@ -386,7 +386,7 @@
 	fflush(stdout);
 }
 
-int pcb_nogui_progress(long so_far, long total, const char *message)
+int rnd_nogui_progress(long so_far, long total, const char *message)
 {
 	static int on = 0;
 	static double nextt;
@@ -480,7 +480,7 @@
 {
 }
 
-void pcb_hid_nogui_init(rnd_hid_t * hid)
+void rnd_hid_nogui_init(rnd_hid_t * hid)
 {
 	hid->get_export_options = nogui_get_export_options;
 	hid->do_export = nogui_do_export;
@@ -532,7 +532,7 @@
 }
 
 
-rnd_hid_t *pcb_hid_nogui_get_hid(void)
+rnd_hid_t *rnd_hid_nogui_get_hid(void)
 {
 	memset(&nogui_hid, 0, sizeof(rnd_hid_t));
 
@@ -540,7 +540,7 @@
 	nogui_hid.name = "nogui";
 	nogui_hid.description = "Default GUI when no other GUI is present.  " "Does nothing.";
 
-	pcb_hid_nogui_init(&nogui_hid);
+	rnd_hid_nogui_init(&nogui_hid);
 
 	return &nogui_hid;
 }
Index: trunk/src/librnd/core/hid_nogui.h
===================================================================
--- trunk/src/librnd/core/hid_nogui.h	(revision 30998)
+++ trunk/src/librnd/core/hid_nogui.h	(revision 30999)
@@ -1,12 +1,12 @@
-#ifndef PCB_HID_COMMON_HIDNOGUI_H
-#define PCB_HID_COMMON_HIDNOGUI_H
+#ifndef RND_HID_COMMON_HIDNOGUI_H
+#define RND_HID_COMMON_HIDNOGUI_H
 
-void pcb_hid_nogui_init(rnd_hid_t * hid);
-rnd_hid_t *pcb_hid_nogui_get_hid(void);
+void rnd_hid_nogui_init(rnd_hid_t * hid);
+rnd_hid_t *rnd_hid_nogui_get_hid(void);
 
 /* For checking if attr dialogs are not available: */
 void *rnd_nogui_attr_dlg_new(rnd_hid_t *hid, const char *id, rnd_hid_attribute_t *attrs_, int n_attrs_, const char *title_, void *caller_data, rnd_bool modal, void (*button_cb)(void *caller_data, rnd_hid_attr_ev_t ev), int defx, int defy, int minx, int miny);
 
-int pcb_nogui_progress(long so_far, long total, const char *message);
+int rnd_nogui_progress(long so_far, long total, const char *message);
 
 #endif
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 30998)
+++ trunk/src/librnd/pcb_compat.h	(revision 30999)
@@ -929,3 +929,6 @@
 #define pcb_hid_set_draw_xor rnd_hid_set_draw_xor
 #define pcb_hid_set_draw_faded rnd_hid_set_draw_faded
 #define pcb_hid_command_entry rnd_hid_command_entry
+#define pcb_hid_nogui_init rnd_hid_nogui_init
+#define pcb_hid_nogui_get_hid rnd_hid_nogui_get_hid
+#define pcb_nogui_progress rnd_nogui_progress
Index: trunk/src_plugins/cam/cam.c
===================================================================
--- trunk/src_plugins/cam/cam.c	(revision 30998)
+++ trunk/src_plugins/cam/cam.c	(revision 30999)
@@ -302,7 +302,7 @@
 
 	memset(&export_cam_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&export_cam_hid);
+	rnd_hid_nogui_init(&export_cam_hid);
 
 	export_cam_hid.struct_size = sizeof(rnd_hid_t);
 	export_cam_hid.name = "cam";
Index: trunk/src_plugins/export_bom/bom.c
===================================================================
--- trunk/src_plugins/export_bom/bom.c	(revision 30998)
+++ trunk/src_plugins/export_bom/bom.c	(revision 30999)
@@ -273,7 +273,7 @@
 
 	memset(&bom_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&bom_hid);
+	rnd_hid_nogui_init(&bom_hid);
 
 	bom_hid.struct_size = sizeof(rnd_hid_t);
 	bom_hid.name = "bom";
Index: trunk/src_plugins/export_dsn/dsn.c
===================================================================
--- trunk/src_plugins/export_dsn/dsn.c	(revision 30998)
+++ trunk/src_plugins/export_dsn/dsn.c	(revision 30999)
@@ -612,7 +612,7 @@
 {
 	PCB_API_CHK_VER;
 	memset(&dsn_hid, 0, sizeof(rnd_hid_t));
-	pcb_hid_nogui_init(&dsn_hid);
+	rnd_hid_nogui_init(&dsn_hid);
 
 	dsn_hid.struct_size = sizeof(rnd_hid_t);
 	dsn_hid.name = "dsn";
Index: trunk/src_plugins/export_dxf/dxf.c
===================================================================
--- trunk/src_plugins/export_dxf/dxf.c	(revision 30998)
+++ trunk/src_plugins/export_dxf/dxf.c	(revision 30999)
@@ -537,7 +537,7 @@
 
 	memset(&dxf_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&dxf_hid);
+	rnd_hid_nogui_init(&dxf_hid);
 
 	dxf_hid.struct_size = sizeof(rnd_hid_t);
 	dxf_hid.name = "dxf";
Index: trunk/src_plugins/export_excellon/excellon.c
===================================================================
--- trunk/src_plugins/export_excellon/excellon.c	(revision 30998)
+++ trunk/src_plugins/export_excellon/excellon.c	(revision 30999)
@@ -500,7 +500,7 @@
 
 	memset(&excellon_hid, 0, sizeof(excellon_hid));
 
-	pcb_hid_nogui_init(&excellon_hid);
+	rnd_hid_nogui_init(&excellon_hid);
 
 	excellon_hid.struct_size = sizeof(excellon_hid);
 	excellon_hid.name = "excellon";
Index: trunk/src_plugins/export_fidocadj/fidocadj.c
===================================================================
--- trunk/src_plugins/export_fidocadj/fidocadj.c	(revision 30998)
+++ trunk/src_plugins/export_fidocadj/fidocadj.c	(revision 30999)
@@ -367,7 +367,7 @@
 
 	memset(&fidocadj_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&fidocadj_hid);
+	rnd_hid_nogui_init(&fidocadj_hid);
 
 	fidocadj_hid.struct_size = sizeof(rnd_hid_t);
 	fidocadj_hid.name = "fidocadj";
Index: trunk/src_plugins/export_gcode/gcode.c
===================================================================
--- trunk/src_plugins/export_gcode/gcode.c	(revision 30998)
+++ trunk/src_plugins/export_gcode/gcode.c	(revision 30999)
@@ -407,7 +407,7 @@
 
 	memset(&gcode_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&gcode_hid);
+	rnd_hid_nogui_init(&gcode_hid);
 
 	gcode_hid.struct_size = sizeof(rnd_hid_t);
 	gcode_hid.name = "gcode";
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 30998)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 30999)
@@ -1079,7 +1079,7 @@
 
 	memset(&gerber_hid, 0, sizeof(gerber_hid));
 
-	pcb_hid_nogui_init(&gerber_hid);
+	rnd_hid_nogui_init(&gerber_hid);
 
 	gerber_hid.struct_size = sizeof(gerber_hid);
 	gerber_hid.name = "gerber";
Index: trunk/src_plugins/export_ipcd356/ipcd356.c
===================================================================
--- trunk/src_plugins/export_ipcd356/ipcd356.c	(revision 30998)
+++ trunk/src_plugins/export_ipcd356/ipcd356.c	(revision 30999)
@@ -485,7 +485,7 @@
 	PCB_API_CHK_VER;
 	memset(&ipcd356_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&ipcd356_hid);
+	rnd_hid_nogui_init(&ipcd356_hid);
 
 	ipcd356_hid.struct_size = sizeof(rnd_hid_t);
 	ipcd356_hid.name = "IPC-D-356";
Index: trunk/src_plugins/export_lpr/lpr.c
===================================================================
--- trunk/src_plugins/export_lpr/lpr.c	(revision 30998)
+++ trunk/src_plugins/export_lpr/lpr.c	(revision 30999)
@@ -127,7 +127,7 @@
 	PCB_API_CHK_VER;
 	memset(&lpr_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&lpr_hid);
+	rnd_hid_nogui_init(&lpr_hid);
 	ps_ps_init(&lpr_hid);
 
 	lpr_hid.struct_size = sizeof(rnd_hid_t);
Index: trunk/src_plugins/export_openems/export_openems.c
===================================================================
--- trunk/src_plugins/export_openems/export_openems.c	(revision 30998)
+++ trunk/src_plugins/export_openems/export_openems.c	(revision 30999)
@@ -844,7 +844,7 @@
 
 	memset(&openems_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&openems_hid);
+	rnd_hid_nogui_init(&openems_hid);
 
 	openems_hid.struct_size = sizeof(rnd_hid_t);
 	openems_hid.name = "openems";
Index: trunk/src_plugins/export_openscad/export_openscad.c
===================================================================
--- trunk/src_plugins/export_openscad/export_openscad.c	(revision 30998)
+++ trunk/src_plugins/export_openscad/export_openscad.c	(revision 30999)
@@ -671,7 +671,7 @@
 
 	memset(&openscad_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&openscad_hid);
+	rnd_hid_nogui_init(&openscad_hid);
 
 	openscad_hid.struct_size = sizeof(rnd_hid_t);
 	openscad_hid.name = "openscad";
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 30998)
+++ trunk/src_plugins/export_png/png.c	(revision 30999)
@@ -1412,7 +1412,7 @@
 
 	memset(&png_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&png_hid);
+	rnd_hid_nogui_init(&png_hid);
 
 	png_hid.struct_size = sizeof(rnd_hid_t);
 	png_hid.name = "png";
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 30998)
+++ trunk/src_plugins/export_ps/eps.c	(revision 30999)
@@ -652,7 +652,7 @@
 {
 	memset(&eps_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&eps_hid);
+	rnd_hid_nogui_init(&eps_hid);
 
 	eps_hid.struct_size = sizeof(rnd_hid_t);
 	eps_hid.name = "eps";
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 30998)
+++ trunk/src_plugins/export_ps/ps.c	(revision 30999)
@@ -1487,7 +1487,7 @@
 	PCB_API_CHK_VER;
 	memset(&ps_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&ps_hid);
+	rnd_hid_nogui_init(&ps_hid);
 	ps_ps_init(&ps_hid);
 
 	ps_hid.struct_size = sizeof(rnd_hid_t);
Index: trunk/src_plugins/export_stat/stat.c
===================================================================
--- trunk/src_plugins/export_stat/stat.c	(revision 30998)
+++ trunk/src_plugins/export_stat/stat.c	(revision 30999)
@@ -402,7 +402,7 @@
 
 	memset(&stat_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&stat_hid);
+	rnd_hid_nogui_init(&stat_hid);
 
 	stat_hid.struct_size = sizeof(rnd_hid_t);
 	stat_hid.name = "stat";
Index: trunk/src_plugins/export_stl/export_stl.c
===================================================================
--- trunk/src_plugins/export_stl/export_stl.c	(revision 30998)
+++ trunk/src_plugins/export_stl/export_stl.c	(revision 30999)
@@ -254,7 +254,7 @@
 
 	memset(&stl_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&stl_hid);
+	rnd_hid_nogui_init(&stl_hid);
 
 	stl_hid.struct_size = sizeof(rnd_hid_t);
 	stl_hid.name = "stl";
Index: trunk/src_plugins/export_svg/svg.c
===================================================================
--- trunk/src_plugins/export_svg/svg.c	(revision 30998)
+++ trunk/src_plugins/export_svg/svg.c	(revision 30999)
@@ -895,7 +895,7 @@
 
 	memset(&svg_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&svg_hid);
+	rnd_hid_nogui_init(&svg_hid);
 
 	svg_hid.struct_size = sizeof(rnd_hid_t);
 	svg_hid.name = "svg";
Index: trunk/src_plugins/export_test/export_test.c
===================================================================
--- trunk/src_plugins/export_test/export_test.c	(revision 30998)
+++ trunk/src_plugins/export_test/export_test.c	(revision 30999)
@@ -106,7 +106,7 @@
 
 	memset(&export_test_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&export_test_hid);
+	rnd_hid_nogui_init(&export_test_hid);
 
 	export_test_hid.struct_size = sizeof(rnd_hid_t);
 	export_test_hid.name = "export_test";
Index: trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c
===================================================================
--- trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c	(revision 30998)
+++ trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c	(revision 30999)
@@ -369,7 +369,7 @@
 
 	memset(&export_vfs_fuse_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&export_vfs_fuse_hid);
+	rnd_hid_nogui_init(&export_vfs_fuse_hid);
 
 	export_vfs_fuse_hid.struct_size = sizeof(rnd_hid_t);
 	export_vfs_fuse_hid.name = "vfs_fuse";
Index: trunk/src_plugins/export_vfs_mc/export_vfs_mc.c
===================================================================
--- trunk/src_plugins/export_vfs_mc/export_vfs_mc.c	(revision 30998)
+++ trunk/src_plugins/export_vfs_mc/export_vfs_mc.c	(revision 30999)
@@ -154,7 +154,7 @@
 
 	memset(&export_vfs_mc_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&export_vfs_mc_hid);
+	rnd_hid_nogui_init(&export_vfs_mc_hid);
 
 	export_vfs_mc_hid.struct_size = sizeof(rnd_hid_t);
 	export_vfs_mc_hid.name = "vfs_mc";
Index: trunk/src_plugins/export_xy/xy.c
===================================================================
--- trunk/src_plugins/export_xy/xy.c	(revision 30998)
+++ trunk/src_plugins/export_xy/xy.c	(revision 30999)
@@ -871,7 +871,7 @@
 	rnd_conf_reg_field(conf_xy, field,isarray,type_name,cpath,cname,desc,flags);
 #include "xy_conf_fields.h"
 
-	pcb_hid_nogui_init(&xy_hid);
+	rnd_hid_nogui_init(&xy_hid);
 
 	xy_hid.struct_size = sizeof(rnd_hid_t);
 	xy_hid.name = "XY";
Index: trunk/src_plugins/hid_batch/batch.c
===================================================================
--- trunk/src_plugins/hid_batch/batch.c	(revision 30998)
+++ trunk/src_plugins/hid_batch/batch.c	(revision 30999)
@@ -340,7 +340,7 @@
 	PCB_API_CHK_VER;
 	memset(&batch_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&batch_hid);
+	rnd_hid_nogui_init(&batch_hid);
 
 	batch_hid.struct_size = sizeof(rnd_hid_t);
 	batch_hid.name = "batch";
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 30998)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 30999)
@@ -2948,7 +2948,7 @@
 
 	memset(&lesstif_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&lesstif_hid);
+	rnd_hid_nogui_init(&lesstif_hid);
 
 	lesstif_hid.struct_size = sizeof(rnd_hid_t);
 	lesstif_hid.name = "lesstif";
Index: trunk/src_plugins/hid_remote/remote.c
===================================================================
--- trunk/src_plugins/hid_remote/remote.c	(revision 30998)
+++ trunk/src_plugins/hid_remote/remote.c	(revision 30999)
@@ -394,7 +394,7 @@
 
 	memset(&remote_hid, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&remote_hid);
+	rnd_hid_nogui_init(&remote_hid);
 
 	remote_hid.struct_size = sizeof(rnd_hid_t);
 	remote_hid.name = "remote";
Index: trunk/src_plugins/io_tedax/tetest.c
===================================================================
--- trunk/src_plugins/io_tedax/tetest.c	(revision 30998)
+++ trunk/src_plugins/io_tedax/tetest.c	(revision 30999)
@@ -252,7 +252,7 @@
 {
 	memset(&exp_tedax_etest, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(&exp_tedax_etest);
+	rnd_hid_nogui_init(&exp_tedax_etest);
 
 	exp_tedax_etest.struct_size = sizeof(rnd_hid_t);
 	exp_tedax_etest.name = "tedax-etest";
Index: trunk/src_plugins/lib_gtk_common/glue_hid.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 30998)
+++ trunk/src_plugins/lib_gtk_common/glue_hid.c	(revision 30999)
@@ -643,7 +643,7 @@
 {
 	memset(dst, 0, sizeof(rnd_hid_t));
 
-	pcb_hid_nogui_init(dst);
+	rnd_hid_nogui_init(dst);
 
 	dst->struct_size = sizeof(rnd_hid_t);
 	dst->gui = 1;
Index: trunk/src_plugins/loghid/loghid.c
===================================================================
--- trunk/src_plugins/loghid/loghid.c	(revision 30998)
+++ trunk/src_plugins/loghid/loghid.c	(revision 30999)
@@ -121,8 +121,8 @@
 {
 	PCB_API_CHK_VER;
 
-	pcb_hid_nogui_init(&loghid_gui);
-	pcb_hid_nogui_init(&loghid_exp);
+	rnd_hid_nogui_init(&loghid_gui);
+	rnd_hid_nogui_init(&loghid_exp);
 
 	/* gui version */
 	loghid_gui.struct_size = sizeof(rnd_hid_t);