Index: common.c
===================================================================
--- common.c	(revision 31004)
+++ common.c	(revision 31005)
@@ -64,7 +64,7 @@
 	if (ver < 6) /* old file versions did not have explicit no-shape */
 		omit = 1;
 
-	for(n = 1; n < PCB_ENTRIES(thermal_style) - omit; n++)
+	for(n = 1; n < RND_ENTRIES(thermal_style) - omit; n++)
 		if (strcmp(name, thermal_style[n]) == 0)
 			return thermal_style_bits[n];
 
@@ -79,7 +79,7 @@
 
 const char *io_lihata_thermal_style_old(int idx)
 {
-	if ((idx > 0) && (idx < PCB_ENTRIES(thermal_style)))
+	if ((idx > 0) && (idx < RND_ENTRIES(thermal_style)))
 		return thermal_style[idx];
 	return NULL;
 }
Index: read.c
===================================================================
--- read.c	(revision 31004)
+++ read.c	(revision 31005)
@@ -198,7 +198,7 @@
 	if (nd->type != LHT_TEXT)
 		return iolht_error(nd, "Invalid coord type: '%d'\n", nd->type);
 
-	tmp = pcb_get_value_ex(nd->data.text.value, NULL, NULL, NULL, NULL, &success);
+	tmp = rnd_get_value_ex(nd->data.text.value, NULL, NULL, NULL, NULL, &success);
 	if (!success)
 		return iolht_error(nd, "Invalid coord value: '%s'\n", nd->data.text.value);
 
@@ -221,7 +221,7 @@
 	if (nd->type != LHT_TEXT)
 		return iolht_error(nd, "Invalid angle type: '%d'\n", nd->type);
 
-	tmp = pcb_get_value_ex(nd->data.text.value, NULL, NULL, NULL, NULL, &success);
+	tmp = rnd_get_value_ex(nd->data.text.value, NULL, NULL, NULL, NULL, &success);
 	if (!success)
 		return iolht_error(nd, "Invalid angle value: '%s'\n", nd->data.text.value);
 
Index: write.c
===================================================================
--- write.c	(revision 31004)
+++ write.c	(revision 31005)
@@ -1462,8 +1462,8 @@
 
 /*		fprintf(stderr, "SMART d='%s' m='%s'\n", ondisk_value, inmem_node->data.text.value);*/
 
-		v1 = pcb_get_value_ex(ondisk_value, NULL, NULL, NULL, NULL, &success1);
-		v2 = pcb_get_value_ex(inmem_node->data.text.value, NULL, NULL, NULL, NULL, &success2);
+		v1 = rnd_get_value_ex(ondisk_value, NULL, NULL, NULL, NULL, &success1);
+		v2 = rnd_get_value_ex(inmem_node->data.text.value, NULL, NULL, NULL, NULL, &success2);
 /*		pcb_fprintf(stderr, " %d %d | %mm %mm\n", success1, success2, v1, v2);*/
 		if (success1 && success2) {
 			/* smart: if values are the same, keep the on-disk version */
@@ -1568,7 +1568,7 @@
 		}
 		if (res != 0) {
 			FILE *fe;
-			char *fe_name = pcb_concat(old_filename, ".mem.lht", NULL);
+			char *fe_name = rnd_concat(old_filename, ".mem.lht", NULL);
 			fe = pcb_fopen(&PCB->hidlib, fe_name, "w");
 			if (fe != NULL) {
 				clean_invalid(brd->root); /* remove invalid nodes placed for persistency */