Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4900)
+++ trunk/doc-rnd/hacking/renames	(revision 4901)
@@ -420,3 +420,12 @@
 hid_get_flag -> pcb_hid_get_flag
 derive_default_filename -> pcb_derive_default_filename
 layer_type_to_file_name -> pcb_layer_type_to_file_name
+hid_init -> pcb_hid_init
+hid_uninit -> pcb_hid_uninit
+hid_find_gui -> pcb_hid_find_gui
+hid_find_printer -> pcb_hid_find_printer
+hid_find_exporter -> pcb_hid_find_exporter
+hid_enumerate -> pcb_hid_enumerate
+hid_parse_command_line -> pcb_hid_parse_command_line
+hid_register_hid -> pcb_hid_register_hid
+hid_remove_hid -> pcb_hid_remove_hid
Index: trunk/src/build_run.c
===================================================================
--- trunk/src/build_run.c	(revision 4900)
+++ trunk/src/build_run.c	(revision 4901)
@@ -98,7 +98,7 @@
 		gds_append_str(&info, "gEDA Wiki: http://wiki.geda-project.org\n\n");
 
 		gds_append_str(&info, "----- Compile Time Options -----\n");
-		hids = hid_enumerate();
+		hids = pcb_hid_enumerate();
 		gds_append_str(&info, "GUI:\n");
 		for (i = 0; hids[i]; i++) {
 			if (hids[i]->gui) {
Index: trunk/src/conf.c
===================================================================
--- trunk/src/conf.c	(revision 4900)
+++ trunk/src/conf.c	(revision 4901)
@@ -1781,7 +1781,7 @@
 	int n;
 	htsp_entry_t *e;
 
-	conf_hid_uninit();
+	conf_pcb_hid_uninit();
 
 	for(n = 0; n < CFR_max_alloc; n++)
 		if (conf_root[n] != NULL)
Index: trunk/src/conf_hid.c
===================================================================
--- trunk/src/conf_hid.c	(revision 4900)
+++ trunk/src/conf_hid.c	(revision 4901)
@@ -34,13 +34,13 @@
 static int conf_hid_id_next = 0;
 static htpp_t *conf_hid_ids = NULL;
 
-static void conf_hid_init(void)
+static void conf_pcb_hid_init(void)
 {
 	if (conf_hid_ids == NULL)
 		conf_hid_ids = htpp_alloc(ptrhash, ptrkeyeq);
 }
 
-void conf_hid_uninit(void)
+void conf_pcb_hid_uninit(void)
 {
 	if (conf_hid_ids != NULL) {
 		htpp_free(conf_hid_ids);
@@ -55,7 +55,7 @@
 	if (cookie == NULL)
 		return -1;
 
-	conf_hid_init();
+	conf_pcb_hid_init();
 	if (htpp_getentry(conf_hid_ids, (void *)cookie) != NULL)
 		return -1; /* already registered */
 
Index: trunk/src/conf_hid.h
===================================================================
--- trunk/src/conf_hid.h	(revision 4900)
+++ trunk/src/conf_hid.h	(revision 4901)
@@ -41,7 +41,7 @@
 /* Unregister a hid; if unreg_item cb is specified, call it on each config item */
 void conf_hid_unreg(const char *cookie);
 
-void conf_hid_uninit(void);
+void conf_pcb_hid_uninit(void);
 
 
 /* Call the local callback of a native item */
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 4900)
+++ trunk/src/gui_act.c	(revision 4901)
@@ -1195,7 +1195,7 @@
 
 static int ActionSwitchHID(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
-	pcb_hid_t *ng = hid_find_gui(argv[0]);
+	pcb_hid_t *ng = pcb_hid_find_gui(argv[0]);
 	int chg;
 
 	if (ng == NULL) {
Index: trunk/src/hid_attrib.c
===================================================================
--- trunk/src/hid_attrib.c	(revision 4900)
+++ trunk/src/hid_attrib.c	(revision 4901)
@@ -47,7 +47,7 @@
 	}
 }
 
-void hid_parse_command_line(int *argc, char ***argv)
+void pcb_hid_parse_command_line(int *argc, char ***argv)
 {
 	pcb_hid_attr_node_t *ha;
 	int i, e, ok;
Index: trunk/src/hid_init.c
===================================================================
--- trunk/src/hid_init.c	(revision 4900)
+++ trunk/src/hid_init.c	(revision 4901)
@@ -92,7 +92,7 @@
 	closedir(dir);
 }
 
-void hid_init()
+void pcb_hid_init()
 {
 	pcb_hid_actions_init();
 
@@ -114,7 +114,7 @@
 	hid_load_dir(Concat("plugins", NULL));
 }
 
-void hid_uninit(void)
+void pcb_hid_uninit(void)
 {
 	if (hid_num_hids > 0) {
 		int i;
@@ -129,7 +129,7 @@
 	pcb_hid_attributes_uninit();
 }
 
-void hid_register_hid(pcb_hid_t * hid)
+void pcb_hid_register_hid(pcb_hid_t * hid)
 {
 	int i;
 	int sz = (hid_num_hids + 2) * sizeof(pcb_hid_t *);
@@ -153,7 +153,7 @@
 	hid_list[hid_num_hids] = 0;
 }
 
-void hid_remove_hid(pcb_hid_t * hid)
+void pcb_hid_remove_hid(pcb_hid_t * hid)
 {
 	int i;
 
@@ -168,7 +168,7 @@
 }
 
 
-pcb_hid_t *hid_find_gui(const char *preference)
+pcb_hid_t *pcb_hid_find_gui(const char *preference)
 {
 	int i;
 
@@ -187,7 +187,7 @@
 	exit(1);
 }
 
-pcb_hid_t *hid_find_printer()
+pcb_hid_t *pcb_hid_find_printer()
 {
 	int i;
 
@@ -198,7 +198,7 @@
 	return 0;
 }
 
-pcb_hid_t *hid_find_exporter(const char *which)
+pcb_hid_t *pcb_hid_find_exporter(const char *which)
 {
 	int i;
 
@@ -215,7 +215,7 @@
 	return 0;
 }
 
-pcb_hid_t **hid_enumerate()
+pcb_hid_t **pcb_hid_enumerate()
 {
 	return hid_list;
 }
Index: trunk/src/hid_init.h
===================================================================
--- trunk/src/hid_init.h	(revision 4900)
+++ trunk/src/hid_init.h	(revision 4901)
@@ -4,7 +4,7 @@
 #include "hid.h"
 
 /* NULL terminated list of all static HID structures.  Built by
-   hid_register_hid, used by hid_find_*() and hid_enumerate().  The
+   hid_register_hid, used by hid_find_*() and pcb_hid_enumerate().  The
    order in this list is the same as the order of hid_register_hid
    calls.  */
 extern pcb_hid_t **hid_list;
@@ -14,25 +14,25 @@
 
 /* Call this as soon as possible from main().  No other HID calls are
    valid until this is called.  */
-void hid_init(void);
+void pcb_hid_init(void);
 
 /* Call this at exit */
-void hid_uninit(void);
+void pcb_hid_uninit(void);
 
 /* When PCB runs in interactive mode, this is called to instantiate
    one GUI HID which happens to be the GUI.  This HID is the one that
    interacts with the mouse and keyboard.  */
-pcb_hid_t *hid_find_gui(const char *preference);
+pcb_hid_t *pcb_hid_find_gui(const char *preference);
 
 /* Finds the one printer HID and instantiates it.  */
-pcb_hid_t *hid_find_printer(void);
+pcb_hid_t *pcb_hid_find_printer(void);
 
 /* Finds the indicated exporter HID and instantiates it.  */
-pcb_hid_t *hid_find_exporter(const char *);
+pcb_hid_t *pcb_hid_find_exporter(const char *);
 
 /* This returns a NULL-terminated array of available HIDs.  The only
    real reason to use this is to locate all the export-style HIDs. */
-pcb_hid_t **hid_enumerate(void);
+pcb_hid_t **pcb_hid_enumerate(void);
 
 /* HID internal interfaces.  These may ONLY be called from the HID
    modules, not from the common PCB code.  */
@@ -40,10 +40,10 @@
 /* A HID may use this if it does not need command line arguments in
    any special format; for example, the Lesstif HID needs to use the
    Xt parser, but the Postscript HID can use this function.  */
-void hid_parse_command_line(int *argc, char ***argv);
+void pcb_hid_parse_command_line(int *argc, char ***argv);
 
 /* Called by the init funcs, used to set up hid_list.  */
-extern void hid_register_hid(pcb_hid_t * hid);
-void hid_remove_hid(pcb_hid_t * hid);
+extern void pcb_hid_register_hid(pcb_hid_t * hid);
+void pcb_hid_remove_hid(pcb_hid_t * hid);
 
 #endif
Index: trunk/src/main.c
===================================================================
--- trunk/src/main.c	(revision 4900)
+++ trunk/src/main.c	(revision 4901)
@@ -229,7 +229,7 @@
 	PCB = NULL;
 
 	plugins_uninit();
-	hid_uninit();
+	pcb_hid_uninit();
 	pcb_events_uninit();
 
 	pcb_strflg_uninit_buf();
@@ -382,16 +382,16 @@
 	pcb_events_init();
 
 	buildin_init();
-	hid_init();
+	pcb_hid_init();
 	plugins_init();
 
 
 	/* Export pcb from command line if requested.  */
 	switch(do_what) {
-		case DO_PRINT:   exporter = gui = hid_find_printer(); break;
-		case DO_EXPORT:  exporter = gui = hid_find_exporter(hid_name); break;
+		case DO_PRINT:   exporter = gui = pcb_hid_find_printer(); break;
+		case DO_EXPORT:  exporter = gui = pcb_hid_find_exporter(hid_name); break;
 		case DO_GUI:
-			gui = hid_find_gui(argv[2]);
+			gui = pcb_hid_find_gui(argv[2]);
 			if (gui == NULL) {
 				pcb_message(PCB_MSG_DEFAULT, "Can't find the gui requested.\n");
 				exit(1);
@@ -404,7 +404,7 @@
 
 			gui = NULL;
 			conf_loop_list_str(&conf_core.rc.preferred_gui, i, g, n) {
-				gui = hid_find_gui(g);
+				gui = pcb_hid_find_gui(g);
 				if (gui != NULL)
 					break;
 			}
@@ -412,7 +412,7 @@
 			/* try anything */
 			if (gui == NULL) {
 				pcb_message(PCB_MSG_DEFAULT, "Warning: can't find any of the preferred GUIs, falling back to anything available...\n");
-				gui = hid_find_gui(NULL);
+				gui = pcb_hid_find_gui(NULL);
 			}
 		}
 	}
Index: trunk/src/main_act.c
===================================================================
--- trunk/src/main_act.c	(revision 4900)
+++ trunk/src/main_act.c	(revision 4901)
@@ -75,7 +75,7 @@
 
 static int help0(void)
 {
-	pcb_hid_t **hl = hid_enumerate();
+	pcb_hid_t **hl = pcb_hid_enumerate();
 	int i;
 
 	u("pcb-rnd Printed Circuit Board editing program, http://repo.hu/projects/pcb-rnd");
@@ -108,7 +108,7 @@
 
 static int help_invoc(void)
 {
-	pcb_hid_t **hl = hid_enumerate();
+	pcb_hid_t **hl = pcb_hid_enumerate();
 	int i;
 	int n_printer = 0, n_gui = 0, n_exporter = 0;
 
@@ -146,7 +146,7 @@
 {
 	u("");
 	if (argc > 0) {
-		pcb_hid_t **hl = hid_enumerate();
+		pcb_hid_t **hl = pcb_hid_enumerate();
 		int i;
 
 		if (strcmp(argv[0], "invocation") == 0)  return help_invoc();
Index: trunk/src_plugins/export_bboard/bboard.c
===================================================================
--- trunk/src_plugins/export_bboard/bboard.c	(revision 4900)
+++ trunk/src_plugins/export_bboard/bboard.c	(revision 4901)
@@ -572,7 +572,7 @@
 
 static void bboard_parse_arguments(int *argc, char ***argv)
 {
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 
@@ -605,7 +605,7 @@
 	bboard_hid.parse_arguments = bboard_parse_arguments;
 	bboard_hid.calibrate = bboard_calibrate;
 	bboard_hid.set_crosshair = bboard_set_crosshair;
-	hid_register_hid(&bboard_hid);
+	pcb_hid_register_hid(&bboard_hid);
 
 	pcb_hid_register_attributes(bboard_options, sizeof(bboard_options) / sizeof(bboard_options[0]), bboard_cookie, 0);
 	return NULL;
Index: trunk/src_plugins/export_bom/bom.c
===================================================================
--- trunk/src_plugins/export_bom/bom.c	(revision 4900)
+++ trunk/src_plugins/export_bom/bom.c	(revision 4901)
@@ -298,7 +298,7 @@
 static void bom_parse_arguments(int *argc, char ***argv)
 {
 	pcb_hid_register_attributes(bom_options, sizeof(bom_options) / sizeof(bom_options[0]), bom_cookie, 0);
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 pcb_hid_t bom_hid;
@@ -320,6 +320,6 @@
 
 	bom_hid.usage = bom_usage;
 
-	hid_register_hid(&bom_hid);
+	pcb_hid_register_hid(&bom_hid);
 	return NULL;
 }
Index: trunk/src_plugins/export_dsn/dsn.c
===================================================================
--- trunk/src_plugins/export_dsn/dsn.c	(revision 4900)
+++ trunk/src_plugins/export_dsn/dsn.c	(revision 4901)
@@ -560,7 +560,7 @@
 
 static void dsn_parse_arguments(int *argc, char ***argv)
 {
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 static void hid_dsn_uninit()
@@ -581,7 +581,7 @@
 	dsn_hid.get_export_options = dsn_get_export_options;
 	dsn_hid.do_export = dsn_do_export;
 	dsn_hid.parse_arguments = dsn_parse_arguments;
-	hid_register_hid(&dsn_hid);
+	pcb_hid_register_hid(&dsn_hid);
 
 	pcb_hid_register_attributes(dsn_options, sizeof(dsn_options) / sizeof(dsn_options[0]), dsn_cookie, 0);
 	return hid_dsn_uninit;
Index: trunk/src_plugins/export_dxf/dxf.c
===================================================================
--- trunk/src_plugins/export_dxf/dxf.c	(revision 4900)
+++ trunk/src_plugins/export_dxf/dxf.c	(revision 4901)
@@ -4344,7 +4344,7 @@
 #if DEBUG
 	fprintf(stderr, "[File: %s: line: %d] Entering dxf_parse_arguments () function.\n", __FILE__, __LINE__);
 #endif
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 #if DEBUG
 	fprintf(stderr, "[File: %s: line: %d] Leaving dxf_parse_arguments () function.\n", __FILE__, __LINE__);
 #endif
@@ -5964,7 +5964,7 @@
 	dxf_hid.fill_polygon = dxf_fill_polygon;
 	dxf_hid.fill_rect = dxf_fill_rect;
 
-	hid_register_hid(&dxf_hid);
+	pcb_hid_register_hid(&dxf_hid);
 
 	pcb_hid_register_attributes(dxf_options, sizeof(dxf_options) / sizeof(dxf_options[0]), dxf_cookie, 0);
 
Index: trunk/src_plugins/export_gcode/gcode.c
===================================================================
--- trunk/src_plugins/export_gcode/gcode.c	(revision 4900)
+++ trunk/src_plugins/export_gcode/gcode.c	(revision 4901)
@@ -223,7 +223,7 @@
 static void gcode_parse_arguments(int *argc, char ***argv)
 {
 	pcb_hid_register_attributes(gcode_attribute_list, sizeof(gcode_attribute_list) / sizeof(gcode_attribute_list[0]), gcode_cookie, 0);
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 static pcb_hid_attribute_t *gcode_get_export_options(int *n)
@@ -911,7 +911,7 @@
 
 	gcode_hid.usage = gcode_usage;
 
-	hid_register_hid(&gcode_hid);
+	pcb_hid_register_hid(&gcode_hid);
 
 	return NULL;
 }
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 4900)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 4901)
@@ -596,7 +596,7 @@
 static void gerber_parse_arguments(int *argc, char ***argv)
 {
 	pcb_hid_register_attributes(gerber_options, NUM_OPTIONS, gerber_cookie, 0);
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 static int drill_sort(const void *va, const void *vb)
@@ -1196,6 +1196,6 @@
 	gerber_hid.set_crosshair = gerber_set_crosshair;
 	gerber_hid.usage = gerber_usage;
 
-	hid_register_hid(&gerber_hid);
+	pcb_hid_register_hid(&gerber_hid);
 	return NULL;
 }
Index: trunk/src_plugins/export_ipcd356/ipcd356.c
===================================================================
--- trunk/src_plugins/export_ipcd356/ipcd356.c	(revision 4900)
+++ trunk/src_plugins/export_ipcd356/ipcd356.c	(revision 4901)
@@ -598,7 +598,7 @@
 
 static void IPCD356_parse_arguments(int *argc, char ***argv)
 {
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 pcb_hid_t IPCD356_hid;
@@ -618,7 +618,7 @@
 	IPCD356_hid.do_export = IPCD356_do_export;
 	IPCD356_hid.parse_arguments = IPCD356_parse_arguments;
 
-	hid_register_hid(&IPCD356_hid);
+	pcb_hid_register_hid(&IPCD356_hid);
 
 	pcb_hid_register_attributes(IPCD356_options, sizeof(IPCD356_options) / sizeof(IPCD356_options[0]), ipcd356_cookie, 0);
 	return NULL;
Index: trunk/src_plugins/export_lpr/lpr.c
===================================================================
--- trunk/src_plugins/export_lpr/lpr.c	(revision 4900)
+++ trunk/src_plugins/export_lpr/lpr.c	(revision 4901)
@@ -100,7 +100,7 @@
 {
 	lpr_get_export_options(0);
 	pcb_hid_register_attributes(lpr_options, num_lpr_options, lpr_cookie, 0);
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 static void lpr_calibrate(double xval, double yval)
@@ -143,7 +143,7 @@
 
 	lpr_hid.usage = lpr_usage;
 
-	hid_register_hid(&lpr_hid);
+	pcb_hid_register_hid(&lpr_hid);
 
 	return plugin_lpr_uninit;
 }
Index: trunk/src_plugins/export_nelma/nelma.c
===================================================================
--- trunk/src_plugins/export_nelma/nelma.c	(revision 4900)
+++ trunk/src_plugins/export_nelma/nelma.c	(revision 4901)
@@ -477,7 +477,7 @@
 static void nelma_parse_arguments(int *argc, char ***argv)
 {
 	pcb_hid_register_attributes(nelma_attribute_list, sizeof(nelma_attribute_list) / sizeof(nelma_attribute_list[0]), nelma_cookie, 0);
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 static pcb_hid_attribute_t *nelma_get_export_options(int *n)
@@ -1020,6 +1020,6 @@
 
 	nelma_hid.usage = nelma_usage;
 
-	hid_register_hid(&nelma_hid);
+	pcb_hid_register_hid(&nelma_hid);
 	return NULL;
 }
Index: trunk/src_plugins/export_openscad/scad.c
===================================================================
--- trunk/src_plugins/export_openscad/scad.c	(revision 4900)
+++ trunk/src_plugins/export_openscad/scad.c	(revision 4901)
@@ -722,7 +722,7 @@
 
 static void scad_parse_arguments(int *argc, char ***argv)
 {
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 static int scad_set_layer(const char *name, int group, int empty)
@@ -1168,7 +1168,7 @@
 	scad_hid.fill_polygon = scad_fill_polygon;
 	scad_hid.fill_rect = scad_fill_rect;
 
-	hid_register_hid(&scad_hid);
+	pcb_hid_register_hid(&scad_hid);
 
 	pcb_hid_register_attributes(scad_options, sizeof(scad_options) / sizeof(scad_options[0]), openscad_cookie, 0);
 	return NULL;
Index: trunk/src_plugins/export_png/png.c
===================================================================
--- trunk/src_plugins/export_png/png.c	(revision 4900)
+++ trunk/src_plugins/export_png/png.c	(revision 4901)
@@ -937,7 +937,7 @@
 static void png_parse_arguments(int *argc, char ***argv)
 {
 	pcb_hid_register_attributes(png_attribute_list, sizeof(png_attribute_list) / sizeof(png_attribute_list[0]), png_cookie, 0);
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 
@@ -1525,7 +1525,7 @@
 	png_hid.usage = png_usage;
 
 #ifdef HAVE_SOME_FORMAT
-	hid_register_hid(&png_hid);
+	pcb_hid_register_hid(&png_hid);
 
 #endif
 	return NULL;
Index: trunk/src_plugins/export_ps/eps.c
===================================================================
--- trunk/src_plugins/export_ps/eps.c	(revision 4900)
+++ trunk/src_plugins/export_ps/eps.c	(revision 4901)
@@ -337,7 +337,7 @@
 static void eps_parse_arguments(int *argc, char ***argv)
 {
 	pcb_hid_register_attributes(eps_attribute_list, sizeof(eps_attribute_list) / sizeof(eps_attribute_list[0]), ps_cookie, 0);
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 static int is_mask;
@@ -634,5 +634,5 @@
 
 	eps_hid.usage = eps_usage;
 
-	hid_register_hid(&eps_hid);
+	pcb_hid_register_hid(&eps_hid);
 }
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 4900)
+++ trunk/src_plugins/export_ps/ps.c	(revision 4901)
@@ -745,7 +745,7 @@
 static void ps_parse_arguments(int *argc, char ***argv)
 {
 	pcb_hid_register_attributes(ps_attribute_list, NUM_OPTIONS, ps_cookie, 0);
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 static void corner(FILE * fh, pcb_coord_t x, pcb_coord_t y, pcb_coord_t dx, pcb_coord_t dy)
@@ -1624,7 +1624,7 @@
 
 	ps_hid.usage = ps_usage;
 
-	hid_register_hid(&ps_hid);
+	pcb_hid_register_hid(&ps_hid);
 
 	hid_eps_init();
 	return plugin_ps_uninit;
Index: trunk/src_plugins/export_svg/svg.c
===================================================================
--- trunk/src_plugins/export_svg/svg.c	(revision 4900)
+++ trunk/src_plugins/export_svg/svg.c	(revision 4901)
@@ -326,7 +326,7 @@
 static void svg_parse_arguments(int *argc, char ***argv)
 {
 	pcb_hid_register_attributes(svg_attribute_list, sizeof(svg_attribute_list) / sizeof(svg_attribute_list[0]), svg_cookie, 0);
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 static int svg_set_layer(const char *name, int group, int empty)
@@ -729,7 +729,7 @@
 
 	svg_hid.usage = svg_usage;
 
-	hid_register_hid(&svg_hid);
+	pcb_hid_register_hid(&svg_hid);
 
 	return NULL;
 }
Index: trunk/src_plugins/export_test/export_test.c
===================================================================
--- trunk/src_plugins/export_test/export_test.c	(revision 4900)
+++ trunk/src_plugins/export_test/export_test.c	(revision 4901)
@@ -325,7 +325,7 @@
 static void export_test_parse_arguments(int *argc, char ***argv)
 {
 	pcb_hid_register_attributes(export_test_options, sizeof(export_test_options) / sizeof(export_test_options[0]), export_test_cookie, 0);
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 pcb_hid_t export_test_hid;
@@ -347,6 +347,6 @@
 
 	export_test_hid.usage = export_test_usage;
 
-	hid_register_hid(&export_test_hid);
+	pcb_hid_register_hid(&export_test_hid);
 	return NULL;
 }
Index: trunk/src_plugins/export_xy/xy.c
===================================================================
--- trunk/src_plugins/export_xy/xy.c	(revision 4900)
+++ trunk/src_plugins/export_xy/xy.c	(revision 4901)
@@ -359,7 +359,7 @@
 static void xy_parse_arguments(int *argc, char ***argv)
 {
 	pcb_hid_register_attributes(xy_options, sizeof(xy_options) / sizeof(xy_options[0]), xy_cookie, 0);
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 pcb_hid_t xy_hid;
@@ -381,6 +381,6 @@
 
 	xy_hid.usage = xy_usage;
 
-	hid_register_hid(&xy_hid);
+	pcb_hid_register_hid(&xy_hid);
 	return NULL;
 }
Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.c
===================================================================
--- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.c	(revision 4900)
+++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid.c	(revision 4901)
@@ -280,7 +280,7 @@
 	gpmi_hid_t *hid = cl->argv[0].p;
 	int n;
 
-	hid_remove_hid(hid->hid);
+	pcb_hid_remove_hid(hid->hid);
 
 	for(n = 0; n < hid->attr_num; n++) {
 		free((char *)hid->attr[n].name);
@@ -300,7 +300,7 @@
 
 int hid_register(gpmi_hid_t *hid)
 {
-	hid_register_hid(hid->hid);
+	pcb_hid_register_hid(hid->hid);
 
 	gpmi_mod_cleanup_insert(NULL, cleanup_hid_reg, "p", hid);
 
Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c
===================================================================
--- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c	(revision 4900)
+++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/hid/hid_callbacks.c	(revision 4901)
@@ -75,7 +75,7 @@
 void gpmi_hid_parse_arguments(int *pcbargc, char ***pcbargv)
 {
 	/* Do nothing for now */
-	hid_parse_command_line(pcbargc, pcbargv);
+	pcb_hid_parse_command_line(pcbargc, pcbargv);
 }
 
 void gpmi_hid_set_crosshair(int x, int y, int cursor_action)
Index: trunk/src_plugins/hid_batch/batch.c
===================================================================
--- trunk/src_plugins/hid_batch/batch.c	(revision 4900)
+++ trunk/src_plugins/hid_batch/batch.c	(revision 4901)
@@ -162,7 +162,7 @@
 
 static void batch_parse_arguments(int *argc, char ***argv)
 {
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 static void batch_invalidate_lr(int l, int r, int t, int b)
@@ -394,7 +394,7 @@
 	batch_hid.propedit_add_stat = batch_propedit_add_stat;
 
 
-	hid_register_hid(&batch_hid);
+	pcb_hid_register_hid(&batch_hid);
 	return NULL;
 }
 
Index: trunk/src_plugins/hid_gtk/gtkhid-main.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-main.c	(revision 4900)
+++ trunk/src_plugins/hid_gtk/gtkhid-main.c	(revision 4901)
@@ -1379,7 +1379,7 @@
 	int i;
 	pcb_hid_t *printer = NULL;
 
-	hids = hid_enumerate();
+	hids = pcb_hid_enumerate();
 	for (i = 0; hids[i]; i++) {
 		if (hids[i]->printer)
 			printer = hids[i];
@@ -1427,7 +1427,7 @@
 
 static int PrintCalibrate(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
-	pcb_hid_t *printer = hid_find_printer();
+	pcb_hid_t *printer = pcb_hid_find_printer();
 	printer->calibrate(0.0, 0.0);
 
 	if (gui->attribute_dialog(printer_calibrate_attrs, 3,
@@ -2124,7 +2124,7 @@
 
 	ghid_hid.usage = ghid_usage;
 
-	hid_register_hid(&ghid_hid);
+	pcb_hid_register_hid(&ghid_hid);
 
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	conf_reg_field(conf_hid_gtk, field,isarray,type_name,cpath,cname,desc,flags);
Index: trunk/src_plugins/hid_gtk/gui-dialog-print.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-dialog-print.c	(revision 4900)
+++ trunk/src_plugins/hid_gtk/gui-dialog-print.c	(revision 4901)
@@ -383,7 +383,7 @@
 	 * reflected in this dialog box.
 	 */
 
-	hids = hid_enumerate();
+	hids = pcb_hid_enumerate();
 	for (i = 0; hids[i]; i++) {
 		if (hids[i]->exporter) {
 			no_exporter = FALSE;
Index: trunk/src_plugins/hid_lesstif/dialogs.c
===================================================================
--- trunk/src_plugins/hid_lesstif/dialogs.c	(revision 4900)
+++ trunk/src_plugins/hid_lesstif/dialogs.c	(revision 4901)
@@ -894,7 +894,7 @@
 	pcb_hid_attr_val_t *vals;
 	int n;
 
-	printer = hid_find_printer();
+	printer = pcb_hid_find_printer();
 	if (!printer) {
 		lesstif_confirm_dialog("No printer?", "Oh well", 0);
 		return 1;
@@ -934,7 +934,7 @@
 
 static int PrintCalibrate(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
-	pcb_hid_t *printer = hid_find_printer();
+	pcb_hid_t *printer = pcb_hid_find_printer();
 	printer->calibrate(0.0, 0.0);
 	if (gui->attribute_dialog(printer_calibrate_attrs, 3,
 														printer_calibrate_values,
@@ -965,7 +965,7 @@
 	Widget prev = 0;
 	Widget w;
 
-	hids = hid_enumerate();
+	hids = pcb_hid_enumerate();
 
 	if (!selector) {
 		stdarg_n = 0;
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 4900)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 4901)
@@ -3830,7 +3830,7 @@
 	lesstif_hid.create_menu = lesstif_create_menu;
 	lesstif_hid.usage = lesstif_usage;
 
-	hid_register_hid(&lesstif_hid);
+	pcb_hid_register_hid(&lesstif_hid);
 
 	return NULL;
 }
Index: trunk/src_plugins/hid_remote/remote.c
===================================================================
--- trunk/src_plugins/hid_remote/remote.c	(revision 4900)
+++ trunk/src_plugins/hid_remote/remote.c	(revision 4901)
@@ -108,7 +108,7 @@
 
 static void remote_parse_arguments(int *argc, char ***argv)
 {
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 }
 
 static void remote_invalidate_lr(int l, int r, int t, int b)
@@ -429,7 +429,7 @@
 
 	PCB_REGISTER_ACTIONS(remote_action_list, remote_cookie)
 
-	hid_register_hid(&remote_hid);
+	pcb_hid_register_hid(&remote_hid);
 
 
 	return hid_hid_remote_uninit;
Index: trunk/src_plugins/loghid/loghid.c
===================================================================
--- trunk/src_plugins/loghid/loghid.c	(revision 4900)
+++ trunk/src_plugins/loghid/loghid.c	(revision 4901)
@@ -50,14 +50,14 @@
 	const char *target_name;
 
 	pcb_hid_register_attributes(loghid_attribute_list, NUM_OPTIONS, loghid_cookie, 0);
-	hid_parse_command_line(argc, argv);
+	pcb_hid_parse_command_line(argc, argv);
 
 	target_name = loghid_attribute_list[HA_target_hid].default_val.str_value;
 
 	if (is_gui)
-		target = hid_find_gui(target_name);
+		target = pcb_hid_find_gui(target_name);
 	else
-		target = hid_find_exporter(target_name);
+		target = pcb_hid_find_exporter(target_name);
 
 #warning TODO:
 	fprintf(stderr, "Initialize for delegatee: '%s' -> %p\n", target_name, (void *)target);
@@ -121,7 +121,7 @@
 	loghid_gui.usage = loghid_usage;
 	loghid_gui.parse_arguments = loghid_parse_arguments_gui;
 
-	hid_register_hid(&loghid_gui);
+	pcb_hid_register_hid(&loghid_gui);
 
 	/* export version */
 	loghid_exp.struct_size = sizeof(pcb_hid_t);
@@ -132,7 +132,7 @@
 	loghid_exp.usage = loghid_usage;
 	loghid_exp.parse_arguments = loghid_parse_arguments_exp;
 
-	hid_register_hid(&loghid_exp);
+	pcb_hid_register_hid(&loghid_exp);
 
 	return hid_loghid_uninit;
 }