diff -ru php-4.3.0/ext/standard/head.h php-4.3.0.orig/ext/standard/head.h
--- php-4.3.0/ext/standard/head.h	2003-03-01 20:03:07.000000000 +0100
+++ php-4.3.0.orig/ext/standard/head.h	2002-02-28 09:26:45.000000000 +0100
@@ -21,8 +21,6 @@
 #ifndef HEAD_H
 #define HEAD_H
 
-BEGIN_EXTERN_C()
-
 extern PHP_RINIT_FUNCTION(head);
 PHP_FUNCTION(header);
 PHP_FUNCTION(setcookie);
@@ -31,6 +29,4 @@
 PHPAPI int php_header(void);
 PHPAPI int php_setcookie(char *name, int name_len, char *value, int value_len, time_t expires, char *path, int path_len, char *domain, int domain_len, int secure TSRMLS_DC);
 
-END_EXTERN_C()
-
 #endif
diff -ru php-4.3.0/ext/standard/info.h php-4.3.0.orig/ext/standard/info.h
--- php-4.3.0/ext/standard/info.h	2003-02-17 18:46:40.000000000 +0100
+++ php-4.3.0.orig/ext/standard/info.h	2002-10-06 19:04:10.000000000 +0200
@@ -22,8 +22,6 @@
 #ifndef INFO_H
 #define INFO_H
 
-BEGIN_EXTERN_C()
-
 #define PHP_ENTRY_NAME_COLOR "#ccccff"
 #define PHP_CONTENTS_COLOR "#cccccc"
 #define PHP_HEADER_COLOR "#9999cc"
@@ -82,6 +80,4 @@
 
 void register_phpinfo_constants(INIT_FUNC_ARGS);
 
-END_EXTERN_C()
-
 #endif /* INFO_H */
diff -ru php-4.3.0/ext/standard/php_string.h php-4.3.0.orig/ext/standard/php_string.h
--- php-4.3.0/ext/standard/php_string.h	2003-02-17 14:56:47.000000000 +0100
+++ php-4.3.0.orig/ext/standard/php_string.h	2002-10-18 00:44:44.000000000 +0200
@@ -139,7 +139,7 @@
 	end -= needle_len;
 
 	while (p <= end) {
-		if ((p = (char*) memchr(p, *needle, (end-p+1))) && ne == p[needle_len-1]) {
+		if ((p = memchr(p, *needle, (end-p+1))) && ne == p[needle_len-1]) {
 			if (!memcmp(needle, p, needle_len-1)) {
 				return p;
 			}
diff -ru php-4.3.0/main/php_main.h php-4.3.0.orig/main/php_main.h
--- php-4.3.0/main/php_main.h	2003-02-17 18:40:32.000000000 +0100
+++ php-4.3.0.orig/main/php_main.h	2002-09-18 23:57:29.000000000 +0200
@@ -28,8 +28,6 @@
 #include "php_globals.h"
 #include "SAPI.h"
 
-BEGIN_EXTERN_C()
-
 PHPAPI int php_request_startup(TSRMLS_D);
 PHPAPI void php_request_shutdown(void *dummy);
 PHPAPI void php_request_shutdown_for_exec(void *dummy);
@@ -55,6 +53,4 @@
 extern int php_init_environ(void);
 extern int php_shutdown_environ(void);
 
-END_EXTERN_C()
-
 #endif
diff -ru php-4.3.0/main/php_variables.h php-4.3.0.orig/main/php_variables.h
--- php-4.3.0/main/php_variables.h	2003-02-18 20:46:24.000000000 +0100
+++ php-4.3.0.orig/main/php_variables.h	2002-10-13 10:38:09.000000000 +0200
@@ -30,8 +30,6 @@
 #define PARSE_COOKIE 2
 #define PARSE_STRING 3
 
-BEGIN_EXTERN_C()
-
 void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC);
 extern PHPAPI void (*php_import_environment_variables)(zval *array_ptr TSRMLS_DC);
 PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array TSRMLS_DC);
@@ -39,6 +37,5 @@
 PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, pval *track_vars_array TSRMLS_DC);
 PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array TSRMLS_DC);
 
-END_EXTERN_C()
 
 #endif /* PHP_VARIABLES_H */
diff -ru php-4.3.0/main/SAPI.h php-4.3.0.orig/main/SAPI.h
--- php-4.3.0/main/SAPI.h	2003-02-17 18:43:40.000000000 +0100
+++ php-4.3.0.orig/main/SAPI.h	2002-11-12 21:56:47.000000000 +0100
@@ -39,8 +39,6 @@
 #define SAPI_API
 #endif
 
-BEGIN_EXTERN_C()
-
 
 typedef struct {
 	char *header;
@@ -257,8 +255,6 @@
 
 #define STANDARD_SAPI_MODULE_PROPERTIES NULL, NULL, 0
 
-END_EXTERN_C()
-
 #endif /* SAPI_H */
 
 /*