Index: cam.c
===================================================================
--- cam.c	(revision 30970)
+++ cam.c	(revision 30971)
@@ -205,12 +205,12 @@
 	{"cam", pcb_act_cam, pcb_acth_cam, pcb_acts_cam}
 };
 
-static pcb_export_opt_t *export_cam_get_export_options(pcb_hid_t *hid, int *n)
+static rnd_export_opt_t *export_cam_get_export_options(rnd_hid_t *hid, int *n)
 {
 	return 0;
 }
 
-static int export_cam_usage(pcb_hid_t *hid, const char *topic)
+static int export_cam_usage(rnd_hid_t *hid, const char *topic)
 {
 	fprintf(stderr, "\nThe cam exporter shorthand:\n\n");
 	fprintf(stderr, "\nUsage: pcb-rnd -x cam jobname [cam-opts] [pcb-rnd-options] filename");
@@ -224,7 +224,7 @@
 static char *cam_export_job;
 static cam_ctx_t cam_export_ctx;
 static int cam_export_has_outfile;
-static int export_cam_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv)
+static int export_cam_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
 	int d, s, oargc;
 	if (*argc < 1) {
@@ -265,7 +265,7 @@
 	return 1;
 }
 
-static void export_cam_do_export(pcb_hid_t *hid, pcb_hid_attr_val_t *options)
+static void export_cam_do_export(rnd_hid_t *hid, rnd_hid_attr_val_t *options)
 {
 	if (!cam_export_has_outfile)
 		cam_init_inst_fn(&cam_export_ctx);
@@ -288,7 +288,7 @@
 	pcb_export_remove_opts_by_cookie(cam_cookie);
 }
 
-pcb_hid_t export_cam_hid;
+rnd_hid_t export_cam_hid;
 
 int pplg_init_cam(void)
 {
@@ -300,11 +300,11 @@
 
 	RND_REGISTER_ACTIONS(cam_action_list, cam_cookie)
 
-	memset(&export_cam_hid, 0, sizeof(pcb_hid_t));
+	memset(&export_cam_hid, 0, sizeof(rnd_hid_t));
 
 	pcb_hid_nogui_init(&export_cam_hid);
 
-	export_cam_hid.struct_size = sizeof(pcb_hid_t);
+	export_cam_hid.struct_size = sizeof(rnd_hid_t);
 	export_cam_hid.name = "cam";
 	export_cam_hid.description = "Shorthand for exporting by can job name";
 	export_cam_hid.exporter = 1;
Index: cam_compile.h
===================================================================
--- cam_compile.h	(revision 30970)
+++ cam_compile.h	(revision 30971)
@@ -43,7 +43,7 @@
 			char *arg;
 		} desc;
 		struct {
-			pcb_hid_t *exporter;
+			rnd_hid_t *exporter;
 			int argc;
 			char **argv;
 		} plugin;
@@ -75,7 +75,7 @@
 typedef struct {
 	rnd_hidlib_t *hidlib;
 	char *prefix;            /* strdup'd file name prefix from the last prefix command */
-	pcb_hid_t *exporter;
+	rnd_hid_t *exporter;
 	unsigned partial:1;      /* when 1, there are objects marked with the EXPORTSEL flag */
 
 	unsigned has_partial:1;  /* the code has partial in it so an initial flag reset is needed */
Index: cam_gui.c
===================================================================
--- cam_gui.c	(revision 30970)
+++ cam_gui.c	(revision 30971)
@@ -41,7 +41,7 @@
 
 static void cam_gui_jobs2dlg(cam_dlg_t *ctx)
 {
-	pcb_hid_attribute_t *attr;
+	rnd_hid_attribute_t *attr;
 	pcb_hid_tree_t *tree;
 	pcb_hid_row_t *r;
 	char *cell[2], *cursor_path = NULL;
@@ -73,7 +73,7 @@
 
 	/* restore cursor */
 	if (cursor_path != NULL) {
-		pcb_hid_attr_val_t hv;
+		rnd_hid_attr_val_t hv;
 		hv.str = cursor_path;
 		pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wjobs, &hv);
 	}
@@ -81,7 +81,7 @@
 
 static void cam_gui_digest2dlg(cam_dlg_t *ctx)
 {
-	pcb_hid_attribute_t *attr;
+	rnd_hid_attribute_t *attr;
 	pcb_hid_tree_t *tree;
 	pcb_cam_code_t *c, *plugin = NULL;
 	char *cell[4], tmp[1024];
@@ -131,8 +131,8 @@
 {
 	htsp_t *vars = ctx->cam.vars;
 	htsp_entry_t *e;
-	pcb_hid_attr_val_t hv;
-	pcb_hid_attribute_t *attr;
+	rnd_hid_attr_val_t hv;
+	rnd_hid_attribute_t *attr;
 	pcb_hid_tree_t *tree;
 	pcb_hid_row_t *r;
 	char *cell[3], *cursor_path = NULL;
@@ -162,22 +162,22 @@
 
 	/* restore cursor */
 	if (cursor_path != NULL) {
-		pcb_hid_attr_val_t hv;
+		rnd_hid_attr_val_t hv;
 		hv.str = cursor_path;
 		pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->wopts, &hv);
 	}
 }
 
-static void cam_gui_outfile_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr_btn)
+static void cam_gui_outfile_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr_btn)
 {
 	cam_dlg_t *ctx = caller_data;
 	cam_gui_opts2dlg(ctx);
 }
 
-static void cam_gui_filter_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr_inp)
+static void cam_gui_filter_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr_inp)
 {
 	cam_dlg_t *ctx = caller_data;
-	pcb_hid_attribute_t *attr;
+	rnd_hid_attribute_t *attr;
 	pcb_hid_tree_t *tree;
 	const char *text;
 
@@ -190,10 +190,10 @@
 	pcb_dad_tree_update_hide(attr);
 }
 
-static void cam_gui_export_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr_btn)
+static void cam_gui_export_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr_btn)
 {
 	cam_dlg_t *ctx = caller_data;
-	pcb_hid_attribute_t *attr = &ctx->dlg[ctx->wjobs];
+	rnd_hid_attribute_t *attr = &ctx->dlg[ctx->wjobs];
 	pcb_hid_row_t *row = pcb_dad_tree_get_selected(attr);
 
 	if (row != NULL) {
@@ -214,7 +214,7 @@
 	return res;
 }
 
-static void cam_job_select_cb(pcb_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row)
+static void cam_job_select_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, pcb_hid_row_t *row)
 {
 	pcb_hid_tree_t *tree = attrib->wdata;
 	cam_dlg_t *ctx = tree->user_ctx;
@@ -221,7 +221,7 @@
 
 	if (row != NULL) {
 		char *script = kill_tabs(cam_find_job(row->cell[0]));
-		pcb_hid_attribute_t *atxt = &ctx->dlg[ctx->wtxt];
+		rnd_hid_attribute_t *atxt = &ctx->dlg[ctx->wtxt];
 		pcb_hid_text_t *txt = atxt->wdata;
 
 		txt->hid_set_text(atxt, hid_ctx, PCB_HID_TEXT_REPLACE, script);
@@ -340,7 +340,7 @@
 	PCB_DAD_NEW("cam", ctx->dlg, "CAM export", ctx, pcb_false, cam_close_cb);
 
 	{ /* set default outfile */
-		pcb_hid_attr_val_t hv;
+		rnd_hid_attr_val_t hv;
 		hv.str = pcb_derive_default_filename_(PCB->hidlib.filename, "");
 		pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->woutfile, &hv);
 		free((char *)hv.str);
@@ -348,7 +348,7 @@
 	}
 
 	{ /* set right top text read-only */
-		pcb_hid_attribute_t *atxt = &ctx->dlg[ctx->wtxt];
+		rnd_hid_attribute_t *atxt = &ctx->dlg[ctx->wtxt];
 		pcb_hid_text_t *txt = atxt->wdata;
 		txt->hid_set_readonly(atxt, ctx->dlg_hid_ctx, 1);
 	}