Index: eval.h
--- eval.h.orig	2004-10-29 16:48:41 +0200
+++ eval.h	2007-03-02 10:29:23 +0100
@@ -33,7 +33,7 @@
 #ifndef _EVAL_H_
 #define _EVAL_H_
 
-#include <regex.h>
+#include "pcreposix.h"
 
 enum { VAL_UNDEF=0, VAL_TRUE, VAL_FALSE };
 enum { COND_CONNECT, COND_HELO, COND_ENVFROM, COND_ENVRCPT,
Index: milter-regex.c
--- milter-regex.c.orig	2005-03-06 12:42:53 +0100
+++ milter-regex.c	2007-03-02 10:29:34 +0100
@@ -49,7 +49,7 @@
 #ifdef __linux__
 #include <grp.h>
 #endif
-#include <libmilter/mfapi.h>
+#include "milter/mfapi.h"
 
 #include "eval.h"
 
Index: parse.y
--- parse.y.orig	2004-10-29 16:48:42 +0200
+++ parse.y	2007-03-02 10:29:47 +0100
@@ -39,12 +39,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libmilter/mfapi.h>
+#include "milter/mfapi.h"
 
 #include "eval.h"
 
 int			 yyerror(char *, ...);
-static int		 yyparse(void);
 static int		 define_macro(const char *, struct expr *);
 static struct expr	*find_macro(const char *);