diff --git a/ext/bcmath/Makefile.am b/ext/bcmath/Makefile.am
index e529f579aef..e73bafce78e 100644
--- a/ext/bcmath/Makefile.am
+++ b/ext/bcmath/Makefile.am
@@ -1,4 +1,5 @@
 # $Id$
 
+INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LTLIBRARIES=libphpext_bcmath.la
 libphpext_bcmath_la_SOURCES=bcmath.c number.c
diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index e39f6024456..d4a7032376a 100644
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -21,7 +21,7 @@
 #if WITH_BCMATH
 
 #include "number.h"
-#include "php_bcmath.h"
+#include "php3_bcmath.h"
 
 function_entry bcmath_functions[] = {
 	PHP_FE(bcadd,									NULL)
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 76195c46050..931eb9df115 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -906,7 +906,7 @@ void _xml_unparsedEntityDeclHandler(void *userData,
 	xml_parser *parser = (xml_parser *)userData;
 
 	if (parser && parser->unparsedEntityDeclHandler) {
-		zval *retval, *args[5];
+		zval *retval, *args[6];
 
 		args[0] = _xml_resource_zval(parser->index);
 		args[1] = _xml_xmlchar_zval(entityName, 0, parser->target_encoding);