Index: excitation.c
===================================================================
--- excitation.c	(revision 30981)
+++ excitation.c	(revision 30982)
@@ -291,10 +291,10 @@
 static void exc_user_dad(int idx)
 {
 	PCB_DAD_BEGIN_VBOX(exc_ctx.dlg);
-		PCB_DAD_COMPFLAG(exc_ctx.dlg, PCB_HATF_EXPFILL);
+		PCB_DAD_COMPFLAG(exc_ctx.dlg, RND_HATF_EXPFILL);
 		PCB_DAD_LABEL(exc_ctx.dlg, "Specify the excitation setup script:");
 		PCB_DAD_TEXT(exc_ctx.dlg, NULL);
-			PCB_DAD_COMPFLAG(exc_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL);
+			PCB_DAD_COMPFLAG(exc_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_SCROLL);
 			PCB_DAD_CHANGE_CB(exc_ctx.dlg, exc_val_chg_cb);
 			exc_ctx.exc_data[idx].w[I_SCRIPT] = PCB_DAD_CURRENT(exc_ctx.dlg);
 	PCB_DAD_END(exc_ctx.dlg);
@@ -419,7 +419,7 @@
 	}
 
 	PCB_DAD_BEGIN_VBOX(exc_ctx.dlg);
-		PCB_DAD_COMPFLAG(exc_ctx.dlg, PCB_HATF_EXPFILL);
+		PCB_DAD_COMPFLAG(exc_ctx.dlg, RND_HATF_EXPFILL);
 		PCB_DAD_BEGIN_HBOX(exc_ctx.dlg);
 			PCB_DAD_LABEL(exc_ctx.dlg, "Excitation type:");
 			PCB_DAD_ENUM(exc_ctx.dlg, excnames);
@@ -427,7 +427,7 @@
 				PCB_DAD_CHANGE_CB(exc_ctx.dlg, select_cb);
 		PCB_DAD_END(exc_ctx.dlg);
 		PCB_DAD_BEGIN_TABBED(exc_ctx.dlg, excnames);
-			PCB_DAD_COMPFLAG(exc_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_HIDE_TABLAB);
+			PCB_DAD_COMPFLAG(exc_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_HIDE_TABLAB);
 			exc_ctx.wtab = PCB_DAD_CURRENT(exc_ctx.dlg);
 			for(n = 0, e = excitations; e->name != NULL; n++,e++) {
 				if (e->dad != NULL)
Index: export_openems.c
===================================================================
--- export_openems.c	(revision 30981)
+++ export_openems.c	(revision 30982)
@@ -95,59 +95,59 @@
 
 rnd_export_opt_t openems_attribute_list[] = {
 	{"outfile", "Graphics output file",
-	 PCB_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
+	 RND_HATT_STRING, 0, 0, {0, 0, 0}, 0, 0},
 #define HA_openemsfile 0
 
 	{"def-copper-thick", "Default copper thickness",
-	 PCB_HATT_COORD, 0, THMAX, {0, 0, 0, PCB_MM_TO_COORD(0.035)}, 0, 0},
+	 RND_HATT_COORD, 0, THMAX, {0, 0, 0, PCB_MM_TO_COORD(0.035)}, 0, 0},
 #define HA_def_copper_thick 1
 
 	{"def-substrate-thick", "Default substrate thickness",
-	 PCB_HATT_COORD, 0, THMAX, {0, 0, 0, PCB_MM_TO_COORD(0.8)}, 0, 0},
+	 RND_HATT_COORD, 0, THMAX, {0, 0, 0, PCB_MM_TO_COORD(0.8)}, 0, 0},
 #define HA_def_substrate_thick 2
 
 	{"def-copper-cond", "Default copper conductivity",
-	 PCB_HATT_STRING, 0, 0, {0, "56*10^6", 0}, 0, 0},
+	 RND_HATT_STRING, 0, 0, {0, "56*10^6", 0}, 0, 0},
 #define HA_def_copper_cond 3
 
 	{"def-subst-epsilon", "Default substrate epsilon",
-	 PCB_HATT_STRING, 0, 0, {0, "3.66", 0}, 0, 0},
+	 RND_HATT_STRING, 0, 0, {0, "3.66", 0}, 0, 0},
 #define HA_def_subst_epsilon 4
 
 	{"def-subst-mue", "Default substrate mue",
-	 PCB_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0},
+	 RND_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0},
 #define HA_def_subst_mue 5
 
 	{"def-subst-kappa", "Default substrate kappa",
-	 PCB_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0},
+	 RND_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0},
 #define HA_def_subst_kappa 6
 
 	{"def-subst-sigma", "Default substrate sigma",
-	 PCB_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0},
+	 RND_HATT_STRING, 0, 0, {0, "0", 0}, 0, 0},
 #define HA_def_subst_sigma 7
 
 	{"void-name", "Name of the void (sorrunding material)",
-	 PCB_HATT_STRING, 0, 0, {0, "AIR", 0}, 0, 0},
+	 RND_HATT_STRING, 0, 0, {0, "AIR", 0}, 0, 0},
 #define HA_void_name 8
 
 	{"void-epsilon", "epsilon value for the void (sorrunding material)",
-	 PCB_HATT_REAL, 0, 1000, {0, 0, 1}, 0, 0},
+	 RND_HATT_REAL, 0, 1000, {0, 0, 1}, 0, 0},
 #define HA_void_epsilon 9
 
 	{"void-mue", "mue value for the void (sorrunding material)",
-	 PCB_HATT_REAL, 0, 1000, {0, 0, 1}, 0, 0},
+	 RND_HATT_REAL, 0, 1000, {0, 0, 1}, 0, 0},
 #define HA_void_mue 10
 
 	{"segments", "kludge: number of segments used to approximate round cap trace ends",
-	 PCB_HATT_INTEGER, 0, 100, {10, 0, 0}, 0, 0},
+	 RND_HATT_INTEGER, 0, 100, {10, 0, 0}, 0, 0},
 #define HA_segments 11
 
 	{"base-prio", "base priority: if the board displaces the chassis",
-	 PCB_HATT_INTEGER, 0, 10, {0, 0, 0}, 0, 0},
+	 RND_HATT_INTEGER, 0, 10, {0, 0, 0}, 0, 0},
 #define HA_base_prio 12
 
 	{"port-resistance", "default port resistance",
-	 PCB_HATT_REAL, 0, 1000, {0, 0, 50}, 0, 0}
+	 RND_HATT_REAL, 0, 1000, {0, 0, 50}, 0, 0}
 #define HA_def_port_res 13
 
 };
@@ -683,7 +683,7 @@
 
 static int openems_parse_arguments(rnd_hid_t *hid, int *argc, char ***argv)
 {
-	pcb_export_register_opts(openems_attribute_list, sizeof(openems_attribute_list) / sizeof(openems_attribute_list[0]), openems_cookie, 0);
+	rnd_export_register_opts(openems_attribute_list, sizeof(openems_attribute_list) / sizeof(openems_attribute_list[0]), openems_cookie, 0);
 	return pcb_hid_parse_command_line(argc, argv);
 }
 
@@ -835,7 +835,7 @@
 {
 	pcb_openems_excitation_uninit();
 	rnd_remove_actions_by_cookie(openems_cookie);
-	pcb_export_remove_opts_by_cookie(openems_cookie);
+	rnd_export_remove_opts_by_cookie(openems_cookie);
 }
 
 int pplg_init_export_openems(void)
Index: mesh.c
===================================================================
--- mesh.c	(revision 30981)
+++ mesh.c	(revision 30982)
@@ -1061,7 +1061,7 @@
 	PCB_DAD_BEGIN_VBOX(ia.dlg);
 		PCB_DAD_BEGIN_HBOX(ia.dlg);
 			PCB_DAD_BEGIN_VBOX(ia.dlg);
-				PCB_DAD_COMPFLAG(ia.dlg, PCB_HATF_FRAME);
+				PCB_DAD_COMPFLAG(ia.dlg, RND_HATF_FRAME);
 				PCB_DAD_LABEL(ia.dlg, "XY-mesh");
 				PCB_DAD_BEGIN_HBOX(ia.dlg);
 					PCB_DAD_COORD(ia.dlg, "");
@@ -1117,7 +1117,7 @@
 			PCB_DAD_END(ia.dlg);
 
 			PCB_DAD_BEGIN_VBOX(ia.dlg);
-				PCB_DAD_COMPFLAG(ia.dlg, PCB_HATF_FRAME);
+				PCB_DAD_COMPFLAG(ia.dlg, RND_HATF_FRAME);
 				PCB_DAD_LABEL(ia.dlg, "Z-mesh");
 
 				PCB_DAD_BEGIN_HBOX(ia.dlg);
@@ -1186,7 +1186,7 @@
 
 		PCB_DAD_BEGIN_HBOX(ia.dlg);
 			PCB_DAD_BEGIN_VBOX(ia.dlg);
-				PCB_DAD_COMPFLAG(ia.dlg, PCB_HATF_FRAME);
+				PCB_DAD_COMPFLAG(ia.dlg, RND_HATF_FRAME);
 				PCB_DAD_LABEL(ia.dlg, "Boundary");
 				for(n = 0; n < 6; n+=2) {
 					char name[64];