Index: file.c
===================================================================
--- file.c	(revision 30954)
+++ file.c	(revision 30955)
@@ -691,7 +691,7 @@
 	ts = pcb_layer_get_top_silk();
 
 	if ((bs < 0) || (ts < 0)) {
-		rnd_message(PCB_MSG_ERROR, "The geda/pcb file format requires top and bottom silk layers.\nExporting a board without those will not be usable in geda/pcb.\n");
+		rnd_message(RND_MSG_ERROR, "The geda/pcb file format requires top and bottom silk layers.\nExporting a board without those will not be usable in geda/pcb.\n");
 		return;
 	}
 
@@ -1158,13 +1158,13 @@
 		if (PCB->Data->Layer[n].meta.real.grp == -1) {
 			pcb_layergrp_t *grp = pcb_get_grp_new_intern(pcb, -1);
 
-			rnd_message(PCB_MSG_WARNING, "Broken input file: layer group string doesn't contain layer %ld\n(Trying to fix it by introducing a new intern copper layer)\n", n);
+			rnd_message(RND_MSG_WARNING, "Broken input file: layer group string doesn't contain layer %ld\n(Trying to fix it by introducing a new intern copper layer)\n", n);
 			if (grp != NULL) {
 				pcb_layergrp_id_t gid = grp - PCB->LayerGroups.grp;
 				pcb_layer_move_to_group(pcb, n, gid);
 			}
 			else
-				rnd_message(PCB_MSG_ERROR, "Failed to add a new layer group - the board in memory IS BROKEN.\n");
+				rnd_message(RND_MSG_ERROR, "Failed to add a new layer group - the board in memory IS BROKEN.\n");
 		}
 	}
 
Index: parse_l.c
===================================================================
--- parse_l.c	(revision 30954)
+++ parse_l.c	(revision 30955)
@@ -2638,7 +2638,7 @@
 			command = pcb_build_argfn(Executable, &p);
 			/* open pipe to stdout of command */
 			if (*command == '\0' || (yyin = pcb_popen(NULL, command, "r")) == NULL) {
-				pcb_popen_error_message(command);
+				rnd_popen_error_message(command);
 				free(command);
 				return (1);
 			}
@@ -2831,20 +2831,20 @@
 			/* Loaded a file that did not have any information about preferred format */
 			switch((int)pcb_io_pcb_usty_seen) {
 				case PCB_USTY_CMIL:
-					rnd_message(PCB_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from consistent unitless centimil input)\n", Filename, pcb_centimil_io_pcb->description);
+					rnd_message(RND_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from consistent unitless centimil input)\n", Filename, pcb_centimil_io_pcb->description);
 					PCB->Data->loader = pcb_centimil_io_pcb;
 					break;
 				case PCB_USTY_NANOMETER:
-					rnd_message(PCB_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from consistent nanometer input)\n", Filename, pcb_nanometer_io_pcb->description);
+					rnd_message(RND_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from consistent nanometer input)\n", Filename, pcb_nanometer_io_pcb->description);
 					PCB->Data->loader = pcb_nanometer_io_pcb;
 					break;
 				case PCB_USTY_UNITS:
 				case PCB_USTY_UNITS | PCB_USTY_NANOMETER:
-					rnd_message(PCB_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from non-nanometer explicit unit usage)\n", Filename, pcb_preferred_io_pcb->description);
+					rnd_message(RND_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from non-nanometer explicit unit usage)\n", Filename, pcb_preferred_io_pcb->description);
 					PCB->Data->loader = pcb_preferred_io_pcb;
 					break;
 				default:
-					rnd_message(PCB_MSG_WARNING, "No preferred unit format info available and guessing failed for '%s' - will use '%s' on save\n", Filename, pcb_preferred_io_pcb->description);
+					rnd_message(RND_MSG_WARNING, "No preferred unit format info available and guessing failed for '%s' - will use '%s' on save\n", Filename, pcb_preferred_io_pcb->description);
 					PCB->Data->loader = pcb_preferred_io_pcb;
 			}
 		}
@@ -2874,7 +2874,7 @@
 	r = Parse(NULL, fcmd, NULL, Filename);
 	if (r == 0) {
 #ifdef DEBUG
-		rnd_message(PCB_MSG_DEBUG, "Found %s in %s\n", Filename, conf_core.rc.font_command);
+		rnd_message(RND_MSG_DEBUG, "Found %s in %s\n", Filename, conf_core.rc.font_command);
 #endif
 	}
 	return r;
Index: parse_l.l
===================================================================
--- parse_l.l	(revision 30954)
+++ parse_l.l	(revision 30955)
@@ -255,7 +255,7 @@
 			command = pcb_build_argfn(Executable, &p);
 			/* open pipe to stdout of command */
 			if (*command == '\0' || (yyin = pcb_popen(NULL, command, "r")) == NULL) {
-				pcb_popen_error_message(command);
+				rnd_popen_error_message(command);
 				free(command);
 				return (1);
 			}
@@ -448,20 +448,20 @@
 			/* Loaded a file that did not have any information about preferred format */
 			switch((int)pcb_io_pcb_usty_seen) {
 				case PCB_USTY_CMIL:
-					rnd_message(PCB_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from consistent unitless centimil input)\n", Filename, pcb_centimil_io_pcb->description);
+					rnd_message(RND_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from consistent unitless centimil input)\n", Filename, pcb_centimil_io_pcb->description);
 					PCB->Data->loader = pcb_centimil_io_pcb;
 					break;
 				case PCB_USTY_NANOMETER:
-					rnd_message(PCB_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from consistent nanometer input)\n", Filename, pcb_nanometer_io_pcb->description);
+					rnd_message(RND_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from consistent nanometer input)\n", Filename, pcb_nanometer_io_pcb->description);
 					PCB->Data->loader = pcb_nanometer_io_pcb;
 					break;
 				case PCB_USTY_UNITS:
 				case PCB_USTY_UNITS | PCB_USTY_NANOMETER:
-					rnd_message(PCB_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from non-nanometer explicit unit usage)\n", Filename, pcb_preferred_io_pcb->description);
+					rnd_message(RND_MSG_INFO, "No preferred unit format info available for '%s' - will use '%s' on save (guessed from non-nanometer explicit unit usage)\n", Filename, pcb_preferred_io_pcb->description);
 					PCB->Data->loader = pcb_preferred_io_pcb;
 					break;
 				default:
-					rnd_message(PCB_MSG_WARNING, "No preferred unit format info available and guessing failed for '%s' - will use '%s' on save\n", Filename, pcb_preferred_io_pcb->description);
+					rnd_message(RND_MSG_WARNING, "No preferred unit format info available and guessing failed for '%s' - will use '%s' on save\n", Filename, pcb_preferred_io_pcb->description);
 					PCB->Data->loader = pcb_preferred_io_pcb;
 			}
 		}
@@ -491,7 +491,7 @@
 	r = Parse(NULL, fcmd, NULL, Filename);
 	if (r == 0) {
 #ifdef DEBUG
-		rnd_message(PCB_MSG_DEBUG, "Found %s in %s\n", Filename, conf_core.rc.font_command);
+		rnd_message(RND_MSG_DEBUG, "Found %s in %s\n", Filename, conf_core.rc.font_command);
 #endif
 	}
 	return r;
Index: parse_y.c
===================================================================
--- parse_y.c	(revision 30954)
+++ parse_y.c	(revision 30955)
@@ -1821,7 +1821,7 @@
 
 				if (!yyPCB)
 				{
-					rnd_message(PCB_MSG_ERROR, "illegal fileformat\n");
+					rnd_message(RND_MSG_ERROR, "illegal fileformat\n");
 					YYABORT;
 				}
 				for (i = 0; i < PCB_MAX_LAYER + 2; i++)
@@ -1847,20 +1847,20 @@
 			  pcb_board_new_postproc(yyPCB, 0);
 			  if (layer_group_string == NULL) {
 			     if (pcb_layer_improvise(yyPCB, pcb_true) != 0) {
-			        rnd_message(PCB_MSG_ERROR, "missing layer-group string, failed to improvise the groups\n");
+			        rnd_message(RND_MSG_ERROR, "missing layer-group string, failed to improvise the groups\n");
 			        YYABORT;
 			     }
-			     rnd_message(PCB_MSG_ERROR, "missing layer-group string: invalid input file, had to improvise, the layer stack is most probably broken\n");
+			     rnd_message(RND_MSG_ERROR, "missing layer-group string: invalid input file, had to improvise, the layer stack is most probably broken\n");
 			  }
 			  else {
 			    if (pcb_layer_parse_group_string(yyPCB, layer_group_string, yyData->LayerN, old_fmt))
 			    {
-			      rnd_message(PCB_MSG_ERROR, "illegal layer-group string\n");
+			      rnd_message(RND_MSG_ERROR, "illegal layer-group string\n");
 			      YYABORT;
 			    }
 			    else {
 			     if (pcb_layer_improvise(yyPCB, pcb_false) != 0) {
-			        rnd_message(PCB_MSG_ERROR, "failed to extend-improvise the groups\n");
+			        rnd_message(RND_MSG_ERROR, "failed to extend-improvise the groups\n");
 			        YYABORT;
 			     }
 			    }
@@ -1921,7 +1921,7 @@
 
 				if (!yyData || !yyFont)
 				{
-					rnd_message(PCB_MSG_ERROR, "illegal fileformat\n");
+					rnd_message(RND_MSG_ERROR, "illegal fileformat\n");
 					YYABORT;
 				}
 				for (i = 0; i < PCB_MAX_LAYER + 2; i++)
@@ -1937,7 +1937,7 @@
 					/* mark all symbols invalid */
 				if (!yyFont)
 				{
-					rnd_message(PCB_MSG_ERROR, "illegal fileformat\n");
+					rnd_message(RND_MSG_ERROR, "illegal fileformat\n");
 					YYABORT;
 				}
 				if (yyFontReset) {
@@ -2143,7 +2143,7 @@
     {
 				if (pcb_route_string_parse((yyvsp[-1].string), &yyPCB->RouteStyle, "mil"))
 				{
-					rnd_message(PCB_MSG_ERROR, "illegal route-style string\n");
+					rnd_message(RND_MSG_ERROR, "illegal route-style string\n");
 					YYABORT;
 				}
 				free((yyvsp[-1].string));
@@ -2156,7 +2156,7 @@
     {
 				if (pcb_route_string_parse(((yyvsp[-1].string) == NULL ? "" : (yyvsp[-1].string)), &yyPCB->RouteStyle, "cmil"))
 				{
-					rnd_message(PCB_MSG_ERROR, "illegal route-style string\n");
+					rnd_message(RND_MSG_ERROR, "illegal route-style string\n");
 					YYABORT;
 				}
 				free((yyvsp[-1].string));
@@ -2444,7 +2444,7 @@
 
 				if (bad_contour_found)
 				  {
-				    rnd_message(PCB_MSG_WARNING, "WARNING parsing file '%s'\n"
+				    rnd_message(RND_MSG_WARNING, "WARNING parsing file '%s'\n"
 					    "    line:        %i\n"
 					    "    description: 'ignored polygon (< 3 points in a contour)'\n",
 					    yyfilename, pcb_lineno);
@@ -2932,7 +2932,7 @@
 				char *old_val, *key = (yyvsp[-2].string), *val = (yyvsp[-1].string) ? (yyvsp[-1].string) : (char *)"";
 				old_val = rnd_attribute_get(attr_list, key);
 				if (old_val != NULL)
-					rnd_message(PCB_MSG_ERROR, "mutliple values for attribute %s: '%s' and '%s' - ignoring '%s'\n", key, old_val, val, val);
+					rnd_message(RND_MSG_ERROR, "mutliple values for attribute %s: '%s' and '%s' - ignoring '%s'\n", key, old_val, val, val);
 				else
 					rnd_attribute_put(attr_list, key, val);
 				free(key);
@@ -3265,7 +3265,7 @@
  */
 int yyerror(const char * s)
 {
-	rnd_message(PCB_MSG_ERROR, "ERROR parsing file '%s'\n"
+	rnd_message(RND_MSG_ERROR, "ERROR parsing file '%s'\n"
 		"    line:        %i\n"
 		"    description: '%s'\n",
 		yyfilename, pcb_lineno, s);
@@ -3281,7 +3281,7 @@
 check_file_version (int ver)
 {
   if ( ver > PCB_FILE_VERSION ) {
-    rnd_message(PCB_MSG_ERROR, "ERROR:  The file you are attempting to load is in a format\n"
+    rnd_message(RND_MSG_ERROR, "ERROR:  The file you are attempting to load is in a format\n"
 	     "which is too new for this version of pcb.  To load this file\n"
 	     "you need a version of pcb which is >= %d.  If you are\n"
 	     "using a version built from git source, the source date\n"
Index: parse_y.y
===================================================================
--- parse_y.y	(revision 30954)
+++ parse_y.y	(revision 30955)
@@ -160,7 +160,7 @@
 
 				if (!yyPCB)
 				{
-					rnd_message(PCB_MSG_ERROR, "illegal fileformat\n");
+					rnd_message(RND_MSG_ERROR, "illegal fileformat\n");
 					YYABORT;
 				}
 				for (i = 0; i < PCB_MAX_LAYER + 2; i++)
@@ -195,20 +195,20 @@
 			  pcb_board_new_postproc(yyPCB, 0);
 			  if (layer_group_string == NULL) {
 			     if (pcb_layer_improvise(yyPCB, pcb_true) != 0) {
-			        rnd_message(PCB_MSG_ERROR, "missing layer-group string, failed to improvise the groups\n");
+			        rnd_message(RND_MSG_ERROR, "missing layer-group string, failed to improvise the groups\n");
 			        YYABORT;
 			     }
-			     rnd_message(PCB_MSG_ERROR, "missing layer-group string: invalid input file, had to improvise, the layer stack is most probably broken\n");
+			     rnd_message(RND_MSG_ERROR, "missing layer-group string: invalid input file, had to improvise, the layer stack is most probably broken\n");
 			  }
 			  else {
 			    if (pcb_layer_parse_group_string(yyPCB, layer_group_string, yyData->LayerN, old_fmt))
 			    {
-			      rnd_message(PCB_MSG_ERROR, "illegal layer-group string\n");
+			      rnd_message(RND_MSG_ERROR, "illegal layer-group string\n");
 			      YYABORT;
 			    }
 			    else {
 			     if (pcb_layer_improvise(yyPCB, pcb_false) != 0) {
-			        rnd_message(PCB_MSG_ERROR, "failed to extend-improvise the groups\n");
+			        rnd_message(RND_MSG_ERROR, "failed to extend-improvise the groups\n");
 			        YYABORT;
 			     }
 			    }
@@ -259,7 +259,7 @@
 
 				if (!yyData || !yyFont)
 				{
-					rnd_message(PCB_MSG_ERROR, "illegal fileformat\n");
+					rnd_message(RND_MSG_ERROR, "illegal fileformat\n");
 					YYABORT;
 				}
 				for (i = 0; i < PCB_MAX_LAYER + 2; i++)
@@ -280,7 +280,7 @@
 					/* mark all symbols invalid */
 				if (!yyFont)
 				{
-					rnd_message(PCB_MSG_ERROR, "illegal fileformat\n");
+					rnd_message(RND_MSG_ERROR, "illegal fileformat\n");
 					YYABORT;
 				}
 				if (yyFontReset) {
@@ -469,7 +469,7 @@
 			{
 				if (pcb_route_string_parse($3, &yyPCB->RouteStyle, "mil"))
 				{
-					rnd_message(PCB_MSG_ERROR, "illegal route-style string\n");
+					rnd_message(RND_MSG_ERROR, "illegal route-style string\n");
 					YYABORT;
 				}
 				free($3);
@@ -478,7 +478,7 @@
 			{
 				if (pcb_route_string_parse(($3 == NULL ? "" : $3), &yyPCB->RouteStyle, "cmil"))
 				{
-					rnd_message(PCB_MSG_ERROR, "illegal route-style string\n");
+					rnd_message(RND_MSG_ERROR, "illegal route-style string\n");
 					YYABORT;
 				}
 				free($3);
@@ -785,7 +785,7 @@
 
 				if (bad_contour_found)
 				  {
-				    rnd_message(PCB_MSG_WARNING, "WARNING parsing file '%s'\n"
+				    rnd_message(RND_MSG_WARNING, "WARNING parsing file '%s'\n"
 					    "    line:        %i\n"
 					    "    description: 'ignored polygon (< 3 points in a contour)'\n",
 					    yyfilename, pcb_lineno);
@@ -1323,7 +1323,7 @@
 				char *old_val, *key = $3, *val = $4 ? $4 : (char *)"";
 				old_val = rnd_attribute_get(attr_list, key);
 				if (old_val != NULL)
-					rnd_message(PCB_MSG_ERROR, "mutliple values for attribute %s: '%s' and '%s' - ignoring '%s'\n", key, old_val, val, val);
+					rnd_message(RND_MSG_ERROR, "mutliple values for attribute %s: '%s' and '%s' - ignoring '%s'\n", key, old_val, val, val);
 				else
 					rnd_attribute_put(attr_list, key, val);
 				free(key);
@@ -1361,7 +1361,7 @@
  */
 int yyerror(const char * s)
 {
-	rnd_message(PCB_MSG_ERROR, "ERROR parsing file '%s'\n"
+	rnd_message(RND_MSG_ERROR, "ERROR parsing file '%s'\n"
 		"    line:        %i\n"
 		"    description: '%s'\n",
 		yyfilename, pcb_lineno, s);
@@ -1377,7 +1377,7 @@
 check_file_version (int ver)
 {
   if ( ver > PCB_FILE_VERSION ) {
-    rnd_message(PCB_MSG_ERROR, "ERROR:  The file you are attempting to load is in a format\n"
+    rnd_message(RND_MSG_ERROR, "ERROR:  The file you are attempting to load is in a format\n"
 	     "which is too new for this version of pcb.  To load this file\n"
 	     "you need a version of pcb which is >= %d.  If you are\n"
 	     "using a version built from git source, the source date\n"