Index: trunk/src/librnd/core/hid_dad_spin.c
===================================================================
--- trunk/src/librnd/core/hid_dad_spin.c	(revision 31025)
+++ trunk/src/librnd/core/hid_dad_spin.c	(revision 31026)
@@ -195,7 +195,7 @@
 				RND_DAD_DEFAULT_PTR(ctx.dlg, def_unit);
 				RND_DAD_CHANGE_CB(ctx.dlg, spin_unit_chg_cb);
 			
-			if (spin->unit_family == (PCB_UNIT_METRIC | PCB_UNIT_IMPERIAL)) {
+			if (spin->unit_family == (RND_UNIT_METRIC | RND_UNIT_IMPERIAL)) {
 				RND_DAD_LABEL(ctx.dlg, "Use the global");
 				RND_DAD_BOOL(ctx.dlg, "");
 					RND_DAD_HELP(ctx.dlg, "Ignore the above unit selection,\nuse the global unit (grid unit) in this spinbox,\nfollow changes of the global unit");
@@ -230,7 +230,7 @@
 	if ((dlgfail == 0) && (ctx.valid)) {
 		rnd_hid_attr_val_t hv;
 		int unum = ctx.dlg[ctx.wunit].val.lng;
-		int can_glob = (spin->unit_family == (PCB_UNIT_METRIC | PCB_UNIT_IMPERIAL));
+		int can_glob = (spin->unit_family == (RND_UNIT_METRIC | RND_UNIT_IMPERIAL));
 
 		if (!can_glob)
 			spin->unit = &rnd_units[unum];
Index: trunk/src/librnd/core/hid_dad_spin.h
===================================================================
--- trunk/src/librnd/core/hid_dad_spin.h	(revision 31025)
+++ trunk/src/librnd/core/hid_dad_spin.h	(revision 31026)
@@ -57,8 +57,8 @@
 
 #define RND_DAD_SPIN_INT(table) RND_DAD_SPIN_ANY(table, RND_DAD_SPIN_INT, RND_HATT_INTEGER, 0, 0)
 #define RND_DAD_SPIN_DOUBLE(table) RND_DAD_SPIN_ANY(table, RND_DAD_SPIN_DOUBLE, RND_HATT_REAL, 0, 0)
-#define RND_DAD_SPIN_COORD(table) RND_DAD_SPIN_ANY(table, RND_DAD_SPIN_COORD, RND_HATT_COORD, 1, PCB_UNIT_METRIC | PCB_UNIT_IMPERIAL)
-#define RND_DAD_SPIN_FREQ(table) RND_DAD_SPIN_ANY(table, RND_DAD_SPIN_FREQ, RND_HATT_REAL, 1, PCB_UNIT_FREQ)
+#define RND_DAD_SPIN_COORD(table) RND_DAD_SPIN_ANY(table, RND_DAD_SPIN_COORD, RND_HATT_COORD, 1, RND_UNIT_METRIC | RND_UNIT_IMPERIAL)
+#define RND_DAD_SPIN_FREQ(table) RND_DAD_SPIN_ANY(table, RND_DAD_SPIN_FREQ, RND_HATT_REAL, 1, RND_UNIT_FREQ)
 
 /* Return the widget-type (PCB_DAD_HATT) of a spinbox at the RND_HATT_END widget;
    useful for dispatching what value set to use */
Index: trunk/src/librnd/core/rnd_printf.c
===================================================================
--- trunk/src/librnd/core/rnd_printf.c	(revision 31025)
+++ trunk/src/librnd/core/rnd_printf.c	(revision 31026)
@@ -172,9 +172,9 @@
 
 	/* Check our freedom in choosing units */
 	if ((allow & RND_UNIT_ALLOW_IMPERIAL) == 0)
-		family = PCB_UNIT_METRIC;
+		family = RND_UNIT_METRIC;
 	else if ((allow & RND_UNIT_ALLOW_METRIC) == 0)
-		family = PCB_UNIT_IMPERIAL;
+		family = RND_UNIT_IMPERIAL;
 	else {
 		int met_votes = 0, imp_votes = 0;
 
@@ -185,18 +185,18 @@
 				++met_votes;
 
 		if (imp_votes > met_votes)
-			family = PCB_UNIT_IMPERIAL;
+			family = RND_UNIT_IMPERIAL;
 		else
-			family = PCB_UNIT_METRIC;
+			family = RND_UNIT_METRIC;
 	}
 
 	/* Set base unit */
 	for (i = 0; i < n_coords; ++i) {
 		switch (family) {
-			case PCB_UNIT_METRIC:
+			case RND_UNIT_METRIC:
 				value[i] = RND_COORD_TO_MM(coord[i]);
 				break;
-			case PCB_UNIT_IMPERIAL:
+			case RND_UNIT_IMPERIAL:
 				value[i] = RND_COORD_TO_MIL(coord[i]);
 				break;
 			default:
@@ -292,7 +292,7 @@
 	unsigned int score;
 
 	/* convert the value to the proposed unit */
-	if (unit->family == PCB_UNIT_METRIC)
+	if (unit->family == RND_UNIT_METRIC)
 		v = RND_COORD_TO_MM(coord);
 	else
 		v = RND_COORD_TO_MIL(coord);
Index: trunk/src/librnd/core/unit.c
===================================================================
--- trunk/src/librnd/core/unit.c	(revision 31025)
+++ trunk/src/librnd/core/unit.c	(revision 31026)
@@ -41,27 +41,27 @@
 /* Should be kept in order of smallest scale_factor to largest -- the code
    uses this ordering for finding the best scale to use for a group of units */
 rnd_unit_t rnd_units[] = {
-	{"km",   'k', 0.000001, PCB_UNIT_METRIC,   RND_UNIT_ALLOW_KM, 5},
-	{"m",    'f', 0.001,    PCB_UNIT_METRIC,   RND_UNIT_ALLOW_M, 5},
-	{"cm",   'e', 0.1,      PCB_UNIT_METRIC,   RND_UNIT_ALLOW_CM, 5},
-	{"mm",   'm', 1,        PCB_UNIT_METRIC,   RND_UNIT_ALLOW_MM, 4},
-	{"um",   'u', 1000,     PCB_UNIT_METRIC,   RND_UNIT_ALLOW_UM, 2},
-	{"du",   'd', 10000,    PCB_UNIT_METRIC,   RND_UNIT_ALLOW_DU, 2},  /* eagle bin decimicron */
-	{"nm",   'n', 1000000,  PCB_UNIT_METRIC,   RND_UNIT_ALLOW_NM, 0},
+	{"km",   'k', 0.000001, RND_UNIT_METRIC,   RND_UNIT_ALLOW_KM, 5},
+	{"m",    'f', 0.001,    RND_UNIT_METRIC,   RND_UNIT_ALLOW_M, 5},
+	{"cm",   'e', 0.1,      RND_UNIT_METRIC,   RND_UNIT_ALLOW_CM, 5},
+	{"mm",   'm', 1,        RND_UNIT_METRIC,   RND_UNIT_ALLOW_MM, 4},
+	{"um",   'u', 1000,     RND_UNIT_METRIC,   RND_UNIT_ALLOW_UM, 2},
+	{"du",   'd', 10000,    RND_UNIT_METRIC,   RND_UNIT_ALLOW_DU, 2},  /* eagle bin decimicron */
+	{"nm",   'n', 1000000,  RND_UNIT_METRIC,   RND_UNIT_ALLOW_NM, 0},
 
-	{"in",   'i', 0.001,    PCB_UNIT_IMPERIAL, RND_UNIT_ALLOW_IN, 5},
-	{"mil",  'l', 1,        PCB_UNIT_IMPERIAL, RND_UNIT_ALLOW_MIL, 2},
-	{"dmil", 'k', 10,       PCB_UNIT_IMPERIAL, RND_UNIT_ALLOW_DMIL, 1},/* kicad legacy decimil unit */
-	{"cmil", 'c', 100,      PCB_UNIT_IMPERIAL, RND_UNIT_ALLOW_CMIL, 0},
+	{"in",   'i', 0.001,    RND_UNIT_IMPERIAL, RND_UNIT_ALLOW_IN, 5},
+	{"mil",  'l', 1,        RND_UNIT_IMPERIAL, RND_UNIT_ALLOW_MIL, 2},
+	{"dmil", 'k', 10,       RND_UNIT_IMPERIAL, RND_UNIT_ALLOW_DMIL, 1},/* kicad legacy decimil unit */
+	{"cmil", 'c', 100,      RND_UNIT_IMPERIAL, RND_UNIT_ALLOW_CMIL, 0},
 
-	{"Hz",   'z', 1,           PCB_UNIT_FREQ,  RND_UNIT_ALLOW_HZ, 3},
-	{"kHz",  'Z', 0.001,       PCB_UNIT_FREQ,  RND_UNIT_ALLOW_KHZ, 6},
-	{"MHz",  'M', 0.000001,    PCB_UNIT_FREQ,  RND_UNIT_ALLOW_MHZ, 6},
-	{"GHz",  'G', 0.000000001, PCB_UNIT_FREQ,  RND_UNIT_ALLOW_GHZ, 6},
+	{"Hz",   'z', 1,           RND_UNIT_FREQ,  RND_UNIT_ALLOW_HZ, 3},
+	{"kHz",  'Z', 0.001,       RND_UNIT_FREQ,  RND_UNIT_ALLOW_KHZ, 6},
+	{"MHz",  'M', 0.000001,    RND_UNIT_FREQ,  RND_UNIT_ALLOW_MHZ, 6},
+	{"GHz",  'G', 0.000000001, RND_UNIT_FREQ,  RND_UNIT_ALLOW_GHZ, 6},
 
 	/* aliases - must be a block at the end */
-	{"inch",  0,  0.001,    PCB_UNIT_IMPERIAL, RND_UNIT_ALLOW_IN, 5},
-	{"pcb",   0,  100,      PCB_UNIT_IMPERIAL, RND_UNIT_ALLOW_CMIL, 0} /* old io_pcb unit */
+	{"inch",  0,  0.001,    RND_UNIT_IMPERIAL, RND_UNIT_ALLOW_IN, 5},
+	{"pcb",   0,  100,      RND_UNIT_IMPERIAL, RND_UNIT_ALLOW_CMIL, 0} /* old io_pcb unit */
 };
 
 #define N_UNITS ((int) (sizeof rnd_units / sizeof rnd_units[0]))
@@ -158,9 +158,9 @@
 	if (unit == NULL)
 		return -1;
 	switch(unit->family) {
-		case PCB_UNIT_METRIC: base = RND_COORD_TO_MM(1); break;
-		case PCB_UNIT_IMPERIAL: base = RND_COORD_TO_MIL(1); break;
-		case PCB_UNIT_FREQ: base = 1.0; break;
+		case RND_UNIT_METRIC: base = RND_COORD_TO_MM(1); break;
+		case RND_UNIT_IMPERIAL: base = RND_COORD_TO_MIL(1); break;
+		case RND_UNIT_FREQ: base = 1.0; break;
 	}
 	return x * unit->scale_factor * base;
 }
@@ -173,22 +173,22 @@
 		return -1;
 
 	switch(unit->family) {
-		case PCB_UNIT_METRIC:   base = RND_MM_TO_COORD(x); break;
-		case PCB_UNIT_IMPERIAL: base = RND_MIL_TO_COORD(x); break;
-		case PCB_UNIT_FREQ:     base = x; break;
+		case RND_UNIT_METRIC:   base = RND_MM_TO_COORD(x); break;
+		case RND_UNIT_IMPERIAL: base = RND_MIL_TO_COORD(x); break;
+		case RND_UNIT_FREQ:     base = x; break;
 	}
 	res = rnd_round(base/unit->scale_factor);
 
 	/* clamp */
 	switch(unit->family) {
-		case PCB_UNIT_METRIC:
-		case PCB_UNIT_IMPERIAL:
+		case RND_UNIT_METRIC:
+		case RND_UNIT_IMPERIAL:
 			if (res >= (double)RND_COORD_MAX)
 				return RND_COORD_MAX;
 			if (res <= -1.0 * (double)RND_COORD_MAX)
 				return -RND_COORD_MAX;
 			break;
-		case PCB_UNIT_FREQ:
+		case RND_UNIT_FREQ:
 			break;
 	}
 	return res;
Index: trunk/src/librnd/core/unit.h
===================================================================
--- trunk/src/librnd/core/unit.h	(revision 31025)
+++ trunk/src/librnd/core/unit.h	(revision 31026)
@@ -76,9 +76,9 @@
 
 /* bitfield */
 typedef enum rnd_family_e {
-	PCB_UNIT_METRIC   = 1,
-	PCB_UNIT_IMPERIAL = 2,
-	PCB_UNIT_FREQ     = 4
+	RND_UNIT_METRIC   = 1,
+	RND_UNIT_IMPERIAL = 2,
+	RND_UNIT_FREQ     = 4
 } rnd_family_t;
 
 enum rnd_suffix_e { RND_UNIT_NO_SUFFIX, RND_UNIT_SUFFIX, RND_UNIT_FILE_MODE };
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 31025)
+++ trunk/src/librnd/pcb_compat.h	(revision 31026)
@@ -1189,3 +1189,6 @@
 #define PCB_UNIT_NO_SUFFIX RND_UNIT_NO_SUFFIX
 #define PCB_UNIT_SUFFIX RND_UNIT_SUFFIX
 #define PCB_UNIT_FILE_MODE RND_UNIT_FILE_MODE
+#define PCB_UNIT_METRIC RND_UNIT_METRIC
+#define PCB_UNIT_IMPERIAL RND_UNIT_IMPERIAL
+#define PCB_UNIT_FREQ RND_UNIT_FREQ
Index: trunk/src_plugins/dialogs/dlg_export.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_export.c	(revision 31025)
+++ trunk/src_plugins/dialogs/dlg_export.c	(revision 31026)
@@ -215,7 +215,7 @@
 									RND_DAD_DEFAULT_NUM(export_ctx.dlg, opts[i].default_val.dbl);
 									break;
 								case RND_HATT_UNIT:
-									PCB_DAD_UNIT(export_ctx.dlg, PCB_UNIT_METRIC | PCB_UNIT_IMPERIAL);
+									PCB_DAD_UNIT(export_ctx.dlg, RND_UNIT_METRIC | RND_UNIT_IMPERIAL);
 									RND_DAD_DEFAULT_NUM(export_ctx.dlg, opts[i].default_val.lng);
 									break;
 								default:
Index: trunk/src_plugins/draw_fab/draw_fab.c
===================================================================
--- trunk/src_plugins/draw_fab/draw_fab.c	(revision 31025)
+++ trunk/src_plugins/draw_fab/draw_fab.c	(revision 31026)
@@ -207,7 +207,7 @@
 	char utcTime[64];
 
 	AllDrills = drill_get_info(PCB->Data);
-	if (rnd_conf.editor.grid_unit->family == PCB_UNIT_IMPERIAL)
+	if (rnd_conf.editor.grid_unit->family == RND_UNIT_IMPERIAL)
 		drill_round_info(AllDrills, RND_MIL_TO_COORD(1));
 	else
 		drill_round_info(AllDrills, RND_MM_TO_COORD(0.01));
@@ -263,12 +263,12 @@
 			text_at(info, gc, RND_MIL_TO_COORD(980), yoff, RND_MIL_TO_COORD(2), "%d", drill->UnplatedCount);
 		}
 		rnd_render->set_color(gc, &conf_core.appearance.color.element);
-		if (rnd_conf.editor.grid_unit->family == PCB_UNIT_IMPERIAL)
+		if (rnd_conf.editor.grid_unit->family == RND_UNIT_IMPERIAL)
 			text_at(info, gc, RND_MIL_TO_COORD(450), yoff, RND_MIL_TO_COORD(2), "%0.3f", RND_COORD_TO_INCH(drill->DrillSize));
 		else
 			text_at(info, gc, RND_MIL_TO_COORD(450), yoff, RND_MIL_TO_COORD(2), "%1.2f", RND_COORD_TO_MM(drill->DrillSize));
 		if (plated_sym != -1 && unplated_sym != -1) {
-			if (rnd_conf.editor.grid_unit->family == PCB_UNIT_IMPERIAL)
+			if (rnd_conf.editor.grid_unit->family == RND_UNIT_IMPERIAL)
 				text_at(info, gc, RND_MIL_TO_COORD(450), yoff + TEXT_LINE, RND_MIL_TO_COORD(2), "%0.3f", RND_COORD_TO_INCH(drill->DrillSize));
 			else
 				text_at(info, gc, RND_MIL_TO_COORD(450), yoff + TEXT_LINE, RND_MIL_TO_COORD(2), "%1.2f", RND_COORD_TO_MM(drill->DrillSize));
@@ -280,7 +280,7 @@
 
 	rnd_render->set_color(gc, &conf_core.appearance.color.element);
 	text_at(info, gc, 0, yoff, RND_MIL_TO_COORD(9), "Symbol");
-	if (rnd_conf.editor.grid_unit->family == PCB_UNIT_IMPERIAL)
+	if (rnd_conf.editor.grid_unit->family == RND_UNIT_IMPERIAL)
 		text_at(info, gc, RND_MIL_TO_COORD(410), yoff, RND_MIL_TO_COORD(9), "Diam. (Inch)");
 	else
 		text_at(info, gc, RND_MIL_TO_COORD(410), yoff, RND_MIL_TO_COORD(9), "Diam. (mm)");
Index: trunk/src_plugins/export_openems/excitation.c
===================================================================
--- trunk/src_plugins/export_openems/excitation.c	(revision 31025)
+++ trunk/src_plugins/export_openems/excitation.c	(revision 31026)
@@ -149,7 +149,7 @@
 	double d;
 	if (!rnd_get_value_unit(s, NULL, 0, &d, &u))
 		return rnd_false;
-	if (u->family != PCB_UNIT_FREQ)
+	if (u->family != RND_UNIT_FREQ)
 		return rnd_false;
 	*out = d;
 	return rnd_true;
Index: trunk/src_plugins/io_dsn/read.c
===================================================================
--- trunk/src_plugins/io_dsn/read.c	(revision 31025)
+++ trunk/src_plugins/io_dsn/read.c	(revision 31026)
@@ -99,7 +99,7 @@
 		return 0;
 	}
 	v /= ctx->unit->scale_factor;
-	if (ctx->unit->family == PCB_UNIT_METRIC)
+	if (ctx->unit->family == RND_UNIT_METRIC)
 		return RND_MM_TO_COORD(v);
 	return RND_MIL_TO_COORD(v);
 }
Index: trunk/src_plugins/query/query_y.c
===================================================================
--- trunk/src_plugins/query/query_y.c	(revision 31025)
+++ trunk/src_plugins/query/query_y.c	(revision 31026)
@@ -119,9 +119,9 @@
 	if (negative) \
 		dst = -dst; \
 	if (unit != NULL) { \
-		if (unit->family == PCB_UNIT_IMPERIAL) \
+		if (unit->family == RND_UNIT_IMPERIAL) \
 			dst = RND_MIL_TO_COORD(dst); \
-		else if (unit->family == PCB_UNIT_METRIC) \
+		else if (unit->family == RND_UNIT_METRIC) \
 			dst = RND_MM_TO_COORD(dst); \
 		dst /= unit->scale_factor; \
 	} \
Index: trunk/src_plugins/query/query_y.y
===================================================================
--- trunk/src_plugins/query/query_y.y	(revision 31025)
+++ trunk/src_plugins/query/query_y.y	(revision 31026)
@@ -42,9 +42,9 @@
 	if (negative) \
 		dst = -dst; \
 	if (unit != NULL) { \
-		if (unit->family == PCB_UNIT_IMPERIAL) \
+		if (unit->family == RND_UNIT_IMPERIAL) \
 			dst = RND_MIL_TO_COORD(dst); \
-		else if (unit->family == PCB_UNIT_METRIC) \
+		else if (unit->family == RND_UNIT_METRIC) \
 			dst = RND_MM_TO_COORD(dst); \
 		dst /= unit->scale_factor; \
 	} \