Index: file.c
===================================================================
--- file.c	(revision 30915)
+++ file.c	(revision 30916)
@@ -1185,7 +1185,7 @@
 	pcb_rat_all_anchor_guess(pcb->Data);
 }
 
-#if !defined(HAS_ATEXIT)
+#if !defined(RND_HAS_ATEXIT)
 /* makes a temporary copy of the data. This is useful for systems which
  * doesn't support calling functions on exit. We use this to save the data
  * before LEX and YACC functions are called because they are able to abort
Index: file.h
===================================================================
--- file.h	(revision 30915)
+++ file.h	(revision 30916)
@@ -90,7 +90,7 @@
 void io_pcb_preproc_board(pcb_board_t *pcb);
 void io_pcb_postproc_board(pcb_board_t *pcb);
 
-#ifndef HAS_ATEXIT
+#ifndef RND_HAS_ATEXIT
 void pcb_tmp_data_save(void);
 void pcb_tmp_data_remove(void);
 #endif
Index: parse_l.c
===================================================================
--- parse_l.c	(revision 30915)
+++ parse_l.c	(revision 30916)
@@ -2618,7 +2618,7 @@
 			}
 
 			if (Path != NULL && *Path != '\0')
-				sprintf(tmps, "%s%s%s", Path, PCB_DIR_SEPARATOR_S, Filename);
+				sprintf(tmps, "%s%s%s", Path, RND_DIR_SEPARATOR_S, Filename);
 			else
 				sprintf(tmps, "%s", Filename);
 
@@ -2669,7 +2669,7 @@
 
 	pcb_create_be_lenient(pcb_true);
 
-#if !defined(HAS_ATEXIT)
+#if !defined(RND_HAS_ATEXIT)
 	if (PCB && PCB->Data)
 		pcb_tmp_data_save();
 	returncode = pcb_parse();
Index: parse_l.l
===================================================================
--- parse_l.l	(revision 30915)
+++ parse_l.l	(revision 30916)
@@ -235,7 +235,7 @@
 			}
 
 			if (Path != NULL && *Path != '\0')
-				sprintf(tmps, "%s%s%s", Path, PCB_DIR_SEPARATOR_S, Filename);
+				sprintf(tmps, "%s%s%s", Path, RND_DIR_SEPARATOR_S, Filename);
 			else
 				sprintf(tmps, "%s", Filename);
 
@@ -286,7 +286,7 @@
 
 	pcb_create_be_lenient(pcb_true);
 
-#if !defined(HAS_ATEXIT)
+#if !defined(RND_HAS_ATEXIT)
 	if (PCB && PCB->Data)
 		pcb_tmp_data_save();
 	returncode = pcb_parse();