diff -up php-5.3.6RC1/configure.in.gnusrc php-5.3.6RC1/configure.in
--- php-5.3.6RC1/configure.in.gnusrc	2011-02-16 21:20:33.000000000 +0100
+++ php-5.3.6RC1/configure.in	2011-02-17 16:25:13.602809269 +0100
@@ -58,6 +58,8 @@ AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
 AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
 AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
 
+AC_DEFINE([_GNU_SOURCE], 1, [Define to enable GNU C Library extensions])
+
 dnl Setting up the PHP version based on the information above.
 dnl -------------------------------------------------------------------------
 
diff -up php-5.3.6RC1/ext/interbase/interbase.c.gnusrc php-5.3.6RC1/ext/interbase/interbase.c
--- php-5.3.6RC1/ext/interbase/interbase.c.gnusrc	2011-01-01 03:19:59.000000000 +0100
+++ php-5.3.6RC1/ext/interbase/interbase.c	2011-02-17 16:25:13.603809213 +0100
@@ -24,7 +24,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 
diff -up php-5.3.6RC1/ext/pdo_firebird/firebird_driver.c.gnusrc php-5.3.6RC1/ext/pdo_firebird/firebird_driver.c
--- php-5.3.6RC1/ext/pdo_firebird/firebird_driver.c.gnusrc	2011-01-01 03:19:59.000000000 +0100
+++ php-5.3.6RC1/ext/pdo_firebird/firebird_driver.c	2011-02-17 16:25:13.604809156 +0100
@@ -22,7 +22,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
 
 #include "php.h"
 #ifdef ZEND_ENGINE_2
diff -up php-5.3.6RC1/ext/standard/file.c.gnusrc php-5.3.6RC1/ext/standard/file.c
--- php-5.3.6RC1/ext/standard/file.c.gnusrc	2011-01-01 03:19:59.000000000 +0100
+++ php-5.3.6RC1/ext/standard/file.c	2011-02-17 16:25:13.605809100 +0100
@@ -113,9 +113,6 @@ php_file_globals file_globals;
 #endif
 
 #if defined(HAVE_FNMATCH) && !defined(PHP_WIN32)
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
-# endif
 # include <fnmatch.h>
 #endif
 
diff -up php-5.3.6RC1/ext/zlib/zlib_fopen_wrapper.c.gnusrc php-5.3.6RC1/ext/zlib/zlib_fopen_wrapper.c
--- php-5.3.6RC1/ext/zlib/zlib_fopen_wrapper.c.gnusrc	2011-01-01 03:19:59.000000000 +0100
+++ php-5.3.6RC1/ext/zlib/zlib_fopen_wrapper.c	2011-02-17 16:26:19.531428121 +0100
@@ -19,8 +19,6 @@
 
 /* $Id: zlib_fopen_wrapper.c 306939 2011-01-01 02:19:59Z felipe $ */
 
-#define _GNU_SOURCE
-
 #include "php.h"
 #include "php_zlib.h"
 #include "fopen_wrappers.h"
diff -up php-5.3.6RC1/main/php.h.gnusrc php-5.3.6RC1/main/php.h
--- php-5.3.6RC1/main/php.h.gnusrc	2011-01-01 03:19:59.000000000 +0100
+++ php-5.3.6RC1/main/php.h	2011-02-17 16:25:13.606809044 +0100
@@ -30,6 +30,7 @@
 #define PHP_HAVE_STREAMS
 #define YYDEBUG 0
 
+#include "php_config.h"
 #include "php_version.h"
 #include "zend.h"
 #include "zend_qsort.h"
diff -up php-5.3.6RC1/main/streams/cast.c.gnusrc php-5.3.6RC1/main/streams/cast.c
--- php-5.3.6RC1/main/streams/cast.c.gnusrc	2011-01-20 07:32:59.000000000 +0100
+++ php-5.3.6RC1/main/streams/cast.c	2011-02-17 16:26:47.495972650 +0100
@@ -18,7 +18,6 @@
 
 /* $Id: cast.c 307611 2011-01-20 06:32:59Z pajoye $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
diff -up php-5.3.6RC1/main/streams/memory.c.gnusrc php-5.3.6RC1/main/streams/memory.c
--- php-5.3.6RC1/main/streams/memory.c.gnusrc	2011-01-01 03:19:59.000000000 +0100
+++ php-5.3.6RC1/main/streams/memory.c	2011-02-17 16:25:56.276628691 +0100
@@ -18,7 +18,6 @@
 
 /* $Id: memory.c 306939 2011-01-01 02:19:59Z felipe $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 
 PHPAPI int php_url_decode(char *str, int len);
diff -up php-5.3.6RC1/main/streams/streams.c.gnusrc php-5.3.6RC1/main/streams/streams.c
--- php-5.3.6RC1/main/streams/streams.c.gnusrc	2011-02-01 19:10:35.000000000 +0100
+++ php-5.3.6RC1/main/streams/streams.c	2011-02-17 16:27:06.428980279 +0100
@@ -21,7 +21,6 @@
 
 /* $Id: streams.c 307922 2011-02-01 18:10:35Z cataphract $ */
 
-#define _GNU_SOURCE
 #include "php.h"
 #include "php_globals.h"
 #include "php_network.h"
diff -up php-5.3.6RC1/Zend/zend_language_parser.c.gnusrc php-5.3.6RC1/Zend/zend_language_parser.c
--- php-5.3.6RC1/Zend/zend_language_parser.c.gnusrc	2011-02-16 21:30:44.000000000 +0100
+++ php-5.3.6RC1/Zend/zend_language_parser.c	2011-02-17 16:25:13.608808931 +0100
@@ -366,6 +366,8 @@
 #include "zend_API.h"
 #include "zend_constants.h"
 
+#include <string.h>
+
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode