Index: layersel.c
===================================================================
--- layersel.c	(revision 30981)
+++ layersel.c	(revision 30982)
@@ -493,7 +493,7 @@
 
 		/* vertical group name */
 		PCB_DAD_LABEL(ls->sub.dlg, name);
-			PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_TIGHT | PCB_HATF_TEXT_VERTICAL | PCB_HATF_TEXT_TRUNCATED);
+			PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_TEXT_VERTICAL | RND_HATF_TEXT_TRUNCATED);
 			PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lsg);
 			PCB_DAD_RIGHT_CB(ls->sub.dlg, group_right_cb);
 			PCB_DAD_CHANGE_CB(ls->sub.dlg, group_open_cb);
@@ -501,12 +501,12 @@
 
 		/* vert sep */
 		PCB_DAD_BEGIN_HBOX(ls->sub.dlg);
-			PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_TIGHT | PCB_HATF_FRAME);
+			PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_FRAME);
 		PCB_DAD_END(ls->sub.dlg);
 
 		/* layer list box */
 		PCB_DAD_BEGIN_VBOX(ls->sub.dlg);
-			PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_TIGHT);
+			PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT);
 }
 
 static void layersel_end_grp_open(layersel_ctx_t *ls)
@@ -526,7 +526,7 @@
 
 		/* vert sep */
 		PCB_DAD_BEGIN_HBOX(ls->sub.dlg);
-			PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_TIGHT | PCB_HATF_FRAME);
+			PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_FRAME);
 		PCB_DAD_END(ls->sub.dlg);
 
 }
@@ -567,7 +567,7 @@
 	layer_vis_box(&lys->off_closed, 0, color, brd, hatch, 10, 10, 0);
 
 	PCB_DAD_BEGIN_VBOX(ls->sub.dlg);
-		PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_TIGHT);
+		PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT);
 		PCB_DAD_PICTURE(ls->sub.dlg, lys->on_closed.xpm);
 			lys->wvis_on_closed = PCB_DAD_CURRENT(ls->sub.dlg);
 			PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
@@ -581,7 +581,7 @@
 		if (selectable) {
 			PCB_DAD_PICTURE(ls->sub.dlg, closed_grp_layer_unsel);
 				if (selected)
-					PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_HIDE);
+					PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_HIDE);
 				lys->wunsel_closed = PCB_DAD_CURRENT(ls->sub.dlg);
 				PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
 				PCB_DAD_CHANGE_CB(ls->sub.dlg, layer_sel_cb);
@@ -588,7 +588,7 @@
 				PCB_DAD_HELP(ls->sub.dlg, name);
 			PCB_DAD_PICTURE(ls->sub.dlg, closed_grp_layer_sel);
 				if (!selected)
-					PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_HIDE);
+					PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_HIDE);
 				lys->wsel_closed = PCB_DAD_CURRENT(ls->sub.dlg);
 				PCB_DAD_SET_ATTR_FIELD(ls->sub.dlg, user_data, lys);
 				PCB_DAD_CHANGE_CB(ls->sub.dlg, layer_sel_cb);
@@ -636,7 +636,7 @@
 static void layersel_add_grpsep(layersel_ctx_t *ls)
 {
 	PCB_DAD_BEGIN_HBOX(ls->sub.dlg);
-		PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_EXPFILL);
+		PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_EXPFILL);
 		PCB_DAD_PICTURE(ls->sub.dlg, grpsep);
 	PCB_DAD_END(ls->sub.dlg);
 
@@ -742,7 +742,7 @@
 static void hsep(layersel_ctx_t *ls)
 {
 	PCB_DAD_BEGIN_VBOX(ls->sub.dlg);
-		PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_TIGHT | PCB_HATF_FRAME);
+		PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_TIGHT | RND_HATF_FRAME);
 	PCB_DAD_END(ls->sub.dlg);
 }
 
@@ -750,7 +750,7 @@
 {
 	lgs_reset(ls);
 	PCB_DAD_BEGIN_VBOX(ls->sub.dlg);
-		PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_EXPFILL | PCB_HATF_TIGHT | PCB_HATF_SCROLL);
+		PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_EXPFILL | RND_HATF_TIGHT | RND_HATF_SCROLL);
 		layersel_create_stack(&layersel, pcb);
 		hsep(&layersel);
 		layersel_create_global(&layersel, pcb);
@@ -767,7 +767,7 @@
 				PCB_DAD_HELP(ls->sub.dlg, "collapse/close all layer groups\nso that layer names are\nnot displayed,\neach row is a layer group");
 				PCB_DAD_CHANGE_CB(ls->sub.dlg, all_close_cb);
 			PCB_DAD_BEGIN_HBOX(ls->sub.dlg);
-				PCB_DAD_COMPFLAG(ls->sub.dlg, PCB_HATF_EXPFILL);
+				PCB_DAD_COMPFLAG(ls->sub.dlg, RND_HATF_EXPFILL);
 			PCB_DAD_END(ls->sub.dlg);
 		PCB_DAD_END(ls->sub.dlg);
 	PCB_DAD_END(ls->sub.dlg);
Index: routest.c
===================================================================
--- routest.c	(revision 30981)
+++ routest.c	(revision 30982)
@@ -178,7 +178,7 @@
 	PCB_DAD_BEGIN_VBOX(rst.sub.dlg);
 		for(n = 0; n < MAX_STYLES; n++) {
 			PCB_DAD_BEGIN_HBOX(rst.sub.dlg);
-				PCB_DAD_COMPFLAG(rst.sub.dlg, PCB_HATF_HIDE);
+				PCB_DAD_COMPFLAG(rst.sub.dlg, RND_HATF_HIDE);
 					rst.whbox[n] = PCB_DAD_CURRENT(rst.sub.dlg);
 				PCB_DAD_BOOL(rst.sub.dlg, "");
 					rst.wchk[n] = PCB_DAD_CURRENT(rst.sub.dlg);
Index: routest_dlg.c
===================================================================
--- routest_dlg.c	(revision 30981)
+++ routest_dlg.c	(revision 30982)
@@ -172,7 +172,7 @@
 	PCB_DAD_DECL(dlg);
 
 	PCB_DAD_BEGIN_VBOX(dlg);
-		PCB_DAD_COMPFLAG(dlg, PCB_HATF_EXPFILL);
+		PCB_DAD_COMPFLAG(dlg, RND_HATF_EXPFILL);
 		PCB_DAD_BEGIN_TABLE(dlg, 2);
 			PCB_DAD_LABEL(dlg, "key");
 			PCB_DAD_STRING(dlg);
@@ -253,7 +253,7 @@
 	}
 
 	PCB_DAD_BEGIN_VBOX(rstdlg_ctx.dlg);
-		PCB_DAD_COMPFLAG(rstdlg_ctx.dlg, PCB_HATF_EXPFILL);
+		PCB_DAD_COMPFLAG(rstdlg_ctx.dlg, RND_HATF_EXPFILL);
 		PCB_DAD_BEGIN_TABLE(rstdlg_ctx.dlg, 2);
 
 			PCB_DAD_LABEL(rstdlg_ctx.dlg, "Name:");
Index: status.c
===================================================================
--- status.c	(revision 30981)
+++ status.c	(revision 30982)
@@ -252,14 +252,14 @@
 static void status_docked_create_st()
 {
 	PCB_DAD_BEGIN_VBOX(status.stsub.dlg);
-		PCB_DAD_COMPFLAG(status.stsub.dlg, PCB_HATF_EXPFILL | PCB_HATF_TIGHT);
+		PCB_DAD_COMPFLAG(status.stsub.dlg, RND_HATF_EXPFILL | RND_HATF_TIGHT);
 		PCB_DAD_LABEL(status.stsub.dlg, "");
-			PCB_DAD_COMPFLAG(status.stsub.dlg, PCB_HATF_HIDE);
+			PCB_DAD_COMPFLAG(status.stsub.dlg, RND_HATF_HIDE);
 			status.wsttxt = PCB_DAD_CURRENT(status.stsub.dlg);
 		PCB_DAD_LABEL(status.stsub.dlg, "<pending update>");
 			status.wst1 = PCB_DAD_CURRENT(status.stsub.dlg);
 		PCB_DAD_LABEL(status.stsub.dlg, "<pending update>");
-			PCB_DAD_COMPFLAG(status.stsub.dlg, PCB_HATF_HIDE);
+			PCB_DAD_COMPFLAG(status.stsub.dlg, RND_HATF_HIDE);
 			status.wst2 = PCB_DAD_CURRENT(status.stsub.dlg);
 	PCB_DAD_END(status.stsub.dlg);
 }
@@ -268,7 +268,7 @@
 static void vpad(rnd_hid_dad_subdialog_t *sub)
 {
 	PCB_DAD_BEGIN_VBOX(sub->dlg);
-		PCB_DAD_COMPFLAG(sub->dlg, PCB_HATF_EXPFILL | PCB_HATF_TIGHT);
+		PCB_DAD_COMPFLAG(sub->dlg, RND_HATF_EXPFILL | RND_HATF_TIGHT);
 	PCB_DAD_END(sub->dlg);
 }
 
@@ -276,9 +276,9 @@
 {
 	int n;
 	PCB_DAD_BEGIN_HBOX(status.rdsub.dlg);
-		PCB_DAD_COMPFLAG(status.rdsub.dlg, PCB_HATF_TIGHT);
+		PCB_DAD_COMPFLAG(status.rdsub.dlg, RND_HATF_TIGHT);
 		PCB_DAD_BEGIN_VBOX(status.rdsub.dlg);
-			PCB_DAD_COMPFLAG(status.rdsub.dlg, PCB_HATF_EXPFILL | PCB_HATF_FRAME | PCB_HATF_TIGHT);
+			PCB_DAD_COMPFLAG(status.rdsub.dlg, RND_HATF_EXPFILL | RND_HATF_FRAME | RND_HATF_TIGHT);
 			vpad(&status.rdsub);
 			for(n = 0; n < 3; n++) {
 				PCB_DAD_LABEL(status.rdsub.dlg, "<pending>");
@@ -287,7 +287,7 @@
 			vpad(&status.rdsub);
 		PCB_DAD_END(status.rdsub.dlg);
 		PCB_DAD_BEGIN_VBOX(status.rdsub.dlg);
-			PCB_DAD_COMPFLAG(status.rdsub.dlg, PCB_HATF_EXPFILL | PCB_HATF_FRAME);
+			PCB_DAD_COMPFLAG(status.rdsub.dlg, RND_HATF_EXPFILL | RND_HATF_FRAME);
 			vpad(&status.rdsub);
 			for(n = 0; n < 2; n++) {
 					PCB_DAD_LABEL(status.rdsub.dlg, "<pending>");