Index: cam.c
===================================================================
--- cam.c	(revision 30981)
+++ cam.c	(revision 30982)
@@ -285,7 +285,7 @@
 	rnd_conf_unreg_file(CAM_CONF_FN, cam_conf_internal);
 	rnd_conf_unreg_fields("plugins/cam/");
 	rnd_remove_actions_by_cookie(cam_cookie);
-	pcb_export_remove_opts_by_cookie(cam_cookie);
+	rnd_export_remove_opts_by_cookie(cam_cookie);
 }
 
 rnd_hid_t export_cam_hid;
Index: cam_gui.c
===================================================================
--- cam_gui.c	(revision 30981)
+++ cam_gui.c	(revision 30982)
@@ -248,11 +248,11 @@
 {
 	PCB_DAD_BEGIN_HBOX(ctx->dlg);
 		PCB_DAD_BEGIN_VBOX(ctx->dlg);
-			PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL);
+			PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
 		PCB_DAD_END(ctx->dlg);
 		PCB_DAD_LABEL(ctx->dlg, text);
 		PCB_DAD_BEGIN_VBOX(ctx->dlg);
-			PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL);
+			PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
 		PCB_DAD_END(ctx->dlg);
 	PCB_DAD_END(ctx->dlg);
 }
@@ -269,13 +269,13 @@
 	ctx->cam.vars = pcb_cam_vars_alloc();
 
 	PCB_DAD_BEGIN_VBOX(ctx->dlg);
-		PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL);
+		PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
 		PCB_DAD_BEGIN_HPANE(ctx->dlg);
 
 			PCB_DAD_BEGIN_VBOX(ctx->dlg); /* left */
-				PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL);
+				PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
 				PCB_DAD_TREE(ctx->dlg, 1, 0, NULL);
-					PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL);
+					PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL);
 					PCB_DAD_TREE_SET_CB(ctx->dlg, selected_cb, cam_job_select_cb);
 					PCB_DAD_TREE_SET_CB(ctx->dlg, ctx, ctx);
 					ctx->wjobs = PCB_DAD_CURRENT(ctx->dlg);
@@ -284,7 +284,7 @@
 						PCB_DAD_HELP(ctx->dlg, "Filter text:\nlist jobs with matching name only");
 						PCB_DAD_CHANGE_CB(ctx->dlg, cam_gui_filter_cb);
 					PCB_DAD_BEGIN_VBOX(ctx->dlg); /* filler */
-						PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL);
+						PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
 					PCB_DAD_END(ctx->dlg);
 					PCB_DAD_BUTTON(ctx->dlg, "export!");
 						PCB_DAD_CHANGE_CB(ctx->dlg, cam_gui_export_cb);
@@ -293,25 +293,25 @@
 			PCB_DAD_END(ctx->dlg);
 
 			PCB_DAD_BEGIN_VBOX(ctx->dlg); /* right */
-				PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL);
+				PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
 				PCB_DAD_BEGIN_VPANE(ctx->dlg);
 					PCB_DAD_BEGIN_VBOX(ctx->dlg); /* top */
-						PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL);
+						PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
 						header_label(ctx, "CAM job script");
 						PCB_DAD_BEGIN_TABBED(ctx->dlg, script_tabs);
-							PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL);
+							PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
 
 							PCB_DAD_TREE(ctx->dlg, 3, 0, digest_hdr);
-								PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL);
+								PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL);
 								ctx->wdigest = PCB_DAD_CURRENT(ctx->dlg);
 
 							PCB_DAD_TEXT(ctx->dlg, ctx);
-								PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL);
+								PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL);
 								ctx->wtxt = PCB_DAD_CURRENT(ctx->dlg);
 						PCB_DAD_END(ctx->dlg);
 					PCB_DAD_END(ctx->dlg);
 					PCB_DAD_BEGIN_VBOX(ctx->dlg); /* bottom */
-						PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL);
+						PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL);
 						header_label(ctx, "CAM options");
 						PCB_DAD_BEGIN_TABLE(ctx->dlg, 2); /* special options */
 							PCB_DAD_LABEL(ctx->dlg, "outfile");
@@ -328,7 +328,7 @@
 						PCB_DAD_END(ctx->dlg);
 
 						PCB_DAD_TREE(ctx->dlg, 2, 0, opt_hdr); /* option table */
-							PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL);
+							PCB_DAD_COMPFLAG(ctx->dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL);
 							ctx->wopts = PCB_DAD_CURRENT(ctx->dlg);
 					PCB_DAD_END(ctx->dlg);
 				PCB_DAD_END(ctx->dlg);