--- src.orig/plugins/compilergcc/depslib/src/headers.c	2005-04-12 16:08:20.000000000 -0500
+++ src.orig/plugins/compilergcc/depslib/src/headers.c	2005-06-20 17:30:04.000000000 -0500
@@ -40,12 +40,12 @@ 
 	    printf("header scan %s\n", file);
 
 	if (!hdrre)
-		hdrre = regcomp("^[ 	]*#[ 	]*include[ 	]*([<\"])([^\">]*)([\">]).*$");
+		hdrre = my_regcomp("^[ 	]*#[ 	]*include[ 	]*([<\"])([^\">]*)([\">]).*$");
 	re = hdrre;
 
 	while (fgets(buf, sizeof(buf), f))
 	{
-		if (regexec(re, buf) && re->startp[3])
+		if (my_regexec(re, buf) && re->startp[3])
 		{
 			char buf2[MAXSYM];
 
@@ -147,7 +147,7 @@ 
 
 void donehdrs(void)
 {
-	redone(hdrre);
+	my_redone(hdrre);
 	hdrre = 0;
 	hashdone(headerhash);
 	headerhash = 0;
--- src.orig/plugins/compilergcc/depslib/src/regexp.c	2005-04-12 16:08:20.000000000 -0500
+++ src.orig/plugins/compilergcc/depslib/src/regexp.c	2005-06-20 17:29:43.000000000 -0500
@@ -156,7 +156,7 @@ 
 #define	UCHARAT(p)	((int)*(p)&CHARBITS)
 #endif
 
-#define	FAIL(m)	{ regerror(m); return(NULL); }
+#define	FAIL(m)	{ my_regerror(m); return(NULL); }
 #define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
 
 /*
@@ -212,7 +212,7 @@ 
  * of the structure of the compiled regexp.
  */
 regexp *
-regcomp( const char *exp )
+my_regcomp( const char *exp )
 {
 	register regexp *r;
 	register char *scan;
@@ -791,7 +791,7 @@ 
  - regexec - match a regexp against a string
  */
 int
-regexec(
+my_regexec(
 	register regexp *prog,
 	register const char *string )
 {
@@ -799,13 +799,13 @@ 
 
 	/* Be paranoid... */
 	if (prog == NULL || string == NULL) {
-		regerror("NULL parameter");
+		my_regerror("NULL parameter");
 		return(0);
 	}
 
 	/* Check validity of program. */
 	if (UCHARAT(prog->program) != MAGIC) {
-		regerror("corrupted program");
+		my_regerror("corrupted program");
 		return(0);
 	}
 
@@ -1070,7 +1070,7 @@ 
 			return(1);	/* Success! */
 			break;
 		default:
-			regerror("memory corruption");
+			my_regerror("memory corruption");
 			return(0);
 			break;
 		}
@@ -1082,7 +1082,7 @@ 
 	 * We get here only if there's trouble -- normally "case END" is
 	 * the terminating point.
 	 */
-	regerror("corrupted pointers");
+	my_regerror("corrupted pointers");
 	return(0);
 }
 
@@ -1122,7 +1122,7 @@ 
 		}
 		break;
 	default:		/* Oh dear.  Called inappropriately. */
-		regerror("internal foulup");
+		my_regerror("internal foulup");
 		count = 0;	/* Best compromise. */
 		break;
 	}
@@ -1277,7 +1277,7 @@ 
 		p = "WORDZ";
 		break;
 	default:
-		regerror("corrupted opcode");
+		my_regerror("corrupted opcode");
 		break;
 	}
 	if (p != NULL)
@@ -1319,14 +1319,14 @@ 
 #endif
 
 void
-regerror( const char *s )
+my_regerror( const char *s )
 {
 	printf( "re error %s\n", s );
 }
 
 /* TNB */
 void
-redone(regexp *re)
+my_redone(regexp *re)
 {
 	if (re)
 		free((char *) re);
--- src.orig/plugins/compilergcc/depslib/src/regexp.h	2005-04-12 16:08:20.000000000 -0500
+++ src.orig/plugins/compilergcc/depslib/src/regexp.h	2005-06-20 17:29:36.000000000 -0500
@@ -18,10 +18,10 @@ 
 	char program[1];	/* Unwarranted chumminess with compiler. */
 } regexp;
 
-regexp *regcomp( const char *exp );
-int regexec( regexp *prog, const char *string );
-void regerror( const char *s );
-void redone( regexp *prog ); /* TNB */
+regexp *my_regcomp( const char *exp );
+int my_regexec( regexp *prog, const char *string );
+void my_regerror( const char *s );
+void my_redone( regexp *prog ); /* TNB */
 
 /*
  * The first byte of the regexp internal "program" is actually this magic