diff --git a/configure.in b/configure.in
index c38da2e965a..405d5c3ab89 100644
--- a/configure.in
+++ b/configure.in
@@ -423,10 +423,11 @@ sys/time.h \
 netinet/in.h \
 alloca.h \
 arpa/inet.h \
-arpa/nameser.h \
 arpa/nameser_compat.h \
+arpa/nameser.h \
 assert.h \
 crypt.h \
+dns.h \
 fcntl.h \
 grp.h \
 ieeefp.h \
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 7ae1d508a14..6efff98eef3 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -32,7 +32,7 @@
 #include "ext/standard/info.h"
 #include "ext/session/php_session.h"
 #include "zend_operators.h"
-#include "ext/standard/dns.h"
+#include "ext/standard/php_dns.h"
 #include "ext/standard/php_uuencode.h"
 
 #ifdef PHP_WIN32
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 0e0244c001e..8b793c619b4 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -247,7 +247,7 @@ fi
 
 dnl
 dnl Detect library functions needed by php dns_xxx functions
-dnl ext/standard/dns.h will collect these in a single define: HAVE_DNS_FUNCS
+dnl ext/standard/php_dns.h will collect these in a single define: HAVE_DNS_FUNCS
 dnl
 PHP_CHECK_FUNC(res_nmkquery, resolv, bind, socket)
 PHP_CHECK_FUNC(res_nsend, resolv, bind, socket)
@@ -257,7 +257,7 @@ PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket)
 
 dnl
 dnl These are old deprecated functions, a single define of HAVE_DEPRECATED_DNS_FUNCS
-dnl will be set in ext/standard/dns.h
+dnl will be set in ext/standard/php_dns.h
 dnl
 
 PHP_CHECK_FUNC(res_mkquery, resolv, bind, socket)
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index 813cd60e2cc..a634ed232d0 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -56,7 +56,7 @@
 #define AF_INET 2   /* internetwork: UDP, TCP, etc. */
 #endif
 
-#include "dns.h"
+#include "php_dns.h"
 
 /* type compat */
 #ifndef DNS_T_A
diff --git a/ext/standard/dns_win32.c b/ext/standard/dns_win32.c
index 6ab94ea4bb4..edd763978ce 100644
--- a/ext/standard/dns_win32.c
+++ b/ext/standard/dns_win32.c
@@ -22,7 +22,7 @@
 #include <Winbase.h >
 #include <Windns.h>
 
-#include "dns.h"
+#include "php_dns.h"
 
 #define PHP_DNS_NUM_TYPES	12	/* Number of DNS Types Supported by PHP currently */
 
diff --git a/ext/standard/dns.h b/ext/standard/php_dns.h
similarity index 97%
rename from ext/standard/dns.h
rename to ext/standard/php_dns.h
index b69493bf69d..c7ea65f6d51 100644
--- a/ext/standard/dns.h
+++ b/ext/standard/php_dns.h
@@ -20,8 +20,8 @@
 
 /* $Id$ */
 
-#ifndef DNS_H
-#define DNS_H
+#ifndef PHP_DNS_H
+#define PHP_DNS_H
 
 #if HAVE_RES_MKQUERY && !defined(HAVE_RES_NMKQUERY) && HAVE_RES_SEND && !defined(HAVE_RES_NSEND)
 #define HAVE_DEPRECATED_DNS_FUNCS 1
@@ -68,4 +68,4 @@ PHP_MINIT_FUNCTION(dns);
 #define INT32SZ		4
 #endif
 
-#endif /* DNS_H */
+#endif /* PHP_DNS_H */
diff --git a/ext/standard/php_standard.h b/ext/standard/php_standard.h
index 3ce094e1556..50ac058856c 100644
--- a/ext/standard/php_standard.h
+++ b/ext/standard/php_standard.h
@@ -23,7 +23,7 @@
 #include "php_string.h"
 #include "base64.h"
 #include "php_dir.h"
-#include "dns.h"
+#include "php_dns.h"
 #include "php_mail.h"
 #include "md5.h"
 #include "sha1.h"
diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index da3ca27bd35..b2bb7653af0 100644
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Jul 27 02:20:36 2009 */
+/* Generated by re2c 0.13.5 on Wed Aug  5 23:53:08 2009 */
 #line 1 "ext/standard/url_scanner_ex.re"
 /*
   +----------------------------------------------------------------------+