Index: config/gen/config_h.pl
===================================================================
RCS file: /cvs/public/parrot/config/gen/config_h.pl,v
retrieving revision 1.7
diff -u -r1.7 config_h.pl
--- config/gen/config_h.pl	26 Jun 2003 13:11:24 -0000	1.7
+++ config/gen/config_h.pl	11 Aug 2003 01:24:05 -0000
@@ -28,10 +28,10 @@
   for(sort(Configure::Data->keys())) {
     next unless /i_(\w+)/;
     if(Configure::Data->get($_)) {
-      print HH "#define HAS_HEADER_\U$1 1\n"
+      print HH "#define PARROT_HAS_HEADER_\U$1 1\n"
     }
     else {
-      print HH "#undef  HAS_HEADER_\U$1\n";
+      print HH "#undef  PARROT_HAS_HEADER_\U$1\n";
     }
   }
 
Index: cpu_dep.c
===================================================================
RCS file: /cvs/public/parrot/cpu_dep.c,v
retrieving revision 1.9
diff -u -r1.9 cpu_dep.c
--- cpu_dep.c	21 Jul 2003 18:00:23 -0000	1.9
+++ cpu_dep.c	11 Aug 2003 01:24:05 -0000
@@ -54,7 +54,7 @@
 				(size_t)current_regstore_top);
 #else
 
-#  ifdef HAS_HEADER_SETJMP
+#  ifdef PARROT_HAS_HEADER_SETJMP
     Parrot_jump_buff env;
 
     /* Zero the Parrot_jump_buff, otherwise you will trace stale objects */
Index: embed.c
===================================================================
RCS file: /cvs/public/parrot/embed.c,v
retrieving revision 1.81
diff -u -r1.81 embed.c
--- embed.c	8 Aug 2003 00:09:17 -0000	1.81
+++ embed.c	11 Aug 2003 01:24:08 -0000
@@ -67,7 +67,7 @@
 struct PackFile *
 Parrot_readbc(struct Parrot_Interp *interpreter, char *filename)
 {
-#if HAS_HEADER_UNISTD
+#if PARROT_HAS_HEADER_UNISTD
     off_t program_size, wanted;
 #else
     size_t program_size, wanted;
@@ -77,11 +77,11 @@
     PMC * io = NULL;
     INTVAL is_mapped = 0;
 
-#ifdef HAS_HEADER_SYSSTAT
+#ifdef PARROT_HAS_HEADER_SYSSTAT
     struct stat file_stat;
 #endif
 
-#ifdef HAS_HEADER_SYSMMAN
+#ifdef PARROT_HAS_HEADER_SYSMMAN
     int fd = -1;
 #endif
 
@@ -93,7 +93,7 @@
     }
     else {
 
-#ifdef HAS_HEADER_SYSSTAT
+#ifdef PARROT_HAS_HEADER_SYSSTAT
         /* if we have stat(), get the actual file size so we can read it
          * in one chunk. */
         if (stat(filename, &file_stat)) {
@@ -114,14 +114,14 @@
 
         program_size = file_stat.st_size;
 
-#else   /* HAS_HEADER_SYSSTAT */
+#else   /* PARROT_HAS_HEADER_SYSSTAT */
 
         /* otherwise, we will read it 1k at a time */
         program_size = 0;
 
-#endif  /* HAS_HEADER_SYSSTAT */
+#endif  /* PARROT_HAS_HEADER_SYSSTAT */
 
-#ifndef HAS_HEADER_SYSMMAN
+#ifndef PARROT_HAS_HEADER_SYSMMAN
         io = PIO_open(interpreter, filename, "<");
         if (!io) {
             PIO_eprintf(interpreter, "Parrot VM: Can't open %s, code %i.\n",
@@ -129,17 +129,17 @@
             return NULL;
         }
 
-#else   /* HAS_HEADER_SYSMMAN */
+#else   /* PARROT_HAS_HEADER_SYSMMAN */
 
         /* the file wasn't from stdin, and we have mmap available- use it */
         io = NULL;
 
-#endif  /* HAS_HEADER_SYSMMAN */
+#endif  /* PARROT_HAS_HEADER_SYSMMAN */
 
         interpreter->current_file = string_make(interpreter, filename,
                 strlen(filename), NULL, 0, NULL);
     }
-#ifdef HAS_HEADER_SYSMMAN
+#ifdef PARROT_HAS_HEADER_SYSMMAN
 again:
 #endif
     /* if we've opened a file (or stdin) with PIO, read it in */
@@ -193,7 +193,7 @@
         /* if we've gotten here, we opted not to use PIO to read the file.
          * use mmap */
 
-#ifdef HAS_HEADER_SYSMMAN
+#ifdef PARROT_HAS_HEADER_SYSMMAN
 
         fd = open(filename, O_RDONLY | O_BINARY);
         if (!fd) {
@@ -221,13 +221,13 @@
         }
         is_mapped = 1;
 
-#else   /* HAS_HEADER_SYSMMAN */
+#else   /* PARROT_HAS_HEADER_SYSMMAN */
 
         PIO_eprintf(interpreter, "Parrot VM: uncaught error occurred reading "
                     "file or mmap not available.\n");
         return NULL;
 
-#endif  /* HAS_HEADER_SYSMMAN */
+#endif  /* PARROT_HAS_HEADER_SYSMMAN */
 
     }
 
@@ -242,7 +242,7 @@
         return NULL;
     }
 
-#ifdef HAS_HEADER_SYSMMAN
+#ifdef PARROT_HAS_HEADER_SYSMMAN
 
     if (fd >= 0) {
         close(fd);   /* the man page states, it's ok to close a mmaped file */
Index: events.c
===================================================================
RCS file: /cvs/public/parrot/events.c,v
retrieving revision 1.4
diff -u -r1.4 events.c
--- events.c	21 Jul 2003 18:00:24 -0000	1.4
+++ events.c	11 Aug 2003 01:24:08 -0000
@@ -12,7 +12,7 @@
 
 #include "parrot/parrot.h"
 
-#ifdef HAS_HEADER_SETJMP
+#ifdef PARROT_HAS_HEADER_SETJMP
 /* XXX s. exceptions.c */
 void do_exception(exception_severity severity, long error);
 void Parrot_init_signals(void);
@@ -23,7 +23,7 @@
 {
     switch (signum) {
         default:
-#ifdef HAS_HEADER_SETJMP
+#ifdef PARROT_HAS_HEADER_SETJMP
             /* quick hack to test signals and exceptions
              */
             do_exception(0, -signum);
Index: exceptions.c
===================================================================
RCS file: /cvs/public/parrot/exceptions.c,v
retrieving revision 1.22
diff -u -r1.22 exceptions.c
--- exceptions.c	1 Aug 2003 10:14:00 -0000	1.22
+++ exceptions.c	11 Aug 2003 01:24:09 -0000
@@ -182,7 +182,7 @@
     return NULL;
 }
 
-#ifdef HAS_HEADER_SETJMP
+#ifdef PARROT_HAS_HEADER_SETJMP
 /* XXX s. interpreter.c */
 Parrot_exception the_exception;
 size_t handle_exception(Parrot_Interp);
Index: interpreter.c
===================================================================
RCS file: /cvs/public/parrot/interpreter.c,v
retrieving revision 1.184
diff -u -r1.184 interpreter.c
--- interpreter.c	8 Aug 2003 00:09:17 -0000	1.184
+++ interpreter.c	11 Aug 2003 01:24:13 -0000
@@ -635,7 +635,7 @@
     }
 }
 
-#ifdef HAS_HEADER_SETJMP
+#ifdef PARROT_HAS_HEADER_SETJMP
 /* XXX s. exception.c */
 extern Parrot_exception the_exception;
 extern size_t handle_exception(Parrot_Interp);
@@ -643,7 +643,7 @@
 void
 runops(struct Parrot_Interp *interpreter, size_t offset)
 {
-#ifdef HAS_HEADER_SETJMP
+#ifdef PARROT_HAS_HEADER_SETJMP
     if (setjmp(the_exception.destination)) {
         /* an exception was thrown */
         offset = handle_exception(interpreter);
Index: packfile.c
===================================================================
RCS file: /cvs/public/parrot/packfile.c,v
retrieving revision 1.92
diff -u -r1.92 packfile.c
--- packfile.c	28 Jul 2003 22:10:29 -0000	1.92
+++ packfile.c	11 Aug 2003 01:24:21 -0000
@@ -375,7 +375,7 @@
         PIO_eprintf(NULL, "PackFile_destroy: pf == NULL!\n");
         return;
     }
-#ifdef HAS_HEADER_SYSMMAN
+#ifdef PARROT_HAS_HEADER_SYSMMAN
     if (pf->is_mmap_ped)
         munmap(pf->src, pf->size);
 #endif
@@ -597,7 +597,7 @@
                 (struct PackFile_Segment *) self->directory, cursor);
     }
     self->byte_code = self->cur_cs->base.data;
-#ifdef HAS_HEADER_SYSMMAN
+#ifdef PARROT_HAS_HEADER_SYSMMAN
     if (self->is_mmap_ped && (
             self->need_endianize || self->need_wordsize)) {
         munmap(self->src, self->size);
Index: config/gen/platform/generic.c
===================================================================
RCS file: /cvs/public/parrot/config/gen/platform/generic.c,v
retrieving revision 1.17
diff -u -r1.17 generic.c
--- config/gen/platform/generic.c	17 Jul 2003 06:53:14 -0000	1.17
+++ config/gen/platform/generic.c	11 Aug 2003 01:24:22 -0000
@@ -7,7 +7,7 @@
 
 #include "parrot/parrot.h"
 
-#ifdef HAS_HEADER_DLFCN
+#ifdef PARROT_HAS_HEADER_DLFCN
 #  include <dlfcn.h>
 #endif
 
@@ -100,7 +100,7 @@
 void *
 Parrot_dlopen(const char *filename)
 {
-#ifdef HAS_HEADER_DLFCN
+#ifdef PARROT_HAS_HEADER_DLFCN
     return dlopen(filename, PARROT_DLOPEN_FLAGS);
 #else
     return 0;
@@ -115,7 +115,7 @@
 const char *
 Parrot_dlerror(void)
 {
-#ifdef HAS_HEADER_DLFCN
+#ifdef PARROT_HAS_HEADER_DLFCN
     return dlerror();
 #else
     return 0;
@@ -130,7 +130,7 @@
 void *
 Parrot_dlsym(void *handle, const char *symbol)
 {
-#ifdef HAS_HEADER_DLFCN
+#ifdef PARROT_HAS_HEADER_DLFCN
     return dlsym(handle, symbol);
 #else
     return 0;
@@ -145,7 +145,7 @@
 int
 Parrot_dlclose(void *handle)
 {
-#ifdef HAS_HEADER_DLFCN
+#ifdef PARROT_HAS_HEADER_DLFCN
     return dlclose(handle);
 #else
     return -1;
@@ -177,7 +177,7 @@
 
 #elif defined(HAS_MEMALIGN)
 
-#if defined(HAS_HEADER_MALLOC)
+#if defined(PARROT_HAS_HEADER_MALLOC)
 #include <malloc.h>
 #else
 #include <stdlib.h>
@@ -207,7 +207,7 @@
 /*
  * signal handling
  */
-#ifdef HAS_HEADER_SIGNAL
+#ifdef PARROT_HAS_HEADER_SIGNAL
 #include <signal.h>
 /*
  * for now use signal based functions
Index: config/gen/platform/generic.h
===================================================================
RCS file: /cvs/public/parrot/config/gen/platform/generic.h,v
retrieving revision 1.8
diff -u -r1.8 generic.h
--- config/gen/platform/generic.h	13 Jul 2003 19:46:46 -0000	1.8
+++ config/gen/platform/generic.h	11 Aug 2003 01:24:22 -0000
@@ -30,13 +30,13 @@
  * signal handling
  */
 
-#if defined(HAS_HEADER_SIGNAL) && defined(HAS_HEADER_SYSTYPES)
+#if defined(PARROT_HAS_HEADER_SIGNAL) && defined(PARROT_HAS_HEADER_SYSTYPES)
 #  include <signal.h>
 #  include <sys/types.h>
 #  define dumpcore() kill(0, SIGQUIT)
 #endif
 
-#ifdef HAS_HEADER_SIGNAL
+#ifdef PARROT_HAS_HEADER_SIGNAL
 #  undef Parrot_set_sighandler
 #  ifdef HAS___SIGHANDLER_T
     typedef __sighandler_t Parrot_sighandler_t;
@@ -47,7 +47,7 @@
     Parrot_sighandler_t Parrot_set_sighandler(int s, Parrot_sighandler_t f);
 #endif
 
-#ifdef HAS_HEADER_PTHREAD
+#ifdef PARROT_HAS_HEADER_PTHREAD
 #  include <pthread.h>
 #  define PARROT_SYNC_PRIMITIVES_DEFINED
 #  define LOCK(x) pthread_mutex_lock(&x)
Index: config/gen/platform/platform_interface.h
===================================================================
RCS file: /cvs/public/parrot/config/gen/platform/platform_interface.h,v
retrieving revision 1.6
diff -u -r1.6 platform_interface.h
--- config/gen/platform/platform_interface.h	20 Jul 2003 08:35:24 -0000	1.6
+++ config/gen/platform/platform_interface.h	11 Aug 2003 01:24:22 -0000
@@ -44,7 +44,7 @@
 /*
  * signal handling
  */
-#ifndef HAS_HEADER_SIGNAL
+#ifndef PARROT_HAS_HEADER_SIGNAL
 #  define Parrot_set_sighandler(s, h)
 #endif
 
Index: include/parrot/io.h
===================================================================
RCS file: /cvs/public/parrot/include/parrot/io.h,v
retrieving revision 1.37
diff -u -r1.37 io.h
--- include/parrot/io.h	9 Aug 2003 07:22:16 -0000	1.37
+++ include/parrot/io.h	11 Aug 2003 01:24:24 -0000
@@ -26,7 +26,7 @@
 #  ifdef _WIN32
 #    define PIO_OS_WIN32
 #  else
-#    ifdef HAS_HEADER_UNISTD
+#    ifdef PARROT_HAS_HEADER_UNISTD
 #      define PIO_OS_UNIX
 #    else
 #      define PIO_OS_STDIO
Index: include/parrot/parrot.h
===================================================================
RCS file: /cvs/public/parrot/include/parrot/parrot.h,v
retrieving revision 1.67
diff -u -r1.67 parrot.h
--- include/parrot/parrot.h	21 Jul 2003 18:00:42 -0000	1.67
+++ include/parrot/parrot.h	11 Aug 2003 01:24:25 -0000
@@ -37,40 +37,40 @@
 
 /* Other headers, where available */
 
-#ifdef HAS_HEADER_UNISTD
+#ifdef PARROT_HAS_HEADER_UNISTD
 #  include <unistd.h>
 #endif
 
-#ifdef HAS_HEADER_SYSMMAN
+#ifdef PARROT_HAS_HEADER_SYSMMAN
 #  include <sys/mman.h>
 #endif
 
-#ifdef HAS_HEADER_SYSTIME
+#ifdef PARROT_HAS_HEADER_SYSTIME
 #  include <sys/time.h>
 #endif
 
-#ifdef HAS_HEADER_MATH
+#ifdef PARROT_HAS_HEADER_MATH
 #  include <math.h>
 #endif
 
-#ifdef HAS_HEADER_FCNTL
+#ifdef PARROT_HAS_HEADER_FCNTL
 #  include <fcntl.h>
 #endif
 
-#ifdef HAS_HEADER_SYSTYPES
+#ifdef PARROT_HAS_HEADER_SYSTYPES
 #  include <sys/types.h>
 #endif
 
-#ifdef HAS_HEADER_SYSSTAT
+#ifdef PARROT_HAS_HEADER_SYSSTAT
 #  include <sys/stat.h>
 #endif
 
-#ifdef HAS_HEADER_SETJMP
+#ifdef PARROT_HAS_HEADER_SETJMP
 #  include <setjmp.h>
 typedef jmp_buf Parrot_jump_buff;
 #endif
 
-#ifdef HAS_HEADER_PTHREAD
+#ifdef PARROT_HAS_HEADER_PTHREAD
 #  include <pthread.h>
 #endif
 
Index: io/io_unix.c
===================================================================
RCS file: /cvs/public/parrot/io/io_unix.c,v
retrieving revision 1.28
diff -u -r1.28 io_unix.c
--- io/io_unix.c	9 Aug 2003 07:22:22 -0000	1.28
+++ io/io_unix.c	11 Aug 2003 01:24:27 -0000
@@ -203,7 +203,7 @@
 {
     ParrotIO *io;
     INTVAL oflags, mode;
-#  ifdef HAS_HEADER_FCNTL
+#  ifdef PARROT_HAS_HEADER_FCNTL
     INTVAL rflags;
 #  endif
     mode = 0;
@@ -212,7 +212,7 @@
     UNUSED(oflags)
 
         /* FIXME - Check file handle flags, validity */
-#  ifdef HAS_HEADER_FCNTL
+#  ifdef PARROT_HAS_HEADER_FCNTL
         /* Get descriptor flags */
         if ((rflags = fcntl(fd, F_GETFL, 0)) >= 0) {
             UNUSED(rflags);