Index: order.c
===================================================================
--- order.c	(revision 30981)
+++ order.c	(revision 30982)
@@ -119,9 +119,9 @@
 static void autoload_field_crd(order_ctx_t *octx, pcb_order_field_t *f, rnd_coord_t c)
 {
 	switch(f->type) {
-		case PCB_HATT_INTEGER: f->val.lng = c; break;
-		case PCB_HATT_COORD: f->val.crd = c; break;
-		case PCB_HATT_STRING:
+		case RND_HATT_INTEGER: f->val.lng = c; break;
+		case RND_HATT_COORD: f->val.crd = c; break;
+		case RND_HATT_STRING:
 			free((char *)f->val.str);
 			f->val.str = pcb_strdup_printf("%$mm", c);
 			break;
@@ -136,13 +136,13 @@
 	char **s;
 
 	switch(f->type) {
-		case PCB_HATT_INTEGER: f->val.lng = l; break;
-		case PCB_HATT_COORD: f->val.crd = PCB_MM_TO_COORD(l); break;
-		case PCB_HATT_STRING:
+		case RND_HATT_INTEGER: f->val.lng = l; break;
+		case RND_HATT_COORD: f->val.crd = PCB_MM_TO_COORD(l); break;
+		case RND_HATT_STRING:
 			free((char *)f->val.str);
 			f->val.str = pcb_strdup_printf("%ld", l);
 			break;
-		case PCB_HATT_ENUM:
+		case RND_HATT_ENUM:
 			bestn = -1;
 			/* find the closest enum value, rounding l up or down only */
 			for(n = 0, s = f->enum_vals; *s != NULL; n++,s++) {
Index: order.h
===================================================================
--- order.h	(revision 30981)
+++ order.h	(revision 30982)
@@ -63,7 +63,7 @@
 } pcb_order_autoload_t;
 
 typedef struct pcb_order_field_s {
-	pcb_hid_attr_type_t type;
+	rnd_hid_attr_type_t type;
 	rnd_hid_attr_val_t val;
 	char **enum_vals;
 	char *help;
Index: order_dlg.c
===================================================================
--- order_dlg.c	(revision 30981)
+++ order_dlg.c	(revision 30982)
@@ -30,14 +30,14 @@
 	vtp0_set(&order_ctx.names, n, NULL);
 
 	PCB_DAD_BEGIN_VBOX(order_ctx.dlg);
-		PCB_DAD_COMPFLAG(order_ctx.dlg, PCB_HATF_EXPFILL);
+		PCB_DAD_COMPFLAG(order_ctx.dlg, RND_HATF_EXPFILL);
 		PCB_DAD_BEGIN_TABBED(order_ctx.dlg, order_ctx.names.array);
-			PCB_DAD_COMPFLAG(order_ctx.dlg, PCB_HATF_EXPFILL | PCB_HATF_LEFT_TAB);
+			PCB_DAD_COMPFLAG(order_ctx.dlg, RND_HATF_EXPFILL | RND_HATF_LEFT_TAB);
 			for(n = 0; n < pcb_order_imps.used; n++) {
 				imp = pcb_order_imps.array[n];
 				if (imp->load_fields(pcb_order_imps.array[n], &order_ctx) == 0) {
 					PCB_DAD_BEGIN_VBOX(order_ctx.dlg);
-						PCB_DAD_COMPFLAG(order_ctx.dlg, PCB_HATF_EXPFILL);
+						PCB_DAD_COMPFLAG(order_ctx.dlg, RND_HATF_EXPFILL);
 
 						imp->populate_dad(pcb_order_imps.array[n], &order_ctx);
 					PCB_DAD_END(order_ctx.dlg);
@@ -62,26 +62,26 @@
 	PCB_DAD_BEGIN_HBOX(octx->dlg);
 		PCB_DAD_LABEL(octx->dlg, f->name);
 		PCB_DAD_BEGIN_VBOX(octx->dlg);
-			PCB_DAD_COMPFLAG(octx->dlg, PCB_HATF_EXPFILL);
+			PCB_DAD_COMPFLAG(octx->dlg, RND_HATF_EXPFILL);
 		PCB_DAD_END(octx->dlg);
 		switch(f->type) {
-			case PCB_HATT_ENUM:
+			case RND_HATT_ENUM:
 				PCB_DAD_ENUM(octx->dlg, f->enum_vals);
 				PCB_DAD_DEFAULT_NUM(octx->dlg, f->val.lng);
 				break;
-			case PCB_HATT_INTEGER:
+			case RND_HATT_INTEGER:
 				PCB_DAD_INTEGER(octx->dlg, "");
 				PCB_DAD_DEFAULT_NUM(octx->dlg, f->val.lng);
 				break;
-			case PCB_HATT_COORD:
+			case RND_HATT_COORD:
 				PCB_DAD_COORD(octx->dlg, "");
 				PCB_DAD_DEFAULT_NUM(octx->dlg, f->val.crd);
 				break;
-			case PCB_HATT_STRING:
+			case RND_HATT_STRING:
 				PCB_DAD_STRING(octx->dlg);
 				PCB_DAD_DEFAULT_PTR(octx->dlg, f->val.str);
 				break;
-			case PCB_HATT_LABEL: break;
+			case RND_HATT_LABEL: break;
 			default:
 				PCB_DAD_LABEL(octx->dlg, "<invalid type>");
 		}