Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4891)
+++ trunk/doc-rnd/hacking/renames	(revision 4892)
@@ -364,3 +364,9 @@
 hid_actions_init -> pcb_hid_actions_init
 hid_actions_uninit -> pcb_hid_actions_uninit
 REGISTER_ATTRIBUTES -> PCB_REGISTER_ATTRIBUTES
+print_actions -> pcb_print_actions
+dump_actions -> pcb_dump_actions
+hid_find_action -> pcb_hid_find_action
+hid_remove_actions -> pcb_hid_remove_actions
+hid_remove_action -> pcb_hid_remove_action
+hid_remove_actions_by_cookie -> pcb_hid_remove_actions_by_cookie
Index: trunk/src/hid_actions.c
===================================================================
--- trunk/src/hid_actions.c	(revision 4891)
+++ trunk/src/hid_actions.c	(revision 4892)
@@ -73,7 +73,7 @@
 	pcb_hid_register_actions(a, 1, cookie, copy);
 }
 
-void hid_remove_actions(const pcb_hid_action_t * a, int n)
+void pcb_hid_remove_actions(const pcb_hid_action_t * a, int n)
 {
 	int i;
 
@@ -88,7 +88,7 @@
 	}
 }
 
-void hid_remove_actions_by_cookie(const char *cookie)
+void pcb_hid_remove_actions_by_cookie(const char *cookie)
 {
 	htsp_entry_t *e;
 
@@ -106,7 +106,7 @@
 	}
 }
 
-void hid_remove_action(const pcb_hid_action_t * a)
+void pcb_hid_remove_action(const pcb_hid_action_t * a)
 {
 	htsp_entry_t *e;
 
@@ -120,7 +120,7 @@
 	}
 }
 
-const pcb_hid_action_t *hid_find_action(const char *name)
+const pcb_hid_action_t *pcb_hid_find_action(const char *name)
 {
 	hid_cookie_action_t *ca;
 
@@ -137,7 +137,7 @@
 	return 0;
 }
 
-void print_actions()
+void pcb_print_actions()
 {
 	htsp_entry_t *e;
 
@@ -181,7 +181,7 @@
 		putchar('\n');
 }
 
-void dump_actions(void)
+void pcb_dump_actions(void)
 {
 	htsp_entry_t *e;
 
@@ -250,7 +250,7 @@
 	if (!name)
 		return 1;
 
-	a = hid_find_action(name);
+	a = pcb_hid_find_action(name);
 	if (!a) {
 		int i;
 		if (action_legal_unknown(name))
Index: trunk/src/hid_actions.h
===================================================================
--- trunk/src/hid_actions.h	(revision 4891)
+++ trunk/src/hid_actions.h	(revision 4892)
@@ -4,18 +4,18 @@
 #include "hid.h"
 
 /* These are called from main_act.c */
-void print_actions(void);
-void dump_actions(void);
+void pcb_print_actions(void);
+void pcb_dump_actions(void);
 
 
 /* HID internal interfaces.  These may ONLY be called from the HID
    modules, not from the common PCB code.  */
 
-const pcb_hid_action_t *hid_find_action(const char *name);
+const pcb_hid_action_t *pcb_hid_find_action(const char *name);
 
-extern void hid_remove_actions(const pcb_hid_action_t * a, int n);
-extern void hid_remove_action(const pcb_hid_action_t * a);
-extern void hid_remove_actions_by_cookie(const char *cookie);
+extern void pcb_hid_remove_actions(const pcb_hid_action_t * a, int n);
+extern void pcb_hid_remove_action(const pcb_hid_action_t * a);
+extern void pcb_hid_remove_actions_by_cookie(const char *cookie);
 
 int hid_action(const char *action_);
 int hid_actionl(const char *action_, ...);	/* NULL terminated */
Index: trunk/src/hid_flags.c
===================================================================
--- trunk/src/hid_flags.c	(revision 4891)
+++ trunk/src/hid_flags.c	(revision 4892)
@@ -39,7 +39,7 @@
 			}
 			memcpy(buff, name, len);
 			buff[len] = '\0';
-			a = hid_find_action(buff);
+			a = pcb_hid_find_action(buff);
 			if (!a) {
 				pcb_message(PCB_MSG_DEFAULT, "hid_get_flag: no action %s\n", name);
 				return -1;
Index: trunk/src/main_act.c
===================================================================
--- trunk/src/main_act.c	(revision 4891)
+++ trunk/src/main_act.c	(revision 4892)
@@ -42,7 +42,7 @@
 
 int ActionPrintActions(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
-	print_actions();
+	pcb_print_actions();
 	return 0;
 }
 /* --------------------------------------------------------------------------- */
@@ -53,7 +53,7 @@
 
 int ActionDumpActions(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
-	dump_actions();
+	pcb_dump_actions();
 	return 0;
 }
 
Index: trunk/src_plugins/autocrop/autocrop.c
===================================================================
--- trunk/src_plugins/autocrop/autocrop.c	(revision 4891)
+++ trunk/src_plugins/autocrop/autocrop.c	(revision 4892)
@@ -236,7 +236,7 @@
 
 static void hid_autocrop_uninit(void)
 {
-	hid_remove_actions_by_cookie(autocrop_cookie);
+	pcb_hid_remove_actions_by_cookie(autocrop_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/autoplace/action.c
===================================================================
--- trunk/src_plugins/autoplace/action.c	(revision 4891)
+++ trunk/src_plugins/autoplace/action.c	(revision 4892)
@@ -65,7 +65,7 @@
 
 static void hid_autoplace_uninit(void)
 {
-	hid_remove_actions_by_cookie(autoplace_cookie);
+	pcb_hid_remove_actions_by_cookie(autoplace_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/autoroute/action.c
===================================================================
--- trunk/src_plugins/autoroute/action.c	(revision 4891)
+++ trunk/src_plugins/autoroute/action.c	(revision 4892)
@@ -91,7 +91,7 @@
 
 static void hid_autoroute_uninit(void)
 {
-	hid_remove_actions_by_cookie(autoroute_cookie);
+	pcb_hid_remove_actions_by_cookie(autoroute_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/boardflip/boardflip.c
===================================================================
--- trunk/src_plugins/boardflip/boardflip.c	(revision 4891)
+++ trunk/src_plugins/boardflip/boardflip.c	(revision 4892)
@@ -172,7 +172,7 @@
 
 static void hid_boardflip_uninit(void)
 {
-	hid_remove_actions_by_cookie(boardflip_cookie);
+	pcb_hid_remove_actions_by_cookie(boardflip_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/dbus/dbus.c
===================================================================
--- trunk/src_plugins/dbus/dbus.c	(revision 4891)
+++ trunk/src_plugins/dbus/dbus.c	(revision 4892)
@@ -377,7 +377,7 @@
 {
 	pcb_dbus_finish();
 	pcb_event_unbind_allcookie(dbus_cookie);
-/*	hid_remove_actions_by_cookie(dbus_cookie);*/
+/*	pcb_hid_remove_actions_by_cookie(dbus_cookie);*/
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/diag/diag.c
===================================================================
--- trunk/src_plugins/diag/diag.c	(revision 4891)
+++ trunk/src_plugins/diag/diag.c	(revision 4892)
@@ -193,7 +193,7 @@
 
 static void hid_diag_uninit(void)
 {
-	hid_remove_actions_by_cookie(diag_cookie);
+	pcb_hid_remove_actions_by_cookie(diag_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/distalign/distalign.c
===================================================================
--- trunk/src_plugins/distalign/distalign.c	(revision 4891)
+++ trunk/src_plugins/distalign/distalign.c	(revision 4892)
@@ -629,7 +629,7 @@
 
 static void hid_distalign_uninit(void)
 {
-	hid_remove_actions_by_cookie(distalign_cookie);
+	pcb_hid_remove_actions_by_cookie(distalign_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/distaligntext/distaligntext.c
===================================================================
--- trunk/src_plugins/distaligntext/distaligntext.c	(revision 4891)
+++ trunk/src_plugins/distaligntext/distaligntext.c	(revision 4892)
@@ -626,7 +626,7 @@
 
 static void hid_distaligntext_uninit(void)
 {
-	hid_remove_actions_by_cookie(distaligntext_cookie);
+	pcb_hid_remove_actions_by_cookie(distaligntext_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/djopt/djopt.c
===================================================================
--- trunk/src_plugins/djopt/djopt.c	(revision 4891)
+++ trunk/src_plugins/djopt/djopt.c	(revision 4892)
@@ -2686,7 +2686,7 @@
 
 static void hid_djopt_uninit(void)
 {
-	hid_remove_actions_by_cookie(djopt_cookie);
+	pcb_hid_remove_actions_by_cookie(djopt_cookie);
 	conf_unreg_fields("plugins/djopt/");
 }
 
Index: trunk/src_plugins/export_lpr/lpr.c
===================================================================
--- trunk/src_plugins/export_lpr/lpr.c	(revision 4891)
+++ trunk/src_plugins/export_lpr/lpr.c	(revision 4892)
@@ -120,7 +120,7 @@
 
 static void plugin_lpr_uninit(void)
 {
-	hid_remove_actions_by_cookie(lpr_cookie);
+	pcb_hid_remove_actions_by_cookie(lpr_cookie);
 }
 
 pcb_uninit_t hid_export_lpr_init()
Index: trunk/src_plugins/export_ps/ps.c
===================================================================
--- trunk/src_plugins/export_ps/ps.c	(revision 4891)
+++ trunk/src_plugins/export_ps/ps.c	(revision 4892)
@@ -1603,7 +1603,7 @@
 
 static void plugin_ps_uninit(void)
 {
-	hid_remove_actions_by_cookie(ps_cookie);
+	pcb_hid_remove_actions_by_cookie(ps_cookie);
 	ps_inited = 0;
 }
 
Index: trunk/src_plugins/fontmode/fontmode.c
===================================================================
--- trunk/src_plugins/fontmode/fontmode.c	(revision 4891)
+++ trunk/src_plugins/fontmode/fontmode.c	(revision 4892)
@@ -233,7 +233,7 @@
 
 static void hid_fontmode_uninit(void)
 {
-	hid_remove_actions_by_cookie(fontmode_cookie);
+	pcb_hid_remove_actions_by_cookie(fontmode_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/actions.c
===================================================================
--- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/actions.c	(revision 4891)
+++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/actions/actions.c	(revision 4892)
@@ -55,7 +55,7 @@
 static void cleanup_action(gpmi_module *mod, gpmi_cleanup *cl)
 {
 	acontext_t *ctx = cl->argv[0].p;
-	hid_remove_action(&ctx->action);
+	pcb_hid_remove_action(&ctx->action);
 	free((char *)ctx->action.name);
 	if (ctx->action.need_coord_msg != NULL)
 		free((char *)ctx->action.need_coord_msg);
Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c
===================================================================
--- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c	(revision 4891)
+++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c	(revision 4892)
@@ -213,7 +213,7 @@
 static void plugin_gpmi_uninit(void)
 {
 	pcb_event_unbind_allcookie(gpmi_cookie);
-	hid_remove_actions_by_cookie(gpmi_cookie);
+	pcb_hid_remove_actions_by_cookie(gpmi_cookie);
 	hid_gpmi_script_info_uninit();
 	gpmi_pkg_unload(pkg_scripts);
 	gpmi_uninit();
Index: trunk/src_plugins/hid_batch/batch.c
===================================================================
--- trunk/src_plugins/hid_batch/batch.c	(revision 4891)
+++ trunk/src_plugins/hid_batch/batch.c	(revision 4892)
@@ -41,7 +41,7 @@
 
 static void hid_batch_uninit(void)
 {
-	hid_remove_actions_by_cookie(batch_cookie);
+	pcb_hid_remove_actions_by_cookie(batch_cookie);
 	if (prompt != NULL)
 		free(prompt);
 }
@@ -71,7 +71,7 @@
 
 static int help(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
-	print_actions();
+	pcb_print_actions();
 	return 0;
 }
 
@@ -405,5 +405,5 @@
 
 static void batch_end(void)
 {
-	hid_remove_actions_by_cookie(batch_cookie);
+	pcb_hid_remove_actions_by_cookie(batch_cookie);
 }
Index: trunk/src_plugins/hid_gtk/gtkhid-main.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-main.c	(revision 4891)
+++ trunk/src_plugins/hid_gtk/gtkhid-main.c	(revision 4892)
@@ -2150,7 +2150,7 @@
 
 void gtkhid_end(void)
 {
-	hid_remove_actions_by_cookie(ghid_cookie);
+	pcb_hid_remove_actions_by_cookie(ghid_cookie);
 	hid_remove_attributes_by_cookie(ghid_cookie);
 	gtkhid_active = 0;
 }
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 4891)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 4892)
@@ -3848,6 +3848,6 @@
 
 static void lesstif_end(void)
 {
-	hid_remove_actions_by_cookie(lesstif_cookie);
+	pcb_hid_remove_actions_by_cookie(lesstif_cookie);
 	hid_remove_attributes_by_cookie(lesstif_cookie);
 }
Index: trunk/src_plugins/hid_remote/remote.c
===================================================================
--- trunk/src_plugins/hid_remote/remote.c	(revision 4891)
+++ trunk/src_plugins/hid_remote/remote.c	(revision 4892)
@@ -47,7 +47,7 @@
 
 static int help(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
-	print_actions();
+	pcb_print_actions();
 	return 0;
 }
 
@@ -370,7 +370,7 @@
 
 static void hid_hid_remote_uninit()
 {
-	hid_remove_actions_by_cookie(remote_cookie);
+	pcb_hid_remove_actions_by_cookie(remote_cookie);
 }
 
 pcb_uninit_t hid_hid_remote_init()
Index: trunk/src_plugins/import_sch/import_sch.c
===================================================================
--- trunk/src_plugins/import_sch/import_sch.c	(revision 4891)
+++ trunk/src_plugins/import_sch/import_sch.c	(revision 4892)
@@ -455,7 +455,7 @@
 
 static void hid_import_sch_uninit(void)
 {
-	hid_remove_actions_by_cookie(import_sch_cookie);
+	pcb_hid_remove_actions_by_cookie(import_sch_cookie);
 	conf_unreg_fields("plugins/import_sch/");
 }
 
Index: trunk/src_plugins/jostle/jostle.c
===================================================================
--- trunk/src_plugins/jostle/jostle.c	(revision 4891)
+++ trunk/src_plugins/jostle/jostle.c	(revision 4892)
@@ -551,7 +551,7 @@
 
 static void hid_jostle_uninit(void)
 {
-	hid_remove_actions_by_cookie(jostle_cookie);
+	pcb_hid_remove_actions_by_cookie(jostle_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/oldactions/oldactions.c
===================================================================
--- trunk/src_plugins/oldactions/oldactions.c	(revision 4891)
+++ trunk/src_plugins/oldactions/oldactions.c	(revision 4892)
@@ -308,7 +308,7 @@
 
 static void hid_oldactions_uninit(void)
 {
-	hid_remove_actions_by_cookie(oldactions_cookie);
+	pcb_hid_remove_actions_by_cookie(oldactions_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/polycombine/polycombine.c
===================================================================
--- trunk/src_plugins/polycombine/polycombine.c	(revision 4891)
+++ trunk/src_plugins/polycombine/polycombine.c	(revision 4892)
@@ -350,7 +350,7 @@
 
 static void hid_polycombine_uninit(void)
 {
-	hid_remove_actions_by_cookie(polycombine_cookie);
+	pcb_hid_remove_actions_by_cookie(polycombine_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/polystitch/polystitch.c
===================================================================
--- trunk/src_plugins/polystitch/polystitch.c	(revision 4891)
+++ trunk/src_plugins/polystitch/polystitch.c	(revision 4892)
@@ -251,7 +251,7 @@
 
 static void hid_polystitch_uninit(void)
 {
-	hid_remove_actions_by_cookie(polystitch_cookie);
+	pcb_hid_remove_actions_by_cookie(polystitch_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/propedit/propedit.c
===================================================================
--- trunk/src_plugins/propedit/propedit.c	(revision 4891)
+++ trunk/src_plugins/propedit/propedit.c	(revision 4892)
@@ -83,7 +83,7 @@
 
 static void hid_propedit_uninit(void)
 {
-	hid_remove_actions_by_cookie(propedit_cookie);
+	pcb_hid_remove_actions_by_cookie(propedit_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/puller/puller.c
===================================================================
--- trunk/src_plugins/puller/puller.c	(revision 4891)
+++ trunk/src_plugins/puller/puller.c	(revision 4892)
@@ -2393,7 +2393,7 @@
 
 static void hid_puller_uninit(void)
 {
-	hid_remove_actions_by_cookie(puller_cookie);
+	pcb_hid_remove_actions_by_cookie(puller_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/query/query.c
===================================================================
--- trunk/src_plugins/query/query.c	(revision 4891)
+++ trunk/src_plugins/query/query.c	(revision 4892)
@@ -280,7 +280,7 @@
 
 static void hid_query_uninit(void)
 {
-	hid_remove_actions_by_cookie(query_cookie);
+	pcb_hid_remove_actions_by_cookie(query_cookie);
 }
 
 void pcb_qry_basic_fnc_init(void);
Index: trunk/src_plugins/renumber/renumber.c
===================================================================
--- trunk/src_plugins/renumber/renumber.c	(revision 4891)
+++ trunk/src_plugins/renumber/renumber.c	(revision 4892)
@@ -369,7 +369,7 @@
 
 static void hid_renumber_uninit(void)
 {
-	hid_remove_actions_by_cookie(renumber_cookie);
+	pcb_hid_remove_actions_by_cookie(renumber_cookie);
 }
 
 PCB_REGISTER_ACTIONS(renumber_action_list, renumber_cookie)
Index: trunk/src_plugins/report/report.c
===================================================================
--- trunk/src_plugins/report/report.c	(revision 4891)
+++ trunk/src_plugins/report/report.c	(revision 4892)
@@ -905,7 +905,7 @@
 
 static void hid_report_uninit(void)
 {
-	hid_remove_actions_by_cookie(report_cookie);
+	pcb_hid_remove_actions_by_cookie(report_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/shand_cmd/command.c
===================================================================
--- trunk/src_plugins/shand_cmd/command.c	(revision 4891)
+++ trunk/src_plugins/shand_cmd/command.c	(revision 4892)
@@ -403,7 +403,7 @@
 
 static void hid_shand_cmd_uninit(void)
 {
-	hid_remove_actions_by_cookie(shand_cmd_cookie);
+	pcb_hid_remove_actions_by_cookie(shand_cmd_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/smartdisperse/smartdisperse.c
===================================================================
--- trunk/src_plugins/smartdisperse/smartdisperse.c	(revision 4891)
+++ trunk/src_plugins/smartdisperse/smartdisperse.c	(revision 4892)
@@ -273,7 +273,7 @@
 
 static void hid_smartdisperse_uninit(void)
 {
-	hid_remove_actions_by_cookie(smartdisperse_cookie);
+	pcb_hid_remove_actions_by_cookie(smartdisperse_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/teardrops/teardrops.c
===================================================================
--- trunk/src_plugins/teardrops/teardrops.c	(revision 4891)
+++ trunk/src_plugins/teardrops/teardrops.c	(revision 4892)
@@ -318,7 +318,7 @@
 
 static void hid_teardrops_uninit(void)
 {
-	hid_remove_actions_by_cookie(teardrops_cookie);
+	pcb_hid_remove_actions_by_cookie(teardrops_cookie);
 }
 
 #include "dolists.h"
Index: trunk/src_plugins/toporouter/toporouter.c
===================================================================
--- trunk/src_plugins/toporouter/toporouter.c	(revision 4891)
+++ trunk/src_plugins/toporouter/toporouter.c	(revision 4892)
@@ -8234,7 +8234,7 @@
 
 static void hid_toporouter_uninit(void)
 {
-	hid_remove_actions_by_cookie(toporouter_cookie);
+	pcb_hid_remove_actions_by_cookie(toporouter_cookie);
 }
 
 pcb_uninit_t hid_toporouter_init()
Index: trunk/src_plugins/vendordrill/vendor.c
===================================================================
--- trunk/src_plugins/vendordrill/vendor.c	(revision 4891)
+++ trunk/src_plugins/vendordrill/vendor.c	(revision 4892)
@@ -681,7 +681,7 @@
 
 static void hid_vendordrill_uninit(void)
 {
-	hid_remove_actions_by_cookie(vendor_cookie);
+	pcb_hid_remove_actions_by_cookie(vendor_cookie);
 	vendor_free_all();
 	conf_unreg_fields("plugins/vendor/");
 }