Index: trunk/src/librnd/core/hid_attrib.h
===================================================================
--- trunk/src/librnd/core/hid_attrib.h	(revision 31029)
+++ trunk/src/librnd/core/hid_attrib.h	(revision 31030)
@@ -160,7 +160,7 @@
 
 typedef enum rnd_hid_export_opt_func_action_e {
 	RND_HIDEOF_USAGE, /* call_ctx is a FILE * */
-	RND_HIDEOF_DAD    /* call_ctx is a pcb_hid_export_opt_func_dad_t */
+	RND_HIDEOF_DAD    /* call_ctx is a rnd_hid_export_opt_func_dad_t */
 } rnd_hid_export_opt_func_action_t;
 
 typedef void (*rnd_hid_export_opt_func_t)(rnd_hid_export_opt_func_action_t act, void *call_ctx, rnd_export_opt_t *opt);
Index: trunk/src/librnd/core/hid_dad.h
===================================================================
--- trunk/src/librnd/core/hid_dad.h	(revision 31029)
+++ trunk/src/librnd/core/hid_dad.h	(revision 31030)
@@ -840,8 +840,8 @@
 	gdl_elem_t link;  /* list of subdialogs: e.g. dock */
 };
 
-typedef struct pcb_hid_export_opt_func_dad_s {
+typedef struct rnd_hid_export_opt_func_dad_s {
 	RND_DAD_DECL_NOINIT(dlg)
-} pcb_hid_export_opt_func_dad_t;
+} rnd_hid_export_opt_func_dad_t;
 
 #endif
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 31029)
+++ trunk/src/librnd/pcb_compat.h	(revision 31030)
@@ -827,8 +827,8 @@
 #define pcb_dad_tree_free rnd_dad_tree_free
 #define pcb_hid_dad_close rnd_hid_dad_close
 #define pcb_hid_iterate rnd_hid_iterate
-#define pcb_hid_export_opt_func_dad_s rnd_hid_export_opt_func_dad_s
-#define pcb_hid_export_opt_func_dad_t rnd_hid_export_opt_func_dad_t
+#define rnd_hid_export_opt_func_dad_s rnd_hid_export_opt_func_dad_s
+#define rnd_hid_export_opt_func_dad_t rnd_hid_export_opt_func_dad_t
 #define PCB_DAD_SPIN_INT RND_DAD_SPIN_INT
 #define PCB_DAD_SPIN_DOUBLE RND_DAD_SPIN_DOUBLE
 #define PCB_DAD_SPIN_COORD RND_DAD_SPIN_COORD
@@ -1205,3 +1205,5 @@
 #define pcb_tool_t rnd_tool_t
 #define PCB_SAFEPRINT_arg_max RND_SAFEPRINT_arg_max
 #define PCB_SAFEPRINT_COORD_ONLY RND_SAFEPRINT_COORD_ONLY
+#define pcb_hid_export_opt_func_dad_s rnd_hid_export_opt_func_dad_s
+#define pcb_hid_export_opt_func_dad_t rnd_hid_export_opt_func_dad_t
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 31029)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 31030)
@@ -1023,7 +1023,7 @@
 		"board. Please use the cam export instead!\n"
 		"For more info please read:\n"
 		"http://repo.hu/cgi-bin/pool.cgi?cmd=show&node=cam_switch\n";
-	pcb_hid_export_opt_func_dad_t *dad = call_ctx;
+	rnd_hid_export_opt_func_dad_t *dad = call_ctx;
 
 	switch(act) {
 		case RND_HIDEOF_USAGE: