Index: gerber.c
===================================================================
--- gerber.c	(revision 30991)
+++ gerber.c	(revision 30992)
@@ -1009,8 +1009,8 @@
 
 static void gerber_go_to_cam_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
-	pcb_dad_retovr_t retovr;
-	pcb_hid_dad_close(hid_ctx, &retovr, -1);
+	rnd_dad_retovr_t retovr;
+	rnd_hid_dad_close(hid_ctx, &retovr, -1);
 	rnd_actionva(&PCB->hidlib, "cam", NULL);
 }
 
@@ -1034,18 +1034,18 @@
 			fprintf((FILE *)call_ctx, "******************************************************************************\n\n");
 			break;
 		case RND_HIDEOF_DAD:
-			PCB_DAD_BEGIN_VBOX(dad->dlg);
-				PCB_DAD_COMPFLAG(dad->dlg, RND_HATF_EXPFILL | RND_HATF_FRAME);
-				PCB_DAD_BEGIN_HBOX(dad->dlg);
-					PCB_DAD_PICTURE(dad->dlg, pcp_dlg_xpm_by_name("warning"));
-					PCB_DAD_BEGIN_VBOX(dad->dlg);
-						PCB_DAD_LABEL(dad->dlg, warn_txt);
-						PCB_DAD_BUTTON(dad->dlg, "Get me to the cam export dialog");
-							PCB_DAD_CHANGE_CB(dad->dlg, gerber_go_to_cam_cb);
-						PCB_DAD_LABEL(dad->dlg, "");
-					PCB_DAD_END(dad->dlg);
-				PCB_DAD_END(dad->dlg);
-			PCB_DAD_END(dad->dlg);
+			RND_DAD_BEGIN_VBOX(dad->dlg);
+				RND_DAD_COMPFLAG(dad->dlg, RND_HATF_EXPFILL | RND_HATF_FRAME);
+				RND_DAD_BEGIN_HBOX(dad->dlg);
+					RND_DAD_PICTURE(dad->dlg, pcp_dlg_xpm_by_name("warning"));
+					RND_DAD_BEGIN_VBOX(dad->dlg);
+						RND_DAD_LABEL(dad->dlg, warn_txt);
+						RND_DAD_BUTTON(dad->dlg, "Get me to the cam export dialog");
+							RND_DAD_CHANGE_CB(dad->dlg, gerber_go_to_cam_cb);
+						RND_DAD_LABEL(dad->dlg, "");
+					RND_DAD_END(dad->dlg);
+				RND_DAD_END(dad->dlg);
+			RND_DAD_END(dad->dlg);
 			break;
 	}
 }