Clean up php3.*\.h files. The files itself are renamed, and references in all

.*\.[ch] files were changed. There is a slight chance that my script missed
a few changes, please correct them manually.

125 files changed, 263 insertions, 261 deletions

diff --git a/ext/aspell/aspell.c b/ext/aspell/aspell.c
index 2b19d533d4..69f8db3fcb 100644
--- a/ext/aspell/aspell.c
+++ b/ext/aspell/aspell.c
@@ -28,7 +28,7 @@
 
 #if HAVE_ASPELL
 
-#include "php3_aspell.h"
+#include "php_aspell.h"
 #if APACHE
 #  ifndef DEBUG
 #  undef palloc
diff --git a/ext/aspell/php3_aspell.h b/ext/aspell/php_aspell.h
index d0c8b35a82..d0c8b35a82 100644
--- a/ext/aspell/php3_aspell.h
+++ b/ext/aspell/php_aspell.h
diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index d4a7032376..e39f602445 100644
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -21,7 +21,7 @@
 #if WITH_BCMATH
 
 #include "number.h"
-#include "php3_bcmath.h"
+#include "php_bcmath.h"
 
 function_entry bcmath_functions[] = {
 	PHP_FE(bcadd,									NULL)
diff --git a/ext/bcmath/php3_bcmath.h b/ext/bcmath/php_bcmath.h
index a6007e60d1..397ff03dd5 100644
--- a/ext/bcmath/php3_bcmath.h
+++ b/ext/bcmath/php_bcmath.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_BCMATH_H
-#define _PHP3_BCMATH_H
+#ifndef _PHP_BCMATH_H
+#define _PHP_BCMATH_H
 
 #if COMPILE_DL
 #undef WITH_BCMATH
@@ -61,4 +61,4 @@ PHP_FUNCTION(bcscale);
 
 #endif
 
-#endif /* _PHP3_BCMATH_H */
+#endif /* _PHP_BCMATH_H */
diff --git a/ext/cpdf/cpdf.c b/ext/cpdf/cpdf.c
index 2be6d57fc6..cacb476ef5 100644
--- a/ext/cpdf/cpdf.c
+++ b/ext/cpdf/cpdf.c
@@ -54,7 +54,7 @@
 #endif
 
 #if HAVE_CPDFLIB
-#include "php3_cpdf.h"
+#include "php_cpdf.h"
 
 #ifdef THREAD_SAFE
 DWORD CPDFlibTls;
diff --git a/ext/cpdf/php3_cpdf.h b/ext/cpdf/php_cpdf.h
index 8269b2f24f..48823a9216 100644
--- a/ext/cpdf/php3_cpdf.h
+++ b/ext/cpdf/php_cpdf.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#ifndef _PHP3_CPDF_H
-#define _PHP3_CPDF_H
+#ifndef _PHP_CPDF_H
+#define _PHP_CPDF_H
 
 #if HAVE_CPDFLIB
 
diff --git a/ext/dav/dav.c b/ext/dav/dav.c
index 5ca8a39012..0f8cd56a7a 100644
--- a/ext/dav/dav.c
+++ b/ext/dav/dav.c
@@ -27,7 +27,7 @@
 # endif
 #endif
 #include "php.h"
-#include "php3_dav.h"
+#include "php_dav.h"
 
 #if defined(THREAD_SAFE) && !PHP_31
 # undef THREAD_SAFE
diff --git a/ext/dav/php3_dav.h b/ext/dav/php_dav.h
index b1ab062de1..b1ab062de1 100644
--- a/ext/dav/php3_dav.h
+++ b/ext/dav/php_dav.h
diff --git a/ext/db/db.c b/ext/db/db.c
index 527e2c665b..c26d3aef57 100644
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -148,8 +148,8 @@ datum flatfile_nextkey(FILE *dbf);
 
 #endif
 
-#include "php3_db.h"
-#include "ext/standard/php3_string.h"
+#include "php_db.h"
+#include "ext/standard/php_string.h"
 
 #if THREAD_SAFE
 DWORD DbmTls;
diff --git a/ext/db/php3_db.h b/ext/db/php_db.h
index 17069e6bcd..30c8f809a3 100644
--- a/ext/db/php3_db.h
+++ b/ext/db/php_db.h
@@ -31,8 +31,8 @@
 /* $Id$ */
 
 
-#ifndef _PHP3_DB_H
-#define _PHP3_DB_H
+#ifndef _PHP_DB_H
+#define _PHP_DB_H
 
 
 #ifndef DLEXPORT
@@ -92,4 +92,4 @@ PHP_FUNCTION(dbmnextkey);
 #undef phpext_db_ptr
 #define phpext_db_ptr	NULL
 
-#endif /* _PHP3_DB_H */
+#endif /* _PHP_DB_H */
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index dd5eeb9cd2..468d29d0ce 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -33,14 +33,14 @@
 
 #if HAVE_DBA
 
-#include "php3_dba.h"
-
-#include "php3_gdbm.h"
-#include "php3_ndbm.h"
-#include "php3_dbm.h"
-#include "php3_cdb.h"
-#include "php3_db2.h"
-#include "php3_db3.h"
+#include "php_dba.h"
+
+#include "php_gdbm.h"
+#include "php_ndbm.h"
+#include "php_dbm.h"
+#include "php_cdb.h"
+#include "php_db2.h"
+#include "php_db3.h"
 
 function_entry dba_functions[] = {
 	PHP_FE(dba_open, NULL)
diff --git a/ext/dba/dba_cdb.c b/ext/dba/dba_cdb.c
index 55683590c5..fa38de931b 100644
--- a/ext/dba/dba_cdb.c
+++ b/ext/dba/dba_cdb.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_CDB
-#include "php3_cdb.h"
+#include "php_cdb.h"
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/ext/dba/dba_db2.c b/ext/dba/dba_db2.c
index 77f010a7f2..b662a644aa 100644
--- a/ext/dba/dba_db2.c
+++ b/ext/dba/dba_db2.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_DB2
-#include "php3_db2.h"
+#include "php_db2.h"
 #include <sys/stat.h>
 
 #include <string.h>
diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c
index dece9634a4..38a2065537 100644
--- a/ext/dba/dba_db3.c
+++ b/ext/dba/dba_db3.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_DB3
-#include "php3_db3.h"
+#include "php_db3.h"
 #include <sys/stat.h>
 
 #include <string.h>
diff --git a/ext/dba/dba_dbm.c b/ext/dba/dba_dbm.c
index b8b4ea95f2..0fab79f002 100644
--- a/ext/dba/dba_dbm.c
+++ b/ext/dba/dba_dbm.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_DBM
-#include "php3_dbm.h"
+#include "php_dbm.h"
 
 #include <dbm.h>
 
diff --git a/ext/dba/dba_gdbm.c b/ext/dba/dba_gdbm.c
index 6fde65ec73..fd345997d9 100644
--- a/ext/dba/dba_gdbm.c
+++ b/ext/dba/dba_gdbm.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_GDBM
-#include "php3_gdbm.h"
+#include "php_gdbm.h"
 
 #include <gdbm.h>
 
diff --git a/ext/dba/dba_ndbm.c b/ext/dba/dba_ndbm.c
index 3c10868aab..974794701f 100644
--- a/ext/dba/dba_ndbm.c
+++ b/ext/dba/dba_ndbm.c
@@ -32,7 +32,7 @@
 #include "php.h"
 
 #if DBA_NDBM
-#include "php3_ndbm.h"
+#include "php_ndbm.h"
 
 #include <fcntl.h>
 
diff --git a/ext/dba/php3_cdb.h b/ext/dba/php3_cdb.h
deleted file mode 100644
index 162fa8bdb2..0000000000
--- a/ext/dba/php3_cdb.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_CDB_H
-#define _PHP3_CDB_H
-
-#if DBA_CDB
-
-#include "php3_dba.h"
-
-DBA_FUNCS(cdb);
-
-#endif
-
-#endif
diff --git a/ext/dba/php3_db2.h b/ext/dba/php3_db2.h
deleted file mode 100644
index 0f8c458db9..0000000000
--- a/ext/dba/php3_db2.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_DB2_H
-#define _PHP3_DB2_H
-
-#if DBA_DB2
-
-#include "php3_dba.h"
-
-DBA_FUNCS(db2);
-
-#endif
-
-#endif
diff --git a/ext/dba/php3_db3.h b/ext/dba/php3_db3.h
deleted file mode 100644
index 4c00dfd448..0000000000
--- a/ext/dba/php3_db3.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_DB3_H
-#define _PHP3_DB3_H
-
-#if DBA_DB3
-
-#include "php3_dba.h"
-
-DBA_FUNCS(db3);
-
-#endif
-
-#endif
diff --git a/ext/dba/php3_dbm.h b/ext/dba/php3_dbm.h
deleted file mode 100644
index 5007c84b3e..0000000000
--- a/ext/dba/php3_dbm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_DBM_H
-#define _PHP3_DBM_H
-
-#if DBA_DBM
-
-#include "php3_dba.h"
-
-DBA_FUNCS(dbm);
-
-#endif
-
-#endif
diff --git a/ext/dba/php3_gdbm.h b/ext/dba/php3_gdbm.h
deleted file mode 100644
index 9a18b531d4..0000000000
--- a/ext/dba/php3_gdbm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_GDBM_H
-#define _PHP3_GDBM_H
-
-#if DBA_GDBM
-
-#include "php3_dba.h"
-
-DBA_FUNCS(gdbm);
-
-#endif
-
-#endif
diff --git a/ext/dba/php3_ndbm.h b/ext/dba/php3_ndbm.h
deleted file mode 100644
index 398b8e39a1..0000000000
--- a/ext/dba/php3_ndbm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _PHP3_NDBM_H
-#define _PHP3_NDBM_H
-
-#if DBA_NDBM
-
-#include "php3_dba.h"
-
-DBA_FUNCS(ndbm);
-
-#endif
-
-#endif
diff --git a/ext/dba/php_cdb.h b/ext/dba/php_cdb.h
new file mode 100644
index 0000000000..5574038991
--- /dev/null
+++ b/ext/dba/php_cdb.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_CDB_H
+#define _PHP_CDB_H
+
+#if DBA_CDB
+
+#include "php_dba.h"
+
+DBA_FUNCS(cdb);
+
+#endif
+
+#endif
diff --git a/ext/dba/php_db2.h b/ext/dba/php_db2.h
new file mode 100644
index 0000000000..d88582f1eb
--- /dev/null
+++ b/ext/dba/php_db2.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_DB2_H
+#define _PHP_DB2_H
+
+#if DBA_DB2
+
+#include "php_dba.h"
+
+DBA_FUNCS(db2);
+
+#endif
+
+#endif
diff --git a/ext/dba/php_db3.h b/ext/dba/php_db3.h
new file mode 100644
index 0000000000..126afe98a6
--- /dev/null
+++ b/ext/dba/php_db3.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_DB3_H
+#define _PHP_DB3_H
+
+#if DBA_DB3
+
+#include "php_dba.h"
+
+DBA_FUNCS(db3);
+
+#endif
+
+#endif
diff --git a/ext/dba/php3_dba.h b/ext/dba/php_dba.h
index 4a1470c503..4a1470c503 100644
--- a/ext/dba/php3_dba.h
+++ b/ext/dba/php_dba.h
diff --git a/ext/dba/php_dbm.h b/ext/dba/php_dbm.h
new file mode 100644
index 0000000000..e99b8cc3a0
--- /dev/null
+++ b/ext/dba/php_dbm.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_DBM_H
+#define _PHP_DBM_H
+
+#if DBA_DBM
+
+#include "php_dba.h"
+
+DBA_FUNCS(dbm);
+
+#endif
+
+#endif
diff --git a/ext/dba/php_gdbm.h b/ext/dba/php_gdbm.h
new file mode 100644
index 0000000000..0ee6e612e7
--- /dev/null
+++ b/ext/dba/php_gdbm.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_GDBM_H
+#define _PHP_GDBM_H
+
+#if DBA_GDBM
+
+#include "php_dba.h"
+
+DBA_FUNCS(gdbm);
+
+#endif
+
+#endif
diff --git a/ext/dba/php_ndbm.h b/ext/dba/php_ndbm.h
new file mode 100644
index 0000000000..798916b6c7
--- /dev/null
+++ b/ext/dba/php_ndbm.h
@@ -0,0 +1,12 @@
+#ifndef _PHP_NDBM_H
+#define _PHP_NDBM_H
+
+#if DBA_NDBM
+
+#include "php_dba.h"
+
+DBA_FUNCS(ndbm);
+
+#endif
+
+#endif
diff --git a/ext/domxml/domxml.c b/ext/domxml/domxml.c
index 0cf3f08bf0..186cf4bbce 100644
--- a/ext/domxml/domxml.c
+++ b/ext/domxml/domxml.c
@@ -20,7 +20,7 @@
 
 
 #include "php.h"
-#include "php3_domxml.h"
+#include "php_domxml.h"
 
 #if HAVE_DOMXML
 
diff --git a/ext/domxml/php3_domxml.h b/ext/domxml/php_domxml.h
index 8b15ce2cb0..70fc1c5c9d 100644
--- a/ext/domxml/php3_domxml.h
+++ b/ext/domxml/php_domxml.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_DOMXML_H
-#define _PHP3_DOMXML_H
+#ifndef _PHP_DOMXML_H
+#define _PHP_DOMXML_H
 
 #if HAVE_DOMXML
 #include <gnome-xml/parser.h>
diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index bd40cb2191..d327701af8 100644
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.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/fdf/fdf.c b/ext/fdf/fdf.c
index e96ae4858b..eef407f86b 100644
--- a/ext/fdf/fdf.c
+++ b/ext/fdf/fdf.c
@@ -30,7 +30,7 @@
 #include "php.h"
 #include "ext/standard/head.h"
 #include <math.h>
-#include "php3_fdf.h"
+#include "php_fdf.h"
 
 #if HAVE_SYS_WAIT_H
 # include <sys/wait.h>
diff --git a/ext/fdf/php3_fdf.h b/ext/fdf/php_fdf.h
index dd8a560839..ab2256c5fe 100644
--- a/ext/fdf/php3_fdf.h
+++ b/ext/fdf/php_fdf.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#ifndef _PHP3_FDF_H
-#define _PHP3_FDF_H
+#ifndef _PHP_FDF_H
+#define _PHP_FDF_H
 
 #if HAVE_FDFLIB
 #if WIN32|WINNT
@@ -62,4 +62,4 @@ PHP_FUNCTION(fdf_add_template);
 #else
 #define phpext_fdf_ptr NULL
 #endif
-#endif /* _PHP3_FDF_H */
+#endif /* _PHP_FDF_H */
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index bcf867cd33..ec3e10eaed 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -29,7 +29,7 @@
 #include "ext/standard/head.h"
 #include <math.h>
 #include "SAPI.h"
-#include "php3_gd.h"
+#include "php_gd.h"
 
 #if HAVE_SYS_WAIT_H
 # include <sys/wait.h>
diff --git a/ext/gd/php3_gd.h b/ext/gd/php_gd.h
index 2d97c53009..f5e92e4fbb 100644
--- a/ext/gd/php3_gd.h
+++ b/ext/gd/php_gd.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_GD_H
-#define _PHP3_GD_H
+#ifndef _PHP_GD_H
+#define _PHP_GD_H
 
 #define HAVE_GDIMAGECREATEFROMPNG 1
 
@@ -111,4 +111,4 @@ PHPAPI int phpi_get_le_gd(void);
 
 #endif
 
-#endif /* _PHP3_GD_H */
+#endif /* _PHP_GD_H */
diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c
index 25679d3fe4..860d26de43 100644
--- a/ext/gettext/gettext.c
+++ b/ext/gettext/gettext.c
@@ -20,7 +20,7 @@
 
 #include <stdio.h>
 #include "php.h"
-#include "php3_gettext.h"
+#include "php_gettext.h"
 
 #if HAVE_LIBINTL
 
diff --git a/ext/gettext/php3_gettext.h b/ext/gettext/php_gettext.h
index e01d041b94..e01d041b94 100644
--- a/ext/gettext/php3_gettext.h
+++ b/ext/gettext/php_gettext.h
diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c
index be4f3adbb5..a40b7b45b2 100644
--- a/ext/hyperwave/hw.c
+++ b/ext/hyperwave/hw.c
@@ -26,7 +26,7 @@
 
 #include "php.h"
 #include "php_globals.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "ext/standard/head.h"
 #include "ext/standard/info.h"
 #include "SAPI.h"
@@ -40,7 +40,7 @@
 #if HYPERWAVE
 
 #include "php_ini.h"
-#include "php3_hyperwave.h"
+#include "php_hyperwave.h"
 
 //hw_module php3_hw_module;
 
diff --git a/ext/hyperwave/php3_hyperwave.h b/ext/hyperwave/php_hyperwave.h
index c7f04f32fb..c7f04f32fb 100644
--- a/ext/hyperwave/php3_hyperwave.h
+++ b/ext/hyperwave/php_hyperwave.h
diff --git a/ext/icap/php3_icap.c b/ext/icap/php3_icap.c
index 5c63c30a85..8279e41f72 100644
--- a/ext/icap/php3_icap.c
+++ b/ext/icap/php3_icap.c
@@ -48,7 +48,7 @@
 #include <signal.h>
 #include <stdarg.h>
 #include "cal.h"
-#include "php3_icap.h"
+#include "php_icap.h"
 #include "modules.h"
 #if (WIN32|WINNT)
 #include "winsock.h"
diff --git a/ext/icap/php3_icap.h b/ext/icap/php_icap.h
index f7e1b06b54..f7e1b06b54 100644
--- a/ext/icap/php3_icap.h
+++ b/ext/icap/php_icap.h
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 1f12608629..5b5470be65 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -22,12 +22,12 @@
 
 #include "php.h"
 #include "php_config.h"
-#include "php3_interbase.h"
+#include "php_interbase.h"
 
 #if HAVE_IBASE
 #include <ibase.h>
 #include <time.h>
-#include "php3_string.h"
+#include "php_string.h"
 #include "php_globals.h"
 
 /* {{{ extension definition structures */
diff --git a/ext/interbase/php3_interbase.h b/ext/interbase/php_interbase.h
index 30980e51da..30980e51da 100644
--- a/ext/interbase/php3_interbase.h
+++ b/ext/interbase/php_interbase.h
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index ef2b108587..0ca3d18c40 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -29,7 +29,7 @@
 
 #include "dl/phpdl.h"
 #include "ext/standard/dl.h"
-#include "php3_ldap.h"
+#include "php_ldap.h"
 
 #if WIN32|WINNT
 #include <string.h>
@@ -44,7 +44,7 @@
 #define __STDC__ 1
 #endif
 
-#include "ext/standard/php3_string.h"
+#include "ext/standard/php_string.h"
 
 
 #if THREAD_SAFE & HAVE_NSLDAP
@@ -109,7 +109,7 @@ DLEXPORT php3_module_entry *get_module(void ) { return &ldap_module_entry; }
 #endif
 
 
-#if 0 /* see my note in php3_ldap.h.  smc */
+#if 0 /* see my note in php_ldap.h.  smc */
 /* Function for setting thread-specific LDAP error values */
 static void php3_ldap_set_ld_error( int err, char *matched, char *errmsg, void *dummy )
 {
diff --git a/ext/ldap/php3_ldap.h b/ext/ldap/php_ldap.h
index 3e8b08f62e..a8b1b60867 100644
--- a/ext/ldap/php3_ldap.h
+++ b/ext/ldap/php_ldap.h
@@ -31,8 +31,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_LDAP_H
-#define _PHP3_LDAP_H
+#ifndef _PHP_LDAP_H
+#define _PHP_LDAP_H
 
 #if COMPILE_DL
 #undef HAVE_LDAP
@@ -124,4 +124,4 @@ extern ldap_module php3_ldap_module;
 
 #define phpext_ldap_ptr ldap_module_ptr
 
-#endif /* _PHP3_LDAP_H */
+#endif /* _PHP_LDAP_H */
diff --git a/ext/mcal/php3_mcal.c b/ext/mcal/php3_mcal.c
index 0c077904ac..3d37c17482 100644
--- a/ext/mcal/php3_mcal.c
+++ b/ext/mcal/php3_mcal.c
@@ -54,7 +54,7 @@
 #include "php3_list.h"
 #endif
 #include "mcal.h"
-#include "php3_mcal.h"
+#include "php_mcal.h"
 #include "modules.h"
 #if (WIN32|WINNT)
 #include "winsock.h"
diff --git a/ext/mcal/php3_mcal.h b/ext/mcal/php_mcal.h
index b519725cc5..b519725cc5 100644
--- a/ext/mcal/php3_mcal.h
+++ b/ext/mcal/php_mcal.h
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index 40014bcd23..fe0e17352a 100644
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -24,7 +24,7 @@
 #include "functions/dl.h"
 #endif
 #include "php_msql.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "php_globals.h"
 
 #if HAVE_MSQL
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 6e42b03fd6..4da3a3677a 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -25,7 +25,7 @@
 
 #include "php.h"
 #include "php_globals.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "php_mssql.h"
 #include "php_ini.h"
 
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 234f280767..039cbb8bb5 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -26,7 +26,7 @@
 
 #include "php.h"
 #include "php_globals.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "php_mysql.h"
 #include "php_globals.h"
 
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 59df252912..ec5680401e 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -55,7 +55,7 @@
 
 #if HAVE_OCI8
 
-#include "php3_oci8.h"
+#include "php_oci8.h"
 
 /* True globals, no need for thread safety */
 static int le_conn; /* active connections */
diff --git a/ext/oci8/php3_oci8.h b/ext/oci8/php_oci8.h
index 3df40bcdd0..3df40bcdd0 100644
--- a/ext/oci8/php3_oci8.h
+++ b/ext/oci8/php_oci8.h
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 9158e60fe2..d17e72da04 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -81,11 +81,13 @@ AC_ARG_WITH(adabas,
     withval=/usr/local
   fi
   if test "$withval" != "no"; then
-    ODBC_INCDIR=$withval/incl
-    ODBC_LIBDIR=$withval/lib
-    ODBC_LFLAGS=-L$ODBC_LIBDIR
-    ODBC_INCLUDE=-I$ODBC_INCDIR
-    ODBC_LIBS="${ODBC_LIBDIR}/odbclib.a -lsqlrte -lsqlptc"
+    AC_ADD_INCLUDE($withval/incl)
+    AC_ADD_LIBPATH($withval/lib)
+    ODBC_OBJS="${ODBC_LIBDIR}/odbclib.a"
+    AC_SUBST(ODBC_OBJS)
+    AC_ADD_LIBRARY_WITH_PATH(php_odbc, $abs_builddir/ext/odbc)
+    AC_ADD_LIBRARY(sqlrte)
+    AC_ADD_LIBRARY(sqlptc)
     ODBC_TYPE=adabas
     AC_DEFINE(HAVE_ADABAS)
     AC_MSG_RESULT(yes)
@@ -385,7 +387,7 @@ AC_ARG_WITH(dbmaker,
 ])
 fi
 
-if test -n "$ODBC_TYPE"; then
+if test -n "$ODBC_TYPE" && test -n "$ODBC_INCLUDE"; then
   INCLUDES="$INCLUDES $ODBC_INCLUDE"
   EXTRA_LIBS="$EXTRA_LIBS $ODBC_LFLAGS $ODBC_LIBS"
   AC_DEFINE(HAVE_UODBC)
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index f9a6f9aa9f..9a2d412809 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -26,7 +26,7 @@
 
 #include "php.h"
 #include "php_globals.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "php_odbc.h"
 
 #if HAVE_UODBC
diff --git a/ext/odbc/php3_velocis.h b/ext/odbc/php_velocis.h
index e2cdde87af..2b24c5e055 100644
--- a/ext/odbc/php3_velocis.h
+++ b/ext/odbc/php_velocis.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_VELOCIS_H
-#define _PHP3_VELOCIS_H
+#ifndef _PHP_VELOCIS_H
+#define _PHP_VELOCIS_H
 
 #if COMPILE_DL
 #undef HAVE_VELOCIS
@@ -99,7 +99,7 @@ extern velocis_module php3_velocis_module;
 #define velocis_module_ptr NULL
 
 #endif /* HAVE_VELOCIS */
-#endif /* _PHP3_VELOCIS_H */
+#endif /* _PHP_VELOCIS_H */
 
 /*
  * Local variables:
diff --git a/ext/odbc/velocis.c b/ext/odbc/velocis.c
index 1d4bc50728..80fad7b1a9 100644
--- a/ext/odbc/velocis.c
+++ b/ext/odbc/velocis.c
@@ -41,7 +41,7 @@
 #endif
 
 #ifdef HAVE_VELOCIS
-#include "php3_velocis.h"
+#include "php_velocis.h"
 
 function_entry velocis_functions[] = {
 	PHP_FE(velocis_connect,								NULL)
diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c
index 807d1d771f..33e3715d80 100644
--- a/ext/oracle/oracle.c
+++ b/ext/oracle/oracle.c
@@ -35,7 +35,7 @@
 
 #if HAVE_ORACLE
 
-#include "php3_oracle.h"
+#include "php_oracle.h"
 #define HASH_DTOR (int (*)(void *))
 
 #ifdef WIN32
diff --git a/ext/oracle/php3_oracle.h b/ext/oracle/php_oracle.h
index 7cf7074435..5ca0918380 100644
--- a/ext/oracle/php3_oracle.h
+++ b/ext/oracle/php_oracle.h
@@ -2,8 +2,8 @@
 
 /* synced with oracle.h,v 1.40 1999/06/01 08:11:04 thies Exp $ */
 
-#ifndef _PHP3_ORACLE_H
-#define _PHP3_ORACLE_H
+#ifndef _PHP_ORACLE_H
+#define _PHP_ORACLE_H
 
 #if HAVE_ORACLE
 
@@ -134,7 +134,7 @@ typedef struct {
 
 #endif /* HAVE_ORACLE */
 
-#endif /* _PHP3_ORACLE_H */
+#endif /* _PHP_ORACLE_H */
 
 /*
  * Local Variables:
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 22bc7638f3..1dd70ec31a 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -29,7 +29,7 @@
 
 #if HAVE_PCRE || HAVE_BUNDLED_PCRE
 
-#include "ext/standard/php3_string.h"
+#include "ext/standard/php_string.h"
 
 #define PREG_PATTERN_ORDER	0
 #define PREG_SET_ORDER		1
diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c
index 8691c96b9f..fcb951aedd 100644
--- a/ext/pdf/pdf.c
+++ b/ext/pdf/pdf.c
@@ -57,7 +57,7 @@
 
 #if HAVE_PDFLIB
 
-#include "php3_pdf.h"
+#include "php_pdf.h"
 
 #ifdef THREAD_SAFE
 DWORD PDFlibTls;
diff --git a/ext/pdf/php3_pdf.h b/ext/pdf/php_pdf.h
index 6b7c48372d..9ca3c0ae5e 100644
--- a/ext/pdf/php3_pdf.h
+++ b/ext/pdf/php_pdf.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */
 
-#ifndef _PHP3_PDF_H
-#define _PHP3_PDF_H
+#ifndef _PHP_PDF_H
+#define _PHP_PDF_H
 
 #if HAVE_PDFLIB
 
@@ -122,4 +122,4 @@ PHP_FUNCTION(pdf_get_image_height);
 #define pdf_module_ptr NULL
 #endif
 #define phpext_pdf_ptr pdf_module_ptr
-#endif /* _PHP3_PDF_H */
+#endif /* _PHP_PDF_H */
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index cff75b9a0e..868b1d002f 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -26,8 +26,8 @@
 #endif
 
 #include "php.h"
-#include "php3_pgsql.h"
-#include "ext/standard/php3_standard.h"
+#include "php_pgsql.h"
+#include "ext/standard/php_standard.h"
 #include "php_globals.h"
 
 #if HAVE_PGSQL
@@ -331,7 +331,7 @@ void php3_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
 			if (index_ptr->type != le_index_ptr) {
 				RETURN_FALSE;
 			}
-			link = (int) index_ptr->ptr;
+			link = (int) (long) index_ptr->ptr;
 			ptr = php3_list_find(link,&type);   /* check if the link is still there */
 			if (ptr && (type==le_link || type==le_plink)) {
 				return_value->value.lval = PGG(default_link) = link;
diff --git a/ext/pgsql/php3_pgsql.h b/ext/pgsql/php_pgsql.h
index 637fe44e5f..0397ab9a9e 100644
--- a/ext/pgsql/php3_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@@ -29,8 +29,8 @@
  
 /* $Id$ */
 
-#ifndef _PHP3_PGSQL_H
-#define _PHP3_PGSQL_H
+#ifndef _PHP_PGSQL_H
+#define _PHP_PGSQL_H
 
 #if COMPILE_DL
 #undef HAVE_PGSQL
@@ -147,4 +147,4 @@ extern PHP_PGSQL_API php_pgsql_globals pgsql_globals;
 
 #define phpext_pgsql_ptr pgsql_module_ptr
 
-#endif /* _PHP3_PGSQL_H */
+#endif /* _PHP_PGSQL_H */
diff --git a/ext/posix/php3_posix.h b/ext/posix/php_posix.h
index 12b7f3fa8f..7dcc21fc85 100644
--- a/ext/posix/php3_posix.h
+++ b/ext/posix/php_posix.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_POSIX_H
-#define _PHP3_POSIX_H
+#ifndef _PHP_POSIX_H
+#define _PHP_POSIX_H
 
 #if COMPILE_DL
 #define HAVE_POSIX 1
@@ -94,4 +94,4 @@ typedef struct {
 
 #define phpext_posix_ptr posix_module_ptr
 
-#endif /* _PHP3_POSIX_H */
+#endif /* _PHP_POSIX_H */
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 65a0304f3f..8a26d0957a 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -35,11 +35,11 @@
 #include "internal_functions.h"
 #endif
 #if PHP_31 || PHP_API_VERSION >= 19990421
-# include "ext/standard/php3_string.h"
+# include "ext/standard/php_string.h"
 #else
-# include "php3_string.h"
+# include "php_string.h"
 #endif
-#include "php3_posix.h"
+#include "php_posix.h"
 
 #if HAVE_POSIX
 #ifdef HAVE_SYS_TIME_H
diff --git a/ext/session/session.c b/ext/session/session.c
index 0b9491506e..f8d056759b 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -31,7 +31,7 @@
 
 #include "php_session.h"
 #include "ext/standard/md5.h"
-#include "ext/standard/php3_var.h"
+#include "ext/standard/php_var.h"
 #include "ext/standard/datetime.h"
 #include "ext/standard/php_lcg.h"
 #include "ext/standard/url_scanner.h"
diff --git a/ext/snmp/php3_snmp.h b/ext/snmp/php_snmp.h
index 047d3ebf1a..46fbc7e961 100644
--- a/ext/snmp/php3_snmp.h
+++ b/ext/snmp/php_snmp.h
@@ -19,8 +19,8 @@
 */
 
 /* $Id$ */
-#ifndef _PHP3_SNMP_H
-#define _PHP3_SNMP_H
+#ifndef _PHP_SNMP_H
+#define _PHP_SNMP_H
 
 #if COMPILE_DL
 #undef HAVE_SNMP
@@ -51,4 +51,4 @@ void php3_info_snmp(ZEND_MODULE_INFO_FUNC_ARGS);
 
 #define phpext_snmp_ptr snmp_module_ptr
 
-#endif  /* _PHP3_SNMP_H */
+#endif  /* _PHP_SNMP_H */
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index ad81337158..5468809c1e 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -23,7 +23,7 @@
 #if defined(COMPILE_DL)
 #include "dl/phpdl.h"
 #endif
-#include "php3_snmp.h"
+#include "php_snmp.h"
 #include <sys/types.h>
 #if MSVC5
 #include <winsock.h>
diff --git a/ext/snmp/winsnmp.c b/ext/snmp/winsnmp.c
index fd6c5932ec..9b176e5126 100644
--- a/ext/snmp/winsnmp.c
+++ b/ext/snmp/winsnmp.c
@@ -7,7 +7,7 @@ Created from the snmputil sample in the Microsoft SDK for NT
 #include "../phpdl.h"
 #include "functions/dl.h"
 #endif
-#include "php3_snmp.h"
+#include "php_snmp.h"
 #include <sys/types.h>
 
 #include <windows.h>
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 */
diff --git a/ext/sybase/php3_sybase.h b/ext/sybase/php_sybase.h
index 9c175c8e88..1ce140d324 100644
--- a/ext/sybase/php3_sybase.h
+++ b/ext/sybase/php_sybase.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_SYBASE_H
-#define _PHP3_SYBASE_H
+#ifndef _PHP_SYBASE_H
+#define _PHP_SYBASE_H
 
 #if COMPILE_DL
 #undef HAVE_SYBASE
@@ -140,4 +140,4 @@ extern sybase_module php3_sybase_module;
 
 #define phpext_sybase_ptr sybase_module_ptr
 
-#endif /* _PHP3_SYBASE_H */
+#endif /* _PHP_SYBASE_H */
diff --git a/ext/sybase/sybase.c b/ext/sybase/sybase.c
index 0ba854679e..0bad3988a7 100644
--- a/ext/sybase/sybase.c
+++ b/ext/sybase/sybase.c
@@ -24,8 +24,8 @@
 
 
 #include "php.h"
-#include "php3_sybase.h"
-#include "ext/standard/php3_standard.h"
+#include "php_sybase.h"
+#include "ext/standard/php_standard.h"
 #include "php_globals.h"
 
 #if HAVE_SYBASE
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index 6f98daa86e..201156e06e 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -22,7 +22,7 @@
 
 #include "php.h"
 #include "php_sybase_ct.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "php_globals.h"
 
 #if HAVE_SYBASE_CT
diff --git a/ext/sysvsem/php3_sysvsem.h b/ext/sysvsem/php_sysvsem.h
index 1a12baab80..1d3342ab70 100644
--- a/ext/sysvsem/php3_sysvsem.h
+++ b/ext/sysvsem/php_sysvsem.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_SYSVSEM_H
-#define _PHP3_SYSVSEM_H
+#ifndef _PHP_SYSVSEM_H
+#define _PHP_SYSVSEM_H
 
 #if COMPILE_DL
 #undef HAVE_SYSVSEM
@@ -73,4 +73,4 @@ extern sysvsem_module php3_sysvsem_module;
 
 #define phpext_sysvsem_ptr sysvsem_module_ptr
 
-#endif /* _PHP3_SYSVSEM_H */
+#endif /* _PHP_SYSVSEM_H */
diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
index b4f69ba501..02052242dd 100644
--- a/ext/sysvsem/sysvsem.c
+++ b/ext/sysvsem/sysvsem.c
@@ -33,7 +33,7 @@
 #include <sys/sem.h>
 #include <errno.h>
 
-#include "php3_sysvsem.h"
+#include "php_sysvsem.h"
 
 #if !HAVE_SEMUN && defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ == 6
 
diff --git a/ext/sysvshm/php3_sysvshm.h b/ext/sysvshm/php_sysvshm.h
index bd7538b577..7cbdb34fd2 100644
--- a/ext/sysvshm/php3_sysvshm.h
+++ b/ext/sysvshm/php_sysvshm.h
@@ -30,8 +30,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_SYSVSHM_H
-#define _PHP3_SYSVSHM_H
+#ifndef _PHP_SYSVSHM_H
+#define _PHP_SYSVSHM_H
 
 #if COMPILE_DL
 #undef HAVE_SYSVSHM
@@ -100,4 +100,4 @@ extern sysvshm_module php3_sysvshm_module;
 
 #define phpext_sysvshm_ptr sysvshm_module_ptr
 
-#endif /* _PHP3_SYSVSHM_H */
+#endif /* _PHP_SYSVSHM_H */
diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index 8d5698eb17..5b416417e1 100644
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -28,8 +28,8 @@
 
 #include <errno.h>
 
-#include "php3_sysvshm.h"
-#include "../standard/php3_var.h"
+#include "php_sysvshm.h"
+#include "../standard/php_var.h"
 
 function_entry sysvshm_functions[] = {
 	PHP_FE(shm_attach, NULL)
diff --git a/ext/xml/php3_xml.h b/ext/xml/php_xml.h
index 23d89c0fd2..23d89c0fd2 100644
--- a/ext/xml/php3_xml.h
+++ b/ext/xml/php_xml.h
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 22ad953804..8886979bc0 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -21,9 +21,9 @@
 #define IS_EXT_MODULE
 
 #include "php.h"
-#include "php3_xml.h"
+#include "php_xml.h"
 #include "zend_variables.h"
-#include "ext/standard/php3_string.h"
+#include "ext/standard/php_string.h"
 
 
 #if HAVE_LIBEXPAT
diff --git a/ext/yp/php3_yp.h b/ext/yp/php_yp.h
index 1059314293..6fab95baeb 100644
--- a/ext/yp/php3_yp.h
+++ b/ext/yp/php_yp.h
@@ -28,8 +28,8 @@
  */
 /* $Id$ */ 
 
-#ifndef _PHP3_YP_H
-#define _PHP3_YP_H
+#ifndef _PHP_YP_H
+#define _PHP_YP_H
 
 #if COMPILE_DL
 #undef HAVE_YP
@@ -59,4 +59,4 @@ void php3_info_yp(ZEND_MODULE_INFO_FUNC_ARGS);
 
 #define phpext_yp_ptr yp_module_ptr
 
-#endif /* _PHP3_YP_H */
+#endif /* _PHP_YP_H */
diff --git a/ext/yp/yp.c b/ext/yp/yp.c
index c48fa971dd..d7166460c7 100644
--- a/ext/yp/yp.c
+++ b/ext/yp/yp.c
@@ -21,7 +21,7 @@
 
 #if HAVE_YP
 
-#include "php3_yp.h"
+#include "php_yp.h"
 
 #include <rpcsvc/ypclnt.h>
 
diff --git a/ext/zlib/php3_zlib.h b/ext/zlib/php_zlib.h
index 4b9ece5ff9..6046d1dad8 100644
--- a/ext/zlib/php3_zlib.h
+++ b/ext/zlib/php_zlib.h
@@ -25,8 +25,8 @@
 
 /* $Id$ */
 
-#ifndef _PHP3_ZLIB_H
-#define _PHP3_ZLIB_H
+#ifndef _PHP_ZLIB_H
+#define _PHP_ZLIB_H
 
 #if COMPILE_DL
 #undef HAVE_ZLIB
@@ -76,4 +76,4 @@ PHP_FUNCTION(gzfile);
 
 #define phpext_zlib_ptr zlib_module_ptr
 
-#endif /* _PHP3_ZLIB_H */
+#endif /* _PHP_ZLIB_H */
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 3c7a8e0596..d474958b4e 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -38,8 +38,8 @@
 #endif
 #include "ext/standard/head.h"
 #include "safe_mode.h"
-#include "ext/standard/php3_standard.h"
-#include "php3_zlib.h"
+#include "ext/standard/php_standard.h"
+#include "php_zlib.h"
 #include "fopen-wrappers.h"
 #if HAVE_PWD_H
 #if WIN32|WINNT
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index dfa084a0c0..2e0d317446 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -41,9 +41,9 @@
 #endif
 
 #include "safe_mode.h"
-#include "php3_realpath.h"
+#include "php_realpath.h"
 #include "ext/standard/head.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "zend_compile.h"
 
 #if HAVE_PWD_H
diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index ba08ce6e39..244303d9d3 100644
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -29,21 +29,21 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "ext/bcmath/php3_bcmath.h"
-#include "ext/db/php3_db.h"
-#include "ext/gd/php3_gd.h"
+#include "ext/bcmath/php_bcmath.h"
+#include "ext/db/php_db.h"
+#include "ext/gd/php_gd.h"
 #include "ext/standard/dl.h"
 #include "ext/standard/file.h"
 #include "ext/standard/fsock.h"
 #include "ext/standard/head.h"
 #include "ext/standard/pack.h"
-#include "ext/standard/php3_browscap.h"
-#include "ext/standard/php3_crypt.h"
-#include "ext/standard/php3_dir.h"
-#include "ext/standard/php3_filestat.h"
-#include "ext/standard/php3_mail.h"
-#include "ext/standard/php3_syslog.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_browscap.h"
+#include "ext/standard/php_crypt.h"
+#include "ext/standard/php_dir.h"
+#include "ext/standard/php_filestat.h"
+#include "ext/standard/php_mail.h"
+#include "ext/standard/php_syslog.h"
+#include "ext/standard/php_standard.h"
 #include "ext/standard/php_lcg.h"
 #include "ext/standard/php_output.h"
 #include "ext/standard/php_array.h"
@@ -54,7 +54,7 @@
 #include "ext/session/php_session.h"
 
 /* SNMP has to be moved to ext */
-/* #include "dl/snmp/php3_snmp.h" */
+/* #include "dl/snmp/php_snmp.h" */
 
 unsigned char first_arg_force_ref[] = { 1, BYREF_FORCE };
 unsigned char first_arg_allow_ref[] = { 1, BYREF_ALLOW };
diff --git a/main/main.c b/main/main.c
index 24a93f6ff1..892da7a1ae 100644
--- a/main/main.c
+++ b/main/main.c
@@ -48,7 +48,7 @@
 #include "php_globals.h"
 #include "main.h"
 #include "fopen-wrappers.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "snprintf.h"
 #if WIN32|WINNT
 #include <io.h>
diff --git a/main/php.h b/main/php.h
index 47f0f367c8..031c168596 100644
--- a/main/php.h
+++ b/main/php.h
@@ -148,7 +148,7 @@ char *strtok_r(char *s, const char *delim, char **last);
 
 
 #include "zend_hash.h"
-#include "php3_compat.h"
+#include "php_compat.h"
 #include "zend_alloc.h"
 #include "zend_stack.h"
 
diff --git a/main/php3_compat.h b/main/php_compat.h
index f6e60bea71..be0a5fa281 100644
--- a/main/php3_compat.h
+++ b/main/php_compat.h
@@ -1,5 +1,5 @@
-#ifndef _PHP3_COMPAT_H
-#define _PHP3_COMPAT_H
+#ifndef _PHP_COMPAT_H
+#define _PHP_COMPAT_H
 
 #define _php3_hash_init zend_hash_init
 #define _php3_hash_destroy zend_hash_destroy
@@ -90,4 +90,4 @@
 #define _php3_stripslashes	php_stripslashes
 #define php3_dl             php_dl
 
-#endif							/* _PHP3_COMPAT_H */
+#endif							/* _PHP_COMPAT_H */
diff --git a/php3_realpath.h b/main/php_realpath.h
index 4dff23e5e1..92ecdf8574 100644
--- a/php3_realpath.h
+++ b/main/php_realpath.h
@@ -16,8 +16,8 @@
    +----------------------------------------------------------------------+
  */
 
-#ifndef _PHP3_REALPATH_H_
-#define _PHP3_REALPATH_H_
+#ifndef _PHP_REALPATH_H_
+#define _PHP_REALPATH_H_
 
 extern char *_php3_realpath(const char *path, char resolved_path []);
 
diff --git a/main/rfc1867.c b/main/rfc1867.c
index 9ab9420f6f..2ddd66d467 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include "php.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "ext/standard/file.h" /* for php_file_le_uploads() */
 #include "zend_globals.h"
 #include "php_globals.h"
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 5d693a3982..3a2a0e2998 100644
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -47,7 +47,7 @@
 #include "zend_highlight.h"
 #include "zend_indent.h"
 
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 
 #include "util_script.h"
 
diff --git a/sapi/apache/sapi_apache.c b/sapi/apache/sapi_apache.c
index 4ca0ed615c..bcd2bcfda8 100644
--- a/sapi/apache/sapi_apache.c
+++ b/sapi/apache/sapi_apache.c
@@ -47,7 +47,7 @@
 #include "zend_execute.h"
 #include "zend_highlight.h"
 #include "zend_indent.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "util_script.h"
 #include "php_version.h"
 /*#include "mod_php4.h"*/
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 3abfd6f7ad..df9e271ebf 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -52,7 +52,7 @@
 #include "php_globals.h"
 #include "main.h"
 #include "fopen-wrappers.h"
-#include "ext/standard/php3_standard.h"
+#include "ext/standard/php_standard.h"
 #include "snprintf.h"
 #if WIN32|WINNT
 #include <io.h>
diff --git a/sapi/servlet/servlet.c b/sapi/servlet/servlet.c
index 4ee4ed5d9c..9eddc35cf4 100644
--- a/sapi/servlet/servlet.c
+++ b/sapi/servlet/servlet.c
@@ -50,8 +50,8 @@
 #include "php_globals.h"
 #include "main.h"
 #include "fopen-wrappers.h"
-#include "ext/standard/php3_standard.h"
-#include "ext/standard/php3_dir.h"
+#include "ext/standard/php_standard.h"
+#include "ext/standard/php_dir.h"
 #include "snprintf.h"
 #if WIN32|WINNT
 #include <io.h>