diff -ru wso2-wsf-php-src-1.2.1_orig/src/config.m4 wso2-wsf-php-src-1.2.1/src/config.m4
--- wso2-wsf-php-src-1.2.1_orig/src/config.m4	Wed Mar 12 06:41:52 2008
+++ wso2-wsf-php-src-1.2.1/src/config.m4	Sun Apr 27 01:34:41 2008
@@ -15,7 +15,7 @@
 	PHP_ADD_INCLUDE(../wsf_c/axis2c/neethi/include/)
 	PHP_ADD_INCLUDE(../wsf_c/rampartc/include/)
     PHP_ADD_INCLUDE(../wsf_c/axis2c/neethi/src/util/)
-	PHP_ADD_INCLUDE(/usr/include/libxml2)
+	PHP_SETUP_LIBXML(WSF_SHARED_LIBADD)
   	dnl # check for lib and symbol presence
 
   	PHP_ADD_LIBRARY_WITH_PATH(axis2_parser, ../wsf_c/axis2c/axiom/src/parser/libxml2/.libs, WSF_SHARED_LIBADD)
diff -ru wso2-wsf-php-src-1.2.1_orig/wsf_c/axis2c/util/include/platforms/unix/axutil_date_time_util_unix.h wso2-wsf-php-src-1.2.1/wsf_c/axis2c/util/include/platforms/unix/axutil_date_time_util_unix.h
--- wso2-wsf-php-src-1.2.1_orig/wsf_c/axis2c/util/include/platforms/unix/axutil_date_time_util_unix.h	Wed Mar 12 04:53:26 2008
+++ wso2-wsf-php-src-1.2.1/wsf_c/axis2c/util/include/platforms/unix/axutil_date_time_util_unix.h	Sun Apr 27 01:34:41 2008
@@ -21,6 +21,7 @@
 #include <axutil_utils.h>
 #include <axutil_utils_defines.h>
 #include <stdio.h>
+#include <sys/types.h>
 #include <sys/timeb.h>
 #include <time.h>
 
diff -ru wso2-wsf-php-src-1.2.1_orig/wsf_c/axis2c/util/src/platforms/unix/uuid_gen_unix.c wso2-wsf-php-src-1.2.1/wsf_c/axis2c/util/src/platforms/unix/uuid_gen_unix.c
--- wso2-wsf-php-src-1.2.1_orig/wsf_c/axis2c/util/src/platforms/unix/uuid_gen_unix.c	Wed Mar 12 04:53:34 2008
+++ wso2-wsf-php-src-1.2.1/wsf_c/axis2c/util/src/platforms/unix/uuid_gen_unix.c	Sun Apr 27 01:34:41 2008
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <sys/param.h>
 
 #ifdef HAVE_LINUX_IF_H
 # include <linux/if.h>
@@ -44,7 +45,7 @@
 #  include <net/if_dl.h>
 # endif
 #endif
-#ifdef IS_MACOSX
+#ifdef BSD
 #include <ifaddrs.h>
 #endif
 #include <platforms/unix/axutil_uuid_gen_unix.h>
@@ -267,7 +268,7 @@
 
 #else
 
-#ifdef IS_MACOSX                /* Darwin */
+#ifdef BSD
 
 #ifndef max
 # define        max(a,b)        ((a) > (b) ? (a) : (b))