30 files changed, 42 insertions, 42 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 2d5cce10b6..afd9b3497f 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -21,7 +21,7 @@
 #include "php.h"
 #include "php_ini.h"
 #include "internal_functions_registry.h"
-#include "php3_standard.h"
+#include "php_standard.h"
 #include "zend_operators.h"
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 34c8630c4a..55dc0f049e 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -17,7 +17,7 @@
  */
 
 #include "php.h"
-#include "php3_browscap.h"
+#include "php_browscap.h"
 #include "php_ini.h"
 
 #include "zend_globals.h"
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index 35f3e81466..48619c5a67 100644
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -46,7 +46,7 @@
 extern char *crypt(char *__key,char *__salt);
 #endif
 
-#include "php3_crypt.h"
+#include "php_crypt.h"
 
 function_entry crypt_functions[] = {
 	PHP_FE(crypt,									NULL)
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 1a1b6d1bdc..3717f0899b 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -24,7 +24,7 @@
 #include "php.h"
 #include "fopen-wrappers.h"
 
-#include "php3_dir.h"
+#include "php_dir.h"
 
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index 943d436af5..b190ea8b98 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include "php.h"
 #include <ctype.h>
-#include "php3_string.h"
+#include "php_string.h"
 #include "safe_mode.h"
 #include "ext/standard/head.h"
 #include "exec.h"
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 506ef1ecd5..60e6eb68fe 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -45,7 +45,7 @@
 #endif
 #include "ext/standard/head.h"
 #include "safe_mode.h"
-#include "php3_string.h"
+#include "php_string.h"
 #include "file.h"
 #if HAVE_PWD_H
 #if MSVC5
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index 61685741a2..8a40fed719 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -69,7 +69,7 @@
 # endif
 #endif
 
-#include "php3_filestat.h"
+#include "php_filestat.h"
 
 #ifndef THREAD_SAFE
 static char *CurrentStatFile=NULL;
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index a3b6b71ba3..ffd53e3aca 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -21,7 +21,7 @@
 #include <math.h>				/* modf() */
 #include "php.h"
 #include "ext/standard/head.h"
-#include "php3_string.h"
+#include "php_string.h"
 #include "zend_execute.h"
 #include <stdio.h>
 
diff --git a/ext/standard/head.c b/ext/standard/head.c
index 4e18f36392..523e3ff9ac 100644
--- a/ext/standard/head.c
+++ b/ext/standard/head.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include "php.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "SAPI.h"
 #include "main.h"
 #include "head.h"
diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c
index c5718207bb..a15ac04020 100644
--- a/ext/standard/iptc.c
+++ b/ext/standard/iptc.c
@@ -33,7 +33,7 @@
  */
  
 #include "php.h"
-#include "php3_iptc.h"
+#include "php_iptc.h"
 #include "ext/standard/head.h"
 
 #include <sys/stat.h>
diff --git a/ext/standard/link.c b/ext/standard/link.c
index 9ccf0ecdda..f296a2dbcb 100644
--- a/ext/standard/link.c
+++ b/ext/standard/link.c
@@ -19,7 +19,7 @@
 /* $Id$ */
 
 #include "php.h"
-#include "php3_filestat.h"
+#include "php_filestat.h"
 #include "php_globals.h"
 
 #include <stdlib.h>
@@ -46,7 +46,7 @@
 #include <ctype.h>
 
 #include "safe_mode.h"
-#include "php3_link.h"
+#include "php_link.h"
 
 /* {{{ proto string readlink(string filename)
    Return the target of a symbolic link */
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index 202a898ec5..db4988a659 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -25,7 +25,7 @@
 #ifndef MSVC5
 #include "build-defs.h"
 #endif
-#include "php3_mail.h"
+#include "php_mail.h"
 #include "php_ini.h"
 
 #if APACHE
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 60e8648713..af6ad58f5d 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -35,7 +35,7 @@
 #endif
 #include "ext/standard/head.h"
 #include "safe_mode.h"
-#include "php3_string.h"
+#include "php_string.h"
 #include "pack.h"
 #if HAVE_PWD_H
 #if MSVC5
diff --git a/ext/standard/php3_browscap.h b/ext/standard/php_browscap.h
index 2a61016e47..338272692e 100644
--- a/ext/standard/php3_browscap.h
+++ b/ext/standard/php_browscap.h
@@ -28,8 +28,8 @@
  */
 
 
-#ifndef _PHP3_BROWSCAP_H
-#define _PHP3_BROWSCAP_H
+#ifndef _PHP_BROWSCAP_H
+#define _PHP_BROWSCAP_H
 
 extern php3_module_entry browscap_module_entry;
 #define browscap_module_ptr &browscap_module_entry
@@ -42,4 +42,4 @@ PHP_FUNCTION(get_browser);
 
 #define phpext_browscap_ptr browscap_module_ptr
 
-#endif /* _PHP3_BROWSCAP_H */
+#endif /* _PHP_BROWSCAP_H */
diff --git a/ext/standard/php3_crypt.h b/ext/standard/php_crypt.h
index 1ae1d5f84b..1b93431cb5 100644
--- a/ext/standard/php3_crypt.h
+++ b/ext/standard/php_crypt.h
@@ -1,5 +1,5 @@
-#ifndef PHP3_CRYPT_H
-#define PHP3_CRYPT_H
+#ifndef PHP_CRYPT_H
+#define PHP_CRYPT_H
 
 #if HAVE_CRYPT
 extern php3_module_entry crypt_module_entry;
diff --git a/ext/standard/php3_dir.h b/ext/standard/php_dir.h
index 86ccda21c2..bb09e2fbdd 100644
--- a/ext/standard/php3_dir.h
+++ b/ext/standard/php_dir.h
@@ -19,8 +19,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_DIR_H
-#define _PHP3_DIR_H
+#ifndef _PHP_DIR_H
+#define _PHP_DIR_H
 extern php3_module_entry php3_dir_module_entry;
 #define php3_dir_module_ptr &php3_dir_module_entry
 
@@ -36,4 +36,4 @@ PHP_FUNCTION(getdir);
 
 #define phpext_dir_ptr php3_dir_module_ptr
 
-#endif /* _PHP3_DIR_H */
+#endif /* _PHP_DIR_H */
diff --git a/ext/standard/php3_filestat.h b/ext/standard/php_filestat.h
index bc6cc9d232..bc6cc9d232 100644
--- a/ext/standard/php3_filestat.h
+++ b/ext/standard/php_filestat.h
diff --git a/ext/standard/php3_iptc.h b/ext/standard/php_iptc.h
index 2abc43dae1..2abc43dae1 100644
--- a/ext/standard/php3_iptc.h
+++ b/ext/standard/php_iptc.h
diff --git a/ext/standard/php3_link.h b/ext/standard/php_link.h
index 8ffc61e646..e3c1116f25 100644
--- a/ext/standard/php3_link.h
+++ b/ext/standard/php_link.h
@@ -29,8 +29,8 @@
  */
 
 /* $Id$ */
-#ifndef _PHP3_LINK_H
-#define _PHP3_LINK_H
+#ifndef _PHP_LINK_H
+#define _PHP_LINK_H
 
 PHP_FUNCTION(link);
 PHP_FUNCTION(unlink);
@@ -38,4 +38,4 @@ PHP_FUNCTION(readlink);
 PHP_FUNCTION(linkinfo);
 PHP_FUNCTION(symlink);
 
-#endif /* _PHP3_LINK_H */
+#endif /* _PHP_LINK_H */
diff --git a/ext/standard/php3_mail.h b/ext/standard/php_mail.h
index 918bcbdf1c..918bcbdf1c 100644
--- a/ext/standard/php3_mail.h
+++ b/ext/standard/php_mail.h
diff --git a/ext/standard/php3_standard.h b/ext/standard/php_standard.h
index c6a80cde65..8e48c18503 100644
--- a/ext/standard/php3_standard.h
+++ b/ext/standard/php_standard.h
@@ -32,36 +32,36 @@
 
 #include "basic_functions.h"
 #include "phpmath.h"
-#include "php3_string.h"
+#include "php_string.h"
 #include "base64.h"
-#include "php3_dir.h"
+#include "php_dir.h"
 #include "dns.h"
 #include "reg.h"
-#include "php3_mail.h"
+#include "php_mail.h"
 #include "md5.h"
 #include "html.h"
 #include "exec.h"
 #include "file.h"
-#include "php3_syslog.h"
-#include "php3_filestat.h"
-#include "php3_browscap.h"
+#include "php_syslog.h"
+#include "php_filestat.h"
+#include "php_browscap.h"
 #include "pack.h"
 #include "datetime.h"
 #include "microtime.h"
 #include "url.h"
 #include "pageinfo.h"
 #include "cyr_convert.h"
-#include "php3_link.h"
+#include "php_link.h"
 #include "fsock.h"
 #include "php_image.h"
-#include "php3_iptc.h"
+#include "php_iptc.h"
 #include "info.h"
 #include "uniqid.h"
-#include "php3_var.h"
+#include "php_var.h"
 #include "quot_print.h"
 #include "type.h"
 #include "dl.h"
-#include "php3_crypt.h"
+#include "php_crypt.h"
 #include "head.h"
 #include "post.h"
 
diff --git a/ext/standard/php3_string.h b/ext/standard/php_string.h
index 93e4ab18c1..93e4ab18c1 100644
--- a/ext/standard/php3_string.h
+++ b/ext/standard/php_string.h
diff --git a/ext/standard/php3_syslog.h b/ext/standard/php_syslog.h
index 69dd4abb80..69dd4abb80 100644
--- a/ext/standard/php3_syslog.h
+++ b/ext/standard/php_syslog.h
diff --git a/ext/standard/php3_var.h b/ext/standard/php_var.h
index 850baac254..850baac254 100644
--- a/ext/standard/php3_var.h
+++ b/ext/standard/php_var.h
diff --git a/ext/standard/post.c b/ext/standard/post.c
index e74d85b5ac..c6b1c5297a 100644
--- a/ext/standard/post.c
+++ b/ext/standard/post.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include "php.h"
-#include "php3_standard.h"
+#include "php_standard.h"
 #include "php_globals.h"
 #include "SAPI.h"
 
diff --git a/ext/standard/reg.c b/ext/standard/reg.c
index bd40cb2191..d327701af8 100644
--- a/ext/standard/reg.c
+++ b/ext/standard/reg.c
@@ -21,7 +21,7 @@
 
 #include <stdio.h>
 #include "php.h"
-#include "php3_string.h"
+#include "php_string.h"
 #include "reg.h"
 
 unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
diff --git a/ext/standard/soundex.c b/ext/standard/soundex.c
index 61defab91b..25946e4854 100644
--- a/ext/standard/soundex.c
+++ b/ext/standard/soundex.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <ctype.h>
-#include "php3_string.h"
+#include "php_string.h"
 
 /* Simple soundex algorithm as described by Knuth in TAOCP, vol 3 */
 /* {{{ proto string soundex(string str)
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 80fa1d2a6f..e1592343f4 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -26,7 +26,7 @@
 #include "php.h"
 #include "reg.h"
 #include "post.h"
-#include "php3_string.h"
+#include "php_string.h"
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif
diff --git a/ext/standard/syslog.c b/ext/standard/syslog.c
index 2f29f438eb..2154212ce7 100644
--- a/ext/standard/syslog.c
+++ b/ext/standard/syslog.c
@@ -36,7 +36,7 @@
 #include <errno.h>
 
 #include <stdio.h>
-#include "php3_syslog.h"
+#include "php_syslog.h"
 
 static int syslog_started;
 static char *syslog_device;
diff --git a/ext/standard/var.c b/ext/standard/var.c
index ae709201ca..acd1cc07ed 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <errno.h>
 #include "php.h"
-#include "php3_string.h"
-#include "php3_var.h"
+#include "php_string.h"
+#include "php_var.h"
 
 /* }}} */
 /* {{{ php_var_dump */