Index: CGI-Application-Plugin-DBH-4.01/Build.PL
--- CGI-Application-Plugin-DBH-4.01/Build.PL.orig	2013-01-19 04:44:56.000000000 +0100
+++ CGI-Application-Plugin-DBH-4.01/Build.PL	2015-06-04 20:40:04.241560114 +0200
@@ -6,8 +6,7 @@
     requires => {
         'parent'           => 0,
         'CGI::Application' => 0,
-        'DBI'              => 0,
-        'Test::MockObject' => 1.20120301,
+        'DBI'              => 0
     },
     configure_requires => { 'Module::Build' => 0.40 },
     create_makefile_pl => 'traditional',
Index: CGI-Application-Plugin-DBH-4.01/Makefile.PL
--- CGI-Application-Plugin-DBH-4.01/Makefile.PL.orig	2013-01-19 04:44:56.000000000 +0100
+++ CGI-Application-Plugin-DBH-4.01/Makefile.PL	2015-06-04 20:40:04.241560114 +0200
@@ -8,7 +8,6 @@
   'EXE_FILES' => [],
   'VERSION_FROM' => 'lib/CGI/Application/Plugin/DBH.pm',
   'PREREQ_PM' => {
-                   'Test::MockObject' => '1.20120301',
                    'CGI::Application' => 0,
                    'parent' => 0,
                    'DBI' => 0
Index: CGI-GuruMeditation-1.10/GuruMeditation.pm
--- CGI-GuruMeditation-1.10/GuruMeditation.pm.orig	2006-09-20 14:58:22.000000000 +0200
+++ CGI-GuruMeditation-1.10/GuruMeditation.pm	2015-06-04 20:40:04.241560114 +0200
@@ -369,14 +369,13 @@
             }
             if (not $r->bytes_sent) {
                 $r->status(500);
-                $r->header_out("Expires", "0");
+                $r->headers_out->add("Expires" => "0");
                 $r->no_cache(1);
                 $r->content_type("text/html; charset=ISO-8859-1");
-                $r->send_http_header();
             }
             $r->print($html);
             if ($mod_perl >= 2) {
-                ModPerl::Util::exit(0);
+                # return Apache2::Const::OK;
             }
             else {
                 $r->exit();
Index: Embperl-2.3.0/Makefile.PL
--- Embperl-2.3.0/Makefile.PL.orig	2007-09-29 13:05:56.000000000 +0200
+++ Embperl-2.3.0/Makefile.PL	2015-06-04 20:40:04.241560114 +0200
@@ -625,7 +625,7 @@
 $base = $ENV{'ProgramFiles'} if ($win32) ;
 
 
-$apache = GetYesNo ("Build with support for Apache mod_perl?", 'y') if (!$apache) ;
+$apache = 0;
 
 if ($apache && $apache_src ne '')
     {
@@ -1334,7 +1334,7 @@
     'LIBS'	   => [$libs || ''],   			 
     'DEFINE'	   => "$d \$(DEFS)", 			 
     'INC'	   => $i,     			 
-    'EXE_FILES'    => [ 'embpexec.pl', 'embpmsgid.pl' ],
+    'EXE_FILES'    => [ 'embpexec.pl', 'embpmsgid.pl', 'embpcgi.pl' ],
     'clean'        => { FILES => 'dirent.h test/conf/httpd.conf test/conf/httpd.stop.conf test/conf/httpd.min.conf test/tmp/* Embperl.c $(OBJECT)' },
     'realclean'    => { FILES => 'embpmsgid.pl embpexec.pl embpexec.bat embpcgi.pl embpcgi.test.pl embpcgi.bat epocgi.pl epocgi.bat epocgi.test.pl embpfastcgi.pl embpfastcgi.test.pl test/conf/config.pl xs/mmargs.pl' },
     'dist'         => { COMPRESS => 'gzip', SUFFIX => 'gz'},
Index: Embperl-2.3.0/driver/epxalan.MAKEPL
--- Embperl-2.3.0/driver/epxalan.MAKEPL.orig	2005-10-26 00:16:36.000000000 +0200
+++ Embperl-2.3.0/driver/epxalan.MAKEPL	2015-06-04 20:40:04.241560114 +0200
@@ -8,7 +8,7 @@
 
 if (!$win32)
     {
-    $path = $ENV{XALANPATH} || GetString ("Enter path of XALAN base directory or single dot for not using XALAN", $XALANPATH || '.') ;
+    $path = ".";
 
     if (!$path || $path eq '.')
         {
Index: Embperl-2.3.0/epnames.h
--- Embperl-2.3.0/epnames.h.orig	2006-04-08 14:28:15.000000000 +0200
+++ Embperl-2.3.0/epnames.h	2015-06-04 20:40:56.281090278 +0200
@@ -325,7 +325,7 @@
 #define sv_count PL_sv_count
 #endif
 #ifndef sv_objcount
-#define sv_objcount PL_sv_objcount
+#define sv_objcount 0
 #endif
 #ifndef op_mask
 #define op_mask PL_op_mask