Index: configure
--- configure.orig	2008-08-15 20:03:41 +0200
+++ configure	2008-09-02 21:33:25 +0200
@@ -5664,7 +5664,7 @@
 old_as_test_x="$as_test_x"
 as_test_x='test -e'
 # Extract the first word of "libmilter/mfapi.h", so it can be a program name with args.
-set dummy libmilter/mfapi.h; ac_word=$2
+set dummy milter/mfapi.h; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_path_MINCLUDE+set}" = set; then
Index: embperl.c
--- embperl.c.orig	2008-08-15 20:03:41 +0200
+++ embperl.c	2008-09-02 21:31:05 +0200
@@ -29,6 +29,9 @@
     char *argv[6];
     int argc;
 
+#ifdef SAFE_EMBED_PERL
+	PL_perl_destruct_level = 1;
+#endif
     if (my_perl != NULL) {
 #ifdef SAFE_EMBED_PERL
 	PL_perl_destruct_level = 1;
@@ -80,7 +83,6 @@
 #ifdef PERL_SET_CONTEXT
     PERL_SET_CONTEXT(my_perl);
 #endif
-    PL_perl_destruct_level = 1;
     perl_construct(my_perl);
     perl_parse(my_perl, xs_init, argc, argv, NULL);
     perl_run(my_perl);
Index: milter_cap.c
--- milter_cap.c.orig	2008-08-15 20:03:33 +0200
+++ milter_cap.c	2008-09-02 21:31:05 +0200
@@ -12,7 +12,7 @@
 *
 ***********************************************************************/
 #include <stdio.h>
-#include "libmilter/mfapi.h"
+#include "milter/mfapi.h"
 #include "milter_cap.h"
 
 /**********************************************************************
Index: mimedefang.c
--- mimedefang.c.orig	2008-03-07 21:59:28 +0100
+++ mimedefang.c	2008-09-02 21:31:05 +0200
@@ -65,7 +65,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#include "libmilter/mfapi.h"
+#include "milter/mfapi.h"
 #include "milter_cap.h"
 
 #include <sys/socket.h>