Index: ipcd356.c
===================================================================
--- ipcd356.c	(revision 30954)
+++ ipcd356.c	(revision 30955)
@@ -83,7 +83,7 @@
 
 	if (has_sign) {
 		if ((*sign != '+') && (*sign != '-') && (*sign != ' ')) {
-			rnd_message(PCB_MSG_WARNING, "Invalid coordinate sign: '%c':\n", *line);
+			rnd_message(RND_MSG_WARNING, "Invalid coordinate sign: '%c':\n", *line);
 			return -1;
 		}
 	}
@@ -118,11 +118,11 @@
 static int parse_feature(char *line, test_feature_t *tf, const char *fn, long lineno, int is_mil, int is_rad, char *netname, char *refdes, char *term)
 {
 	if (line[2] != '7') {
-		rnd_message(PCB_MSG_WARNING, "Ignoring unknown test feautre '3%c%c' in %s:%ld' - does not end in 7\n", line[1], line[2], fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring unknown test feautre '3%c%c' in %s:%ld' - does not end in 7\n", line[1], line[2], fn, lineno);
 		return -1;
 	}
 	if (line[26] != '-') {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing dash between refdes and pin number\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing dash between refdes and pin number\n", fn, lineno);
 		return -1;
 	}
 	extract_field(netname, line, 3, 16);
@@ -132,7 +132,7 @@
 	tf->is_middle = (line[31] == 'M');
 	if (line[32] == 'D') {
 		if (extract_dim(&tf->hole, line, 33, 36, 0, is_mil)) {
-			rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid hole dimension\n", fn, lineno);
+			rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid hole dimension\n", fn, lineno);
 			return -1;
 		}
 		if (line[37] == 'P')
@@ -140,7 +140,7 @@
 		else if (line[37] == 'U')
 			tf->is_plated = 0;
 		else {
-			rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - hole is neither plated nor unplated\n", fn, lineno);
+			rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - hole is neither plated nor unplated\n", fn, lineno);
 			return -1;
 		}
 	}
@@ -149,59 +149,59 @@
 		tf->is_plated = 0;
 	}
 	if (line[38] != 'A') {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing 'A' for access\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing 'A' for access\n", fn, lineno);
 		return -1;
 	}
 	if (extract_int(&tf->side, line, 39, 40)) {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid access side\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid access side\n", fn, lineno);
 		return -1;
 	}
 	if (line[41] != 'X') {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing 'X'\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing 'X'\n", fn, lineno);
 		return -1;
 	}
 	if (extract_dim(&tf->cx, line, 42, 48, 1, is_mil)) {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid X dimension\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid X dimension\n", fn, lineno);
 		return -1;
 	}
 	if (line[49] != 'Y') {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing 'Y'\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing 'Y'\n", fn, lineno);
 		return -1;
 	}
 	if (extract_dim(&tf->cy, line, 50, 56, 1, is_mil)) {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid Y dimension\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid Y dimension\n", fn, lineno);
 		return -1;
 	}
 	if (line[57] != 'X') {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing width 'X'\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing width 'X'\n", fn, lineno);
 		return -1;
 	}
 	if (extract_dim(&tf->width, line, 58, 61, 0, is_mil)) {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid width dimension\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid width dimension\n", fn, lineno);
 		return -1;
 	}
 	if (line[62] != 'Y') {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing height 'Y'\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing height 'Y'\n", fn, lineno);
 		return -1;
 	}
 	if (extract_dim(&tf->height, line, 63, 66, 0, is_mil)) {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid height 'Y' dimension\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid height 'Y' dimension\n", fn, lineno);
 		return -1;
 	}
 	if (line[67] != 'R') {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing rotation 'R'\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - missing rotation 'R'\n", fn, lineno);
 		return -1;
 	}
 	if (extract_int(&tf->rot, line, 68, 70)) {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid height 'Y' dimension\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid height 'Y' dimension\n", fn, lineno);
 		return -1;
 	}
 	if (line[72] != 'S') {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - solder mask marker 'S'\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - solder mask marker 'S'\n", fn, lineno);
 		return -1;
 	}
 	if (extract_int(&tf->mask, line, 73, 73)) {
-		rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid height 'Y' dimension\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - invalid height 'Y' dimension\n", fn, lineno);
 		return -1;
 	}
 	tf->is_tooling = 0;
@@ -212,18 +212,18 @@
 			tf->is_tooling = 1;
 		case '1': /* through hole */
 			if (tf->hole == 0) {
-				rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - thru-hole feature without hole dia\n", fn, lineno);
+				rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - thru-hole feature without hole dia\n", fn, lineno);
 				return -1;
 			}
 			break;
 		case '2': /* SMT feature */
 			if (tf->hole > 0) {
-				rnd_message(PCB_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - SMD feature with hole dia\n", fn, lineno);
+				rnd_message(RND_MSG_WARNING, "Ignoring invalid test feautre in %s:%ld' - SMD feature with hole dia\n", fn, lineno);
 				break;
 			}
 			break;
 		default:
-			rnd_message(PCB_MSG_WARNING, "Ignoring unknown test feautre '3%c%c' in %s:%ld - unknown second digit'\n", line[1], line[2], fn, lineno);
+			rnd_message(RND_MSG_WARNING, "Ignoring unknown test feautre '3%c%c' in %s:%ld - unknown second digit'\n", line[1], line[2], fn, lineno);
 	}
 	return 0;
 }
@@ -273,7 +273,7 @@
 
 	y = pcb->hidlib.size_y - tf->cy;
 	if ((y < 0) || (y > pcb->hidlib.size_y) || (tf->cx < 0) || (tf->cx > pcb->hidlib.size_x))
-		rnd_message(PCB_MSG_WARNING, "Test feature ended up out of the board extents in %s:%ld - board too small please use autocrop()\n", fn, lineno);
+		rnd_message(RND_MSG_WARNING, "Test feature ended up out of the board extents in %s:%ld - board too small please use autocrop()\n", fn, lineno);
 	ps = pcb_pstk_new_from_shape(data, tf->cx, y, tf->hole, tf->is_plated, conf_core.design.bloat, sh);
 
 	if (tf->is_middle)
@@ -308,7 +308,7 @@
 						case '2': is_mil = 1; is_rad = 1; break;
 					}
 					if (is_rad) {
-						rnd_message(PCB_MSG_ERROR, "Unimplemented unit in %s:%ld - requested radians in rotation, the code doesn't handle that\n", fn, lineno);
+						rnd_message(RND_MSG_ERROR, "Unimplemented unit in %s:%ld - requested radians in rotation, the code doesn't handle that\n", fn, lineno);
 						return 1;
 					}
 				}
@@ -345,12 +345,12 @@
 			case '9': /* EOF */
 				if ((line[1] == '9') && (line[2] == '9'))
 					return 0;
-				rnd_message(PCB_MSG_ERROR, "Invalid end-of-file marker in %s:%ld - expected '999'\n", fn, lineno);
+				rnd_message(RND_MSG_ERROR, "Invalid end-of-file marker in %s:%ld - expected '999'\n", fn, lineno);
 				return 1;
 		}
 	}
 
-	rnd_message(PCB_MSG_ERROR, "Unexpected end of file - expected '999'\n");
+	rnd_message(RND_MSG_ERROR, "Unexpected end of file - expected '999'\n");
 	return 1;
 }
 
@@ -383,7 +383,7 @@
 
 	f = pcb_fopen(&PCB->hidlib, fname, "r");
 	if (f == NULL) {
-		rnd_message(PCB_MSG_ERROR, "Can't open %s for read\n", fname);
+		rnd_message(RND_MSG_ERROR, "Can't open %s for read\n", fname);
 		RND_ACT_IRES(1);
 		return 0;
 	}
@@ -476,7 +476,7 @@
 static int ipcd356_import(pcb_plug_import_t *ctx, unsigned int aspects, const char **fns, int numfns)
 {
 	if (numfns != 1) {
-		rnd_message(PCB_MSG_ERROR, "import_ipcd356: requires exactly 1 input file name\n");
+		rnd_message(RND_MSG_ERROR, "import_ipcd356: requires exactly 1 input file name\n");
 		return -1;
 	}
 	return rnd_actionva(&PCB->hidlib, "LoadIpc356From", fns[0], NULL);