* zend_module_entry change: apino, debug and zts are moved first,

  see README.EXTENSIONS file for upgrade help.
@Introduced extension version numbers (Stig)

96 files changed, 353 insertions, 72 deletions

diff --git a/ext/aspell/aspell.c b/ext/aspell/aspell.c
index d8e5a5387b..13c6182300 100644
--- a/ext/aspell/aspell.c
+++ b/ext/aspell/aspell.c
@@ -51,7 +51,8 @@ function_entry aspell_functions[] = {
 static int le_aspell;
 
 zend_module_entry aspell_module_entry = {
-	"aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), STANDARD_MODULE_PROPERTIES
+    STANDARD_MODULE_HEADER,
+	"aspell", aspell_functions, PHP_MINIT(aspell), NULL, NULL, NULL, PHP_MINFO(aspell), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_ASPELL
diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c
index 0cb4f11a2b..95efd3a0c4 100644
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@@ -44,13 +44,15 @@ function_entry bcmath_functions[] = {
 };
 
 zend_module_entry bcmath_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"bcmath",
-    bcmath_functions,
+	bcmath_functions,
 	PHP_MINIT(bcmath),
 	PHP_MSHUTDOWN(bcmath),
 	PHP_RINIT(bcmath),
 	NULL,
 	PHP_MINFO(bcmath),
+	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c
index b10bc42036..bbabe3582f 100644
--- a/ext/calendar/calendar.c
+++ b/ext/calendar/calendar.c
@@ -57,6 +57,7 @@ function_entry calendar_functions[] = {
 
 
 zend_module_entry calendar_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"calendar", 
 	calendar_functions, 
 	PHP_MINIT(calendar),
@@ -64,6 +65,7 @@ zend_module_entry calendar_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(calendar),
+	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES,
 };
 
diff --git a/ext/ccvs/ccvs.c b/ext/ccvs/ccvs.c
index 3035c814d5..dbb7dc75d3 100644
--- a/ext/ccvs/ccvs.c
+++ b/ext/ccvs/ccvs.c
@@ -97,15 +97,17 @@ static char const cvsid[] = "$Id$";
 
 	/* Declare our module to the Zend engine */
 	zend_module_entry ccvs_module_entry = {
+        STANDARD_MODULE_HEADER,
 		"CCVS",
 		ccvs_functions,
 		NULL, NULL, NULL, NULL,
 		PHP_MINFO(ccvs),
+        NO_VERSION_YET,
 		STANDARD_MODULE_PROPERTIES
 	};
 
-#ifdef COMPILE_DL_LDAP
-ZEND_GET_MODULE(ldap)
+#ifdef COMPILE_DL_CCVS
+ZEND_GET_MODULE(ccvs)
 #endif
 
 /* Full Functions (The actual CCVS functions and any internal php hooked functions such as MINFO) */
diff --git a/ext/com/COM.c b/ext/com/COM.c
index b4aebc5fa3..794a71ae16 100644
--- a/ext/com/COM.c
+++ b/ext/com/COM.c
@@ -1810,7 +1810,16 @@ PHP_MSHUTDOWN_FUNCTION(COM)
 /* exports for external object creation */
 
 zend_module_entry COM_module_entry = {
-	"com", COM_functions, PHP_MINIT(COM), PHP_MSHUTDOWN(COM), NULL, NULL, PHP_MINFO(COM), STANDARD_MODULE_PROPERTIES
+    STANDARD_MODULE_HEADER,
+	"com",
+    COM_functions,
+    PHP_MINIT(COM),
+    PHP_MSHUTDOWN(COM),
+    NULL,
+    NULL,
+    PHP_MINFO(COM),
+    NO_VERSION_YET,
+    STANDARD_MODULE_PROPERTIES
 };
 
 PHPAPI int php_COM_get_le_comval()
@@ -1819,3 +1828,11 @@ PHPAPI int php_COM_get_le_comval()
 }
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
diff --git a/ext/cpdf/cpdf.c b/ext/cpdf/cpdf.c
index b453b61434..e73b64a04e 100644
--- a/ext/cpdf/cpdf.c
+++ b/ext/cpdf/cpdf.c
@@ -155,7 +155,16 @@ function_entry cpdf_functions[] = {
 };
 
 zend_module_entry cpdf_module_entry = {
-	"cpdf", cpdf_functions, PHP_MINIT(cpdf), PHP_MSHUTDOWN(cpdf), PHP_RINIT(cpdf), NULL, PHP_MINFO(cpdf), STANDARD_MODULE_PROPERTIES
+    STANDARD_MODULE_HEADER,
+	"cpdf",
+    cpdf_functions,
+    PHP_MINIT(cpdf),
+    PHP_MSHUTDOWN(cpdf),
+    PHP_RINIT(cpdf),
+    NULL,
+    PHP_MINFO(cpdf),
+    NO_VERSION_YET,
+    STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_CPDF
diff --git a/ext/crack/crack.c b/ext/crack/crack.c
index 268e4b048f..799489fc78 100644
--- a/ext/crack/crack.c
+++ b/ext/crack/crack.c
@@ -43,6 +43,7 @@ function_entry crack_functions[] = {
 };
 
 zend_module_entry crack_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"crack",
 	crack_functions,
 	ZEND_MODULE_STARTUP_N(crack),
@@ -50,6 +51,7 @@ zend_module_entry crack_module_entry = {
 	ZEND_MODULE_ACTIVATE_N(crack),
 	ZEND_MODULE_DEACTIVATE_N(crack),
 	ZEND_MODULE_INFO_N(crack),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/ctype/ctype.c b/ext/ctype/ctype.c
index 5667a2da4d..5d05ccfbbe 100644
--- a/ext/ctype/ctype.c
+++ b/ext/ctype/ctype.c
@@ -62,6 +62,7 @@ function_entry ctype_functions[] = {
 /* {{{ ctype_mpodule_entry
  */
 zend_module_entry ctype_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"ctype",
 	ctype_functions,
 	NULL,
@@ -69,6 +70,7 @@ zend_module_entry ctype_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(ctype),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index 76c967b516..5cd00203b2 100644
--- a/ext/curl/curl.c
+++ b/ext/curl/curl.c
@@ -69,6 +69,7 @@ function_entry curl_functions[] = {
 /* {{{ curl_module_entry
  */
 zend_module_entry curl_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"curl",
 	curl_functions,
 	PHP_MINIT(curl),
@@ -76,6 +77,7 @@ zend_module_entry curl_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(curl),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/cybercash/cybercash.c b/ext/cybercash/cybercash.c
index 2606284dd9..d7bd433c6f 100644
--- a/ext/cybercash/cybercash.c
+++ b/ext/cybercash/cybercash.c
@@ -45,6 +45,7 @@ function_entry cybercash_functions[] = {
 /* {{{ cybercash_module_entry
  */
 zend_module_entry cybercash_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"cybercash",
 	cybercash_functions,
 	NULL,
@@ -52,6 +53,7 @@ zend_module_entry cybercash_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(cybercash),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES,
 };
 /* }}} */
diff --git a/ext/cybermut/cybermut.c b/ext/cybermut/cybermut.c
index 276852f13f..d27477c530 100644
--- a/ext/cybermut/cybermut.c
+++ b/ext/cybermut/cybermut.c
@@ -48,6 +48,7 @@ function_entry cybermut_functions[] = {
 /* {{{ cybermut_module_entry
  */
 zend_module_entry cybermut_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"cybermut",
 	cybermut_functions,
 	PHP_MINIT(cybermut),
@@ -55,6 +56,7 @@ zend_module_entry cybermut_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(cybermut),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/cyrus/cyrus.c b/ext/cyrus/cyrus.c
index b38ae5cb96..cd58dcc203 100644
--- a/ext/cyrus/cyrus.c
+++ b/ext/cyrus/cyrus.c
@@ -48,6 +48,7 @@ function_entry cyrus_functions[] = {
 };
 
 zend_module_entry cyrus_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"cyrus",
 	cyrus_functions,
 	PHP_MINIT(cyrus),
@@ -55,6 +56,7 @@ zend_module_entry cyrus_module_entry = {
 	NULL,	
 	NULL,
 	PHP_MINFO(cyrus),
+	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/db/db.c b/ext/db/db.c
index 9297b9f1c4..df12f99812 100644
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -1234,7 +1234,16 @@ function_entry dbm_functions[] = {
 /* }}} */
 
 zend_module_entry dbm_module_entry = {
-	"db", dbm_functions, PHP_MINIT(db), PHP_MSHUTDOWN(db), PHP_RINIT(db), NULL, PHP_MINFO(db), STANDARD_MODULE_PROPERTIES
+    STANDARD_MODULE_HEADER,
+	"db",
+    dbm_functions,
+    PHP_MINIT(db),
+    PHP_MSHUTDOWN(db),
+    PHP_RINIT(db),
+    NULL,
+    PHP_MINFO(db),
+    NO_VERSION_YET,
+    STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_DB
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 5173087c46..8ee89dba59 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -60,11 +60,15 @@ static PHP_MSHUTDOWN_FUNCTION(dba);
 static PHP_MINFO_FUNCTION(dba);
 
 zend_module_entry dba_module_entry = {
-	"dba", dba_functions, 
+    STANDARD_MODULE_HEADER,
+	"dba",
+    dba_functions, 
 	PHP_MINIT(dba), 
 	PHP_MSHUTDOWN(dba), 
-	NULL, NULL,
+	NULL,
+    NULL,
 	PHP_MINFO(dba),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c
index 021d855d0d..4acf9b2333 100644
--- a/ext/dbase/dbase.c
+++ b/ext/dbase/dbase.c
@@ -787,7 +787,8 @@ function_entry dbase_functions[] = {
 /* }}} */
 
 zend_module_entry dbase_module_entry = {
-	"dbase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES
+	STANDARD_MODULE_HEADER,
+	"dbase", dbase_functions, PHP_MINIT(dbase), PHP_MSHUTDOWN(dbase), NULL, NULL, NULL, NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
 };
 
 
diff --git a/ext/dbplus/dbplus.c b/ext/dbplus/dbplus.c
index 8b7ee4e207..9f259ade08 100644
--- a/ext/dbplus/dbplus.c
+++ b/ext/dbplus/dbplus.c
@@ -118,6 +118,7 @@ function_entry dbplus_functions[] = {
 /* {{{ module entry */
 
 zend_module_entry dbplus_module_entry = {
+    STANDARD_MODULE_HEADER,
     "dbplus",
     dbplus_functions,
     PHP_MINIT(dbplus),
@@ -125,6 +126,7 @@ zend_module_entry dbplus_module_entry = {
     PHP_RINIT(dbplus),      /* Replace with NULL if there's nothing to do at request start */
     PHP_RSHUTDOWN(dbplus),  /* Replace with NULL if there's nothing to do at request end */
     PHP_MINFO(dbplus),
+    NO_VERSION_YET,
     STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/dbx/dbx.c b/ext/dbx/dbx.c
index 91ebdd6c5f..a98d508b11 100644
--- a/ext/dbx/dbx.c
+++ b/ext/dbx/dbx.c
@@ -148,6 +148,7 @@ function_entry dbx_functions[] = {
 };
 
 zend_module_entry dbx_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"dbx",
 	dbx_functions,
 	ZEND_MINIT(dbx),
@@ -155,6 +156,7 @@ zend_module_entry dbx_module_entry = {
 	NULL, /*ZEND_RINIT(dbx),        /* Replace with NULL if there's nothing to do at request start */
 	NULL, /*ZEND_RSHUTDOWN(dbx),    /* Replace with NULL if there's nothing to do at request end */
 	ZEND_MINFO(dbx),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index 2a64310b2f..4e0b0df22e 100644
--- a/ext/domxml/php_domxml.c
+++ b/ext/domxml/php_domxml.c
@@ -267,6 +267,7 @@ static zend_function_entry php_domxmlns_class_functions[] = {
 };
 
 zend_module_entry domxml_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"domxml",
 	domxml_functions,
 	PHP_MINIT(domxml),
@@ -274,6 +275,7 @@ zend_module_entry domxml_module_entry = {
 	PHP_RINIT(domxml),
 	NULL,
 	PHP_MINFO(domxml),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/dotnet/dotnet.cpp b/ext/dotnet/dotnet.cpp
index 24a7b26315..ec9b0e7291 100644
--- a/ext/dotnet/dotnet.cpp
+++ b/ext/dotnet/dotnet.cpp
@@ -226,7 +226,8 @@ PHP_MSHUTDOWN_FUNCTION(DOTNET)
 
 
 zend_module_entry dotnet_module_entry = {
-	"dotnet", DOTNET_functions, PHP_MINIT(DOTNET), PHP_MSHUTDOWN(DOTNET), NULL, NULL, PHP_MINFO(DOTNET), STANDARD_MODULE_PROPERTIES
+	STANDARD_MODULE_HEADER,
+	"dotnet", DOTNET_functions, PHP_MINIT(DOTNET), PHP_MSHUTDOWN(DOTNET), NULL, NULL, PHP_MINFO(DOTNET), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
 };
 
 BEGIN_EXTERN_C()
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 5e1470c3ea..45af9d9ce5 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -131,11 +131,13 @@ PHP_MINFO_FUNCTION(exif);
 /* {{{ exif_module_entry
  */
 zend_module_entry exif_module_entry = {
+    STANDARD_MODULE_HEADER,
     "exif",
     exif_functions,
     NULL, NULL,
     NULL, NULL,
     PHP_MINFO(exif),
+    NO_VERSION_YET,
     STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/fbsql/php_fbsql.c b/ext/fbsql/php_fbsql.c
index 1684986a58..1647443396 100644
--- a/ext/fbsql/php_fbsql.c
+++ b/ext/fbsql/php_fbsql.c
@@ -231,14 +231,16 @@ function_entry fbsql_functions[] = {
 /* }}} */
 
 zend_module_entry fbsql_module_entry = {
-   "fbsql",
-   fbsql_functions,
-   PHP_MINIT(fbsql),
-   PHP_MSHUTDOWN(fbsql),
-   PHP_RINIT(fbsql),
-   PHP_RSHUTDOWN(fbsql),
-   PHP_MINFO(fbsql),
-   STANDARD_MODULE_PROPERTIES
+	STANDARD_MODULE_HEADER,
+	"fbsql",
+	fbsql_functions,
+	PHP_MINIT(fbsql),
+	PHP_MSHUTDOWN(fbsql),
+	PHP_RINIT(fbsql),
+	PHP_RSHUTDOWN(fbsql),
+	PHP_MINFO(fbsql),
+	NO_VERSION_YET,
+	STANDARD_MODULE_PROPERTIES
 };
 
 ZEND_DECLARE_MODULE_GLOBALS(fbsql)
diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c
index 12e4db2fab..d99078e627 100644
--- a/ext/fdf/fdf.c
+++ b/ext/fdf/fdf.c
@@ -68,6 +68,7 @@ function_entry fdf_functions[] = {
 /* }}} */
 
 zend_module_entry fdf_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"fdf", 
 	fdf_functions, 
 	PHP_MINIT(fdf), 
@@ -75,6 +76,7 @@ zend_module_entry fdf_module_entry = {
 	NULL, 
 	NULL,
 	PHP_MINFO(fdf), 
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/filepro/filepro.c b/ext/filepro/filepro.c
index 83f44e1ea7..9c8d2e5255 100644
--- a/ext/filepro/filepro.c
+++ b/ext/filepro/filepro.c
@@ -144,7 +144,8 @@ function_entry filepro_functions[] = {
 };
 
 zend_module_entry filepro_module_entry = {
-	"filepro", filepro_functions, PHP_MINIT(filepro), PHP_MSHUTDOWN(filepro), NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES
+	STANDARD_MODULE_HEADER,
+	"filepro", filepro_functions, PHP_MINIT(filepro), PHP_MSHUTDOWN(filepro), NULL, NULL, NULL, NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
 };
 
 
diff --git a/ext/fribidi/fribidi.c b/ext/fribidi/fribidi.c
index 78890dd6ba..f347bc72bf 100755
--- a/ext/fribidi/fribidi.c
+++ b/ext/fribidi/fribidi.c
@@ -47,6 +47,7 @@ function_entry fribidi_functions[] = {
 };
 
 zend_module_entry fribidi_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"fribidi",
 	fribidi_functions,
 	PHP_MINIT(fribidi),
@@ -54,6 +55,7 @@ zend_module_entry fribidi_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(fribidi),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index dc057d1dda..3512a78d2d 100644
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -62,6 +62,7 @@ function_entry php_ftp_functions[] = {
 };
 
 zend_module_entry php_ftp_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"ftp",
 	php_ftp_functions,
 	PHP_MINIT(ftp),
@@ -69,6 +70,7 @@ zend_module_entry php_ftp_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(ftp),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
@@ -854,3 +856,11 @@ PHP_FUNCTION(ftp_quit)
 /* }}} */
 
 #endif /* HAVE_FTP */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 0866307713..e8a53165bc 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -202,7 +202,16 @@ function_entry gd_functions[] = {
 /* }}} */
 
 zend_module_entry gd_module_entry = {
-	"gd", gd_functions, PHP_MINIT(gd), NULL, NULL, NULL, PHP_MINFO(gd), STANDARD_MODULE_PROPERTIES
+    STANDARD_MODULE_HEADER,
+	"gd",
+    gd_functions,
+    PHP_MINIT(gd),
+    NULL,
+    NULL,
+    NULL,
+    PHP_MINFO(gd),
+    NO_VERSION_YET,
+    STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_GD
diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c
index f1f6c85a39..f29dbdba30 100644
--- a/ext/gettext/gettext.c
+++ b/ext/gettext/gettext.c
@@ -54,6 +54,7 @@ function_entry php_gettext_functions[] = {
 /* }}} */
 
 zend_module_entry php_gettext_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"gettext",
 	php_gettext_functions,
 	NULL,
@@ -61,6 +62,7 @@ zend_module_entry php_gettext_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(gettext),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index aaf1c617ac..edb6ac1c54 100644
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -86,6 +86,7 @@ function_entry gmp_functions[] = {
 /* {{{ gmp_module_entry
  */
 zend_module_entry gmp_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"gmp",
 	gmp_functions,
 	ZEND_MODULE_STARTUP_N(gmp),
@@ -93,6 +94,7 @@ zend_module_entry gmp_module_entry = {
 	NULL,		/* Replace with NULL if there's nothing to do at request start */
 	NULL,	    /* Replace with NULL if there's nothing to do at request end */
 	ZEND_MODULE_INFO_N(gmp),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c
index b117b94706..274865de9d 100644
--- a/ext/hyperwave/hw.c
+++ b/ext/hyperwave/hw.c
@@ -129,7 +129,8 @@ function_entry hw_functions[] = {
 };
 
 zend_module_entry hw_module_entry = {
-	"hyperwave", hw_functions, PHP_MINIT(hw), PHP_MSHUTDOWN(hw), NULL, NULL, PHP_MINFO(hw), STANDARD_MODULE_PROPERTIES
+	STANDARD_MODULE_HEADER,
+	"hyperwave", hw_functions, PHP_MINIT(hw), PHP_MSHUTDOWN(hw), NULL, NULL, PHP_MINFO(hw), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
 };
 
 /*
diff --git a/ext/icap/php_icap.c b/ext/icap/php_icap.c
index a9732e67f1..a38f8ece88 100644
--- a/ext/icap/php_icap.c
+++ b/ext/icap/php_icap.c
@@ -89,7 +89,16 @@ function_entry icap_functions[] = {
 
 
 zend_module_entry php_icap_module_entry = {
-    "icap", icap_functions, PHP_MINIT(icap), NULL, NULL, NULL, PHP_MINFO(icap), 0, 0, 0, NULL
+    STANDARD_MODULE_HEADER,
+    "icap",
+    icap_functions,
+    PHP_MINIT(icap),
+    NULL,
+    NULL,
+    NULL,
+    PHP_MINFO(icap),
+    NO_VERSION_YET,
+    STANDARD_MODULE_PROPERTIES
 };
 
 
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 694863f897..95608f27b5 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -62,6 +62,7 @@ function_entry iconv_functions[] = {
 /* {{{ iconv_module_entry
  */
 zend_module_entry iconv_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"iconv",
 	iconv_functions,
 	PHP_MINIT(miconv),
@@ -69,6 +70,7 @@ zend_module_entry iconv_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(miconv),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 01081323f7..7d2bb5c12f 100644
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -158,12 +158,15 @@ function_entry imap_functions[] = {
 /* {{{ imap_module_entry
  */
 zend_module_entry imap_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"imap",
 	imap_functions,
 	PHP_MINIT(imap),
-	NULL, PHP_RINIT(imap),
+	NULL,
+	PHP_RINIT(imap),
 	PHP_RSHUTDOWN(imap),
 	PHP_MINFO(imap),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec
index 506dfe2219..877abcc310 100644
--- a/ext/informix/ifx.ec
+++ b/ext/informix/ifx.ec
@@ -165,6 +165,7 @@ $endif;
 };
 
 zend_module_entry ifx_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"informix", 
 	ifx_functions, 
 	PHP_MINIT(ifx), 
@@ -172,6 +173,7 @@ zend_module_entry ifx_module_entry = {
 	PHP_RINIT(ifx), 
 	NULL, 
 	PHP_MINFO(ifx),
+	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/ingres_ii/ii.c b/ext/ingres_ii/ii.c
index 0127699b37..5e77cee40d 100644
--- a/ext/ingres_ii/ii.c
+++ b/ext/ingres_ii/ii.c
@@ -67,6 +67,7 @@ function_entry ii_functions[] = {
 };
 
 zend_module_entry ingres_ii_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"ingres_ii",
 	ii_functions,
 	PHP_MINIT(ii),
@@ -74,6 +75,7 @@ zend_module_entry ingres_ii_module_entry = {
 	PHP_RINIT(ii),
 	PHP_RSHUTDOWN(ii),
 	PHP_MINFO(ii),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
@@ -1462,4 +1464,4 @@ PHP_FUNCTION(ingres_autocommit)
  * vim600: sw=4 ts=4 fdm=marker
  * vim<600: sw=4 ts=4
  */
-     
\ No newline at end of file
+     
diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index ab1a0a2e5d..f990501a9c 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -108,6 +108,7 @@ function_entry ibase_functions[] = {
 
 zend_module_entry ibase_module_entry =
 {
+	STANDARD_MODULE_HEADER,
 	"interbase",
 	ibase_functions,
 	PHP_MINIT(ibase),
@@ -115,6 +116,7 @@ zend_module_entry ibase_module_entry =
 	PHP_RINIT(ibase),
 	PHP_RSHUTDOWN(ibase),
 	PHP_MINFO(ibase),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/java/java.c b/ext/java/java.c
index a1c9458670..833e5a3fce 100644
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -631,14 +631,16 @@ static PHP_MINFO_FUNCTION(java) {
 }
 
 zend_module_entry java_module_entry = {
-  "java",
-  java_functions,
-  PHP_MINIT(java),
-  PHP_MSHUTDOWN(java),
-  NULL,
-  NULL,
-  PHP_MINFO(java),
-  STANDARD_MODULE_PROPERTIES
+    STANDARD_MODULE_HEADER,
+	"java",
+	java_functions,
+	PHP_MINIT(java),
+	PHP_MSHUTDOWN(java),
+	NULL,
+	NULL,
+	PHP_MINFO(java),
+	NO_VERSION_YET,
+	STANDARD_MODULE_PROPERTIES
 };
 
 ZEND_GET_MODULE(java)
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index ba697cf44c..93da7249ed 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -124,6 +124,7 @@ function_entry ldap_functions[] = {
 /* }}} */
 
 zend_module_entry ldap_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"ldap", 
 	ldap_functions, 
 	PHP_MINIT(ldap), 
@@ -131,6 +132,7 @@ zend_module_entry ldap_module_entry = {
 	NULL, 
 	NULL,
 	PHP_MINFO(ldap), 
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/mailparse/mailparse.c b/ext/mailparse/mailparse.c
index e6f4d0b08d..b96ee23329 100755
--- a/ext/mailparse/mailparse.c
+++ b/ext/mailparse/mailparse.c
@@ -66,6 +66,7 @@ function_entry mailparse_functions[] = {
 };
 
 zend_module_entry mailparse_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"mailparse",
 	mailparse_functions,
 	PHP_MINIT(mailparse),
@@ -73,6 +74,7 @@ zend_module_entry mailparse_module_entry = {
 	PHP_RINIT(mailparse),
 	PHP_RSHUTDOWN(mailparse),
 	PHP_MINFO(mailparse),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index af2bcfb23d..1fb04c707a 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -131,6 +131,7 @@ function_entry mbstring_functions[] = {
 };
 
 zend_module_entry mbstring_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"mbstring",
 	mbstring_functions,
 	PHP_MINIT(mbstring),
@@ -138,6 +139,7 @@ zend_module_entry mbstring_module_entry = {
 	PHP_RINIT(mbstring),
 	PHP_RSHUTDOWN(mbstring),
 	PHP_MINFO(mbstring),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/mcal/php_mcal.c b/ext/mcal/php_mcal.c
index 8589e21b4d..c5dcdf8018 100644
--- a/ext/mcal/php_mcal.c
+++ b/ext/mcal/php_mcal.c
@@ -111,7 +111,16 @@ function_entry mcal_functions[] = {
 };
 
 zend_module_entry php_mcal_module_entry = {
-	"mcal", mcal_functions, PHP_MINIT(mcal), NULL, NULL, NULL, PHP_MINFO(mcal), STANDARD_MODULE_PROPERTIES
+	STANDARD_MODULE_HEADER,
+	"mcal",
+        mcal_functions,
+        PHP_MINIT(mcal),
+        NULL,
+        NULL,
+        NULL,
+        PHP_MINFO(mcal),
+        NO_VERSION_YET,
+        STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_MCAL
diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 153f630f33..96af143a42 100644
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -91,11 +91,13 @@ static PHP_MINIT_FUNCTION(mcrypt);
 static PHP_MSHUTDOWN_FUNCTION(mcrypt);
 
 zend_module_entry mcrypt_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"mcrypt", 
 	mcrypt_functions,
 	PHP_MINIT(mcrypt), PHP_MSHUTDOWN(mcrypt),
 	NULL, NULL,
 	PHP_MINFO(mcrypt),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES,
 };
 
diff --git a/ext/mhash/mhash.c b/ext/mhash/mhash.c
index 0067456ebc..fe781d2816 100644
--- a/ext/mhash/mhash.c
+++ b/ext/mhash/mhash.c
@@ -46,11 +46,13 @@ function_entry mhash_functions[] = {
 static PHP_MINIT_FUNCTION(mhash);
 
 zend_module_entry mhash_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"mhash",
 	mhash_functions,
 	PHP_MINIT(mhash), NULL,
 	NULL, NULL,
 	NULL,
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES,
 };
 
diff --git a/ext/ming/ming.c b/ext/ming/ming.c
index b3c023d38c..5773374ce0 100644
--- a/ext/ming/ming.c
+++ b/ext/ming/ming.c
@@ -2978,6 +2978,7 @@ PHP_FUNCTION(swftextfield_addString)
 
 zend_module_entry ming_module_entry =
   {
+	STANDARD_MODULE_HEADER,
     "ming",
     ming_functions,
     PHP_MINIT(ming), /* module init function */
@@ -2985,6 +2986,7 @@ zend_module_entry ming_module_entry =
     PHP_RINIT(ming), /* request init function */
     NULL,            /* request shutdown function */
     PHP_MINFO(ming), /* module info function */
+    NO_VERSION_YET,
     STANDARD_MODULE_PROPERTIES
   };
 
diff --git a/ext/mnogosearch/php_mnogo.c b/ext/mnogosearch/php_mnogo.c
index ed11ff1f42..69c61fe609 100644
--- a/ext/mnogosearch/php_mnogo.c
+++ b/ext/mnogosearch/php_mnogo.c
@@ -159,6 +159,7 @@ function_entry mnogosearch_functions[] = {
 /* }}} */
 
 zend_module_entry mnogosearch_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"mnogosearch", 
 	mnogosearch_functions, 
 	PHP_MINIT(mnogosearch), 
@@ -166,6 +167,7 @@ zend_module_entry mnogosearch_module_entry = {
 	PHP_RINIT(mnogosearch), 
 	NULL,
 	PHP_MINFO(mnogosearch), 
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/msession/msession.c b/ext/msession/msession.c
index c329c95ec3..64a01f45d6 100644
--- a/ext/msession/msession.c
+++ b/ext/msession/msession.c
@@ -99,6 +99,7 @@ function_entry msession_functions[] = {
 };
 
 zend_module_entry msession_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"msession",
 	msession_functions,
 	PHP_MINIT(msession),
@@ -106,6 +107,7 @@ zend_module_entry msession_module_entry = {
 	PHP_RINIT(msession),	/* Replace with NULL if there's nothing to do at request start */
 	PHP_RSHUTDOWN(msession),/* Replace with NULL if there's nothing to do at request end */
 	PHP_MINFO(msession),
+        NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index 06069a731e..26c0c40fa1 100644
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -103,8 +103,9 @@ function_entry msql_functions[] = {
 /* }}} */
 
 zend_module_entry msql_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"msql", msql_functions, PHP_MINIT(msql), NULL, PHP_RINIT(msql), NULL,
-			PHP_MINFO(msql), STANDARD_MODULE_PROPERTIES
+			PHP_MINFO(msql), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
 };
 
 
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 6da0f04667..4157d0fde7 100644
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -82,6 +82,7 @@ function_entry mssql_functions[] = {
 
 zend_module_entry mssql_module_entry = 
 {
+	STANDARD_MODULE_HEADER,
 	"mssql", 
 	mssql_functions, 
 	PHP_MINIT(mssql), 
@@ -89,6 +90,7 @@ zend_module_entry mssql_module_entry =
 	PHP_RINIT(mssql), 
 	PHP_RSHUTDOWN(mssql), 
 	PHP_MINFO(mssql), 
+        NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/muscat/muscat.c b/ext/muscat/muscat.c
index db0dadf3ee..5a5535eb1c 100644
--- a/ext/muscat/muscat.c
+++ b/ext/muscat/muscat.c
@@ -61,6 +61,7 @@ function_entry muscat_functions[] = {
 };
 
 zend_module_entry muscat_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"muscat",
 	muscat_functions,
 	PHP_MINIT(muscat),
@@ -68,6 +69,7 @@ zend_module_entry muscat_module_entry = {
 	PHP_RINIT(muscat),		/* Replace with NULL if there's nothing to do at request start */
 	PHP_RSHUTDOWN(muscat),	/* Replace with NULL if there's nothing to do at request end */
 	PHP_MINFO(muscat),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 4990607b69..0fac596b14 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -182,8 +182,16 @@ function_entry mysql_functions[] = {
 /* {{{ mysql_module_entry
  */
 zend_module_entry mysql_module_entry = {
-	"mysql", mysql_functions, ZEND_MODULE_STARTUP_N(mysql), PHP_MSHUTDOWN(mysql), PHP_RINIT(mysql), PHP_RSHUTDOWN(mysql), 
-			 PHP_MINFO(mysql), STANDARD_MODULE_PROPERTIES
+	STANDARD_MODULE_HEADER,
+	"mysql",
+    mysql_functions,
+    ZEND_MODULE_STARTUP_N(mysql),
+    PHP_MSHUTDOWN(mysql),
+    PHP_RINIT(mysql),
+    PHP_RSHUTDOWN(mysql), 
+    PHP_MINFO(mysql),
+    NO_VERSION_YET,
+    STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
 
diff --git a/ext/ncurses/ncurses.c b/ext/ncurses/ncurses.c
index 07573bdbf9..f10cd44366 100644
--- a/ext/ncurses/ncurses.c
+++ b/ext/ncurses/ncurses.c
@@ -46,6 +46,7 @@ static void ncurses_destruct(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 /* {{{ ncurses_module_entry
  */
 zend_module_entry ncurses_module_entry = {
+    STANDARD_MODULE_HEADER,
     "ncurses",
     ncurses_functions,
     PHP_MINIT(ncurses),
@@ -53,6 +54,7 @@ zend_module_entry ncurses_module_entry = {
     PHP_RINIT(ncurses),     /* Replace with NULL if there's nothing to do at request start */
     PHP_RSHUTDOWN(ncurses), /* Replace with NULL if there's nothing to do at request end */
     PHP_MINFO(ncurses),
+    NO_VERSION_YET,
     STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/notes/php_notes.c b/ext/notes/php_notes.c
index 680a8893c4..32909fb04c 100644
--- a/ext/notes/php_notes.c
+++ b/ext/notes/php_notes.c
@@ -97,6 +97,7 @@ function_entry notes_functions[] = {
 };
 
 zend_module_entry notes_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"notes", 
 	notes_functions, 
 	PHP_MINIT(notes), 
@@ -104,6 +105,7 @@ zend_module_entry notes_module_entry = {
 	PHP_RINIT(notes), 
 	PHP_RSHUTDOWN(notes), 
 	PHP_MINFO(notes), 
+        NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 2d7d99a474..5bbb405516 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -386,6 +386,7 @@ static zend_function_entry php_oci_coll_class_functions[] = {
 #endif
 
 zend_module_entry oci8_module_entry = {
+	STANDARD_MODULE_HEADER,
     "oci8",        /* extension name */
     php_oci_functions,    /* extension function list */
     PHP_MINIT(oci),       /* extension-wide startup function */
@@ -393,6 +394,7 @@ zend_module_entry oci8_module_entry = {
     PHP_RINIT(oci),       /* per-request startup function */
     PHP_RSHUTDOWN(oci),   /* per-request shutdown function */
     PHP_MINFO(oci),       /* information function */
+    NO_VERSION_YET,
     STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 7a5ff39c9a..a07b036dbf 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -135,6 +135,7 @@ function_entry odbc_functions[] = {
 /* {{{ odbc_module_entry
  */
 zend_module_entry odbc_module_entry = {
+	STANDARD_MODULE_HEADER,
     "odbc", 
 	odbc_functions, 
 	PHP_MINIT(odbc), 
@@ -142,6 +143,7 @@ zend_module_entry odbc_module_entry = {
     PHP_RINIT(odbc), 
 	PHP_RSHUTDOWN(odbc), 
 	PHP_MINFO(odbc), 
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/odbc/velocis.c b/ext/odbc/velocis.c
index 9bbe23c1ae..9ad8fc8520 100644
--- a/ext/odbc/velocis.c
+++ b/ext/odbc/velocis.c
@@ -65,8 +65,10 @@ function_entry velocis_functions[] = {
 };
 
 zend_module_entry velocis_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"velocis", velocis_functions, PHP_MINIT(velocis), PHP_MSHUTDOWN(velocis),
-		PHP_RINIT(velocis), NULL, PHP_MINFO(velocis), STANDARD_MODULE_PROPERTIES
+		PHP_RINIT(velocis), NULL, PHP_MINFO(velocis), NO_VERSION_YET,
+        STANDARD_MODULE_PROPERTIES
 };
 
 
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 02bdd63fac..7121f4d513 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -115,6 +115,7 @@ function_entry openssl_functions[] = {
 /* {{{ openssl_module_entry
  */
 zend_module_entry openssl_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"openssl",
 	openssl_functions,
 	PHP_MINIT(openssl),
@@ -122,6 +123,7 @@ zend_module_entry openssl_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(openssl),
+        NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c
index 9b20a0ffe7..14e3fef166 100644
--- a/ext/oracle/oracle.c
+++ b/ext/oracle/oracle.c
@@ -146,6 +146,7 @@ function_entry oracle_functions[] = {
 /* {{{ oracle_module_entry
  */
 zend_module_entry oracle_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"oracle",
 	oracle_functions,
 	PHP_MINIT(oracle),       /* extension-wide startup function */
@@ -153,6 +154,7 @@ zend_module_entry oracle_module_entry = {
     PHP_RINIT(oracle),       /* per-request startup function */
     PHP_RSHUTDOWN(oracle),   /* per-request shutdown function */
     PHP_MINFO(oracle),
+    NO_VERSION_YET,
     STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/ovrimos/ovrimos.c b/ext/ovrimos/ovrimos.c
index 8d81131790..122c2f4605 100644
--- a/ext/ovrimos/ovrimos.c
+++ b/ext/ovrimos/ovrimos.c
@@ -1299,13 +1299,15 @@ function_entry ovrimos_functions[] = {
 /* }}} */
 
 zend_module_entry ovrimos_module_entry = {
-	"Ovrimos",
+	STANDARD_MODULE_HEADER,
+	"ovrimos",
 	ovrimos_functions,
 	NULL,
 	NULL,
 	NULL,
 	NULL,
 	PHP_MINFO(ovrimos),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 8663a539af..fdc9740721 100755
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -55,12 +55,15 @@ function_entry pcntl_functions[] = {
 };
 
 zend_module_entry pcntl_module_entry = {
-	"pcntl",	pcntl_functions,
+	STANDARD_MODULE_HEADER,
+	"pcntl",
+	pcntl_functions,
 	PHP_MINIT(pcntl),
 	PHP_MSHUTDOWN(pcntl),
 	NULL,
 	NULL,
 	PHP_MINFO(pcntl),
+	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index a9d901e895..381c1b4eed 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -1364,13 +1364,16 @@ function_entry pcre_functions[] = {
 };
 
 zend_module_entry pcre_module_entry = {
-   "pcre", pcre_functions,
-		   PHP_MINIT(pcre),
-		   PHP_MSHUTDOWN(pcre),
-		   PHP_RINIT(pcre),
-		   NULL,
-		   PHP_MINFO(pcre),
-		   STANDARD_MODULE_PROPERTIES
+	STANDARD_MODULE_HEADER,
+   "pcre",
+	pcre_functions,
+	PHP_MINIT(pcre),
+	PHP_MSHUTDOWN(pcre),
+	PHP_RINIT(pcre),
+	NULL,
+	PHP_MINFO(pcre),
+	NO_VERSION_YET,
+	STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_PCRE
diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c
index 7bfc060e5b..83d379c3b0 100644
--- a/ext/pdf/pdf.c
+++ b/ext/pdf/pdf.c
@@ -238,6 +238,7 @@ function_entry pdf_functions[] = {
 /* {{{ pdf_module_entry
  */
 zend_module_entry pdf_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"pdf", 
 	pdf_functions, 
 	PHP_MINIT(pdf), 
@@ -245,6 +246,7 @@ zend_module_entry pdf_module_entry = {
 	NULL, 
 	NULL, 
 	PHP_MINFO(pdf), 
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES 
 };
 /* }}} */
diff --git a/ext/pfpro/pfpro.c b/ext/pfpro/pfpro.c
index 40893d29b3..bf500cf7ab 100644
--- a/ext/pfpro/pfpro.c
+++ b/ext/pfpro/pfpro.c
@@ -57,6 +57,7 @@ function_entry pfpro_functions[] = {
 
 /* {{{ Zend module entry */
 zend_module_entry pfpro_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"pfpro",
 	pfpro_functions,
 	PHP_MINIT(pfpro),
@@ -64,6 +65,7 @@ zend_module_entry pfpro_module_entry = {
 	PHP_RINIT(pfpro),					/* request start */
 	PHP_RSHUTDOWN(pfpro),				/* request end */
 	PHP_MINFO(pfpro),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 495a98f4e2..cae0ce2aa8 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -101,6 +101,7 @@ function_entry pgsql_functions[] = {
 /* {{{ pgsql_module_entry
  */
 zend_module_entry pgsql_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"pgsql",
 	pgsql_functions,
 	PHP_MINIT(pgsql),
@@ -108,6 +109,7 @@ zend_module_entry pgsql_module_entry = {
 	PHP_RINIT(pgsql),
 	PHP_RSHUTDOWN(pgsql),
 	PHP_MINFO(pgsql),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 42b5c55d2b..0cf86a90a3 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -110,6 +110,7 @@ static PHP_MINFO_FUNCTION(posix);
 /* {{{ posix_module_entry
  */
 zend_module_entry posix_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"posix", 
 	posix_functions, 
 	NULL,
@@ -117,6 +118,7 @@ zend_module_entry posix_module_entry = {
 	NULL,
 	NULL, 
 	PHP_MINFO(posix),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/pspell/pspell.c b/ext/pspell/pspell.c
index d4131c49e0..76ff96701d 100644
--- a/ext/pspell/pspell.c
+++ b/ext/pspell/pspell.c
@@ -71,7 +71,8 @@ function_entry pspell_functions[] = {
 static int le_pspell, le_pspell_config;
 
 zend_module_entry pspell_module_entry = {
-	"pspell", pspell_functions, PHP_MINIT(pspell), NULL, NULL, NULL, PHP_MINFO(pspell), STANDARD_MODULE_PROPERTIES
+    STANDARD_MODULE_HEADER,
+	"pspell", pspell_functions, PHP_MINIT(pspell), NULL, NULL, NULL, PHP_MINFO(pspell), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_PSPELL
diff --git a/ext/qtdom/qtdom.c b/ext/qtdom/qtdom.c
index ab5acba883..aecd3d5dbd 100644
--- a/ext/qtdom/qtdom.c
+++ b/ext/qtdom/qtdom.c
@@ -53,6 +53,7 @@ function_entry qtdom_functions[] = {
 };
 
 zend_module_entry qtdom_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"qtdom",
 	qtdom_functions,
 	PHP_MINIT(qtdom),
@@ -60,6 +61,7 @@ zend_module_entry qtdom_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(qtdom),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index f46e9acfee..35d286ff84 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -69,6 +69,7 @@ static zend_function_entry php_readline_functions[] = {
 };
 
 zend_module_entry readline_module_entry = { 
+	STANDARD_MODULE_HEADER,
 	"readline", 
 	php_readline_functions, 
 	PHP_MINIT(readline), 
@@ -76,6 +77,7 @@ zend_module_entry readline_module_entry = {
 	NULL,
 	PHP_RSHUTDOWN(readline),
 	NULL, 
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/recode/recode.c b/ext/recode/recode.c
index 77e9e8b7f6..d581a43b20 100644
--- a/ext/recode/recode.c
+++ b/ext/recode/recode.c
@@ -54,13 +54,15 @@ static zend_function_entry php_recode_functions[] = {
 };
 
 zend_module_entry recode_module_entry = {
-	"Recode", 
+    STANDARD_MODULE_HEADER,
+	"recode", 
 	php_recode_functions, 
 	PHP_MINIT(recode), 
 	PHP_MSHUTDOWN(recode), 
 	NULL,
 	NULL, 
 	PHP_MINFO(recode), 
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
index b4aebc5fa3..794a71ae16 100644
--- a/ext/rpc/com/com_wrapper.c
+++ b/ext/rpc/com/com_wrapper.c
@@ -1810,7 +1810,16 @@ PHP_MSHUTDOWN_FUNCTION(COM)
 /* exports for external object creation */
 
 zend_module_entry COM_module_entry = {
-	"com", COM_functions, PHP_MINIT(COM), PHP_MSHUTDOWN(COM), NULL, NULL, PHP_MINFO(COM), STANDARD_MODULE_PROPERTIES
+    STANDARD_MODULE_HEADER,
+	"com",
+    COM_functions,
+    PHP_MINIT(COM),
+    PHP_MSHUTDOWN(COM),
+    NULL,
+    NULL,
+    PHP_MINFO(COM),
+    NO_VERSION_YET,
+    STANDARD_MODULE_PROPERTIES
 };
 
 PHPAPI int php_COM_get_le_comval()
@@ -1819,3 +1828,11 @@ PHPAPI int php_COM_get_le_comval()
 }
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */
diff --git a/ext/rpc/dotnet/dotnet.cpp b/ext/rpc/dotnet/dotnet.cpp
index 24a7b26315..ec9b0e7291 100644
--- a/ext/rpc/dotnet/dotnet.cpp
+++ b/ext/rpc/dotnet/dotnet.cpp
@@ -226,7 +226,8 @@ PHP_MSHUTDOWN_FUNCTION(DOTNET)
 
 
 zend_module_entry dotnet_module_entry = {
-	"dotnet", DOTNET_functions, PHP_MINIT(DOTNET), PHP_MSHUTDOWN(DOTNET), NULL, NULL, PHP_MINFO(DOTNET), STANDARD_MODULE_PROPERTIES
+	STANDARD_MODULE_HEADER,
+	"dotnet", DOTNET_functions, PHP_MINIT(DOTNET), PHP_MSHUTDOWN(DOTNET), NULL, NULL, PHP_MINFO(DOTNET), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
 };
 
 BEGIN_EXTERN_C()
diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index a1c9458670..833e5a3fce 100644
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -631,14 +631,16 @@ static PHP_MINFO_FUNCTION(java) {
 }
 
 zend_module_entry java_module_entry = {
-  "java",
-  java_functions,
-  PHP_MINIT(java),
-  PHP_MSHUTDOWN(java),
-  NULL,
-  NULL,
-  PHP_MINFO(java),
-  STANDARD_MODULE_PROPERTIES
+    STANDARD_MODULE_HEADER,
+	"java",
+	java_functions,
+	PHP_MINIT(java),
+	PHP_MSHUTDOWN(java),
+	NULL,
+	NULL,
+	PHP_MINFO(java),
+	NO_VERSION_YET,
+	STANDARD_MODULE_PROPERTIES
 };
 
 ZEND_GET_MODULE(java)
diff --git a/ext/rpc/xmlrpc/xmlrpc-epi-php.c b/ext/rpc/xmlrpc/xmlrpc-epi-php.c
index d68e355def..942a812d1d 100644
--- a/ext/rpc/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/rpc/xmlrpc/xmlrpc-epi-php.c
@@ -57,6 +57,8 @@
 #include "php_xmlrpc.h"
 #include "xmlrpc.h"
 
+#define PHP_EXT_VERSION "0.41"
+
 /* You should tweak config.m4 so this symbol (or some else suitable)
    gets defined.
 */
@@ -88,6 +90,7 @@ function_entry xmlrpc_functions[] = {
 };
 
 zend_module_entry xmlrpc_module_entry = {
+   STANDARD_MODULE_HEADER,
    "xmlrpc",
    xmlrpc_functions,
    PHP_MINIT(xmlrpc),
@@ -95,6 +98,7 @@ zend_module_entry xmlrpc_module_entry = {
    PHP_RINIT(xmlrpc),      /* Replace with NULL if there's nothing to do at request start */
    PHP_RSHUTDOWN(xmlrpc),  /* Replace with NULL if there's nothing to do at request end */
    PHP_MINFO(xmlrpc),
+   PHP_EXT_VERSION,
    STANDARD_MODULE_PROPERTIES
 };
 
@@ -135,8 +139,6 @@ typedef struct _xmlrpc_callback_data {
    char php_executed;
 } xmlrpc_callback_data;
 
-#define PHP_EXT_VERSION "0.41"
-
 // output options
 #define OUTPUT_TYPE_KEY "output_type"
 #define OUTPUT_TYPE_KEY_LEN (sizeof(OUTPUT_TYPE_KEY) - 1)
diff --git a/ext/sablot/sablot.c b/ext/sablot/sablot.c
index 938f5dd5a7..ebc4e41ec6 100644
--- a/ext/sablot/sablot.c
+++ b/ext/sablot/sablot.c
@@ -195,6 +195,7 @@ function_entry sablot_functions[] = {
 };
 
 zend_module_entry sablot_module_entry = {
+    STANDARD_MODULE_HEADER,
     "sablot",
     sablot_functions,
     PHP_MINIT(sablot),
@@ -202,6 +203,7 @@ zend_module_entry sablot_module_entry = {
     NULL,
     PHP_RSHUTDOWN(sablot),
     PHP_MINFO(sablot),
+    NO_VERSION_YET,
     STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/satellite/php_orbit.c b/ext/satellite/php_orbit.c
index 745160abb7..df7ff12763 100644
--- a/ext/satellite/php_orbit.c
+++ b/ext/satellite/php_orbit.c
@@ -81,6 +81,7 @@ static function_entry satellite_functions[] = {
  * module entry
  */
 zend_module_entry satellite_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"satellite",
 	satellite_functions,
 	PHP_MINIT(satellite),			/* module startup */
@@ -88,6 +89,7 @@ zend_module_entry satellite_module_entry = {
 	NULL,											/* request startup */
 	NULL,											/* request shutdown */
 	PHP_MINFO(satellite),			/* module info */
+	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/session/mod_mm.c b/ext/session/mod_mm.c
index 9ed7f71611..aeefcd5a3d 100644
--- a/ext/session/mod_mm.c
+++ b/ext/session/mod_mm.c
@@ -394,11 +394,13 @@ PS_GC_FUNC(mm)
 }
 
 zend_module_entry php_session_mm_module = {
+	STANDARD_MODULE_HEADER,
 	"session mm",
 	NULL,
 	PHP_MINIT(ps_mm), PHP_MSHUTDOWN(ps_mm),
 	NULL, NULL,
 	NULL,
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/session/session.c b/ext/session/session.c
index a33e8374eb..9e57ae20da 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -222,11 +222,13 @@ static void php_rshutdown_session_globals(TSRMLS_D);
 static zend_bool php_session_destroy(TSRMLS_D);
 
 zend_module_entry session_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"session",
 	session_functions,
 	PHP_MINIT(session), PHP_MSHUTDOWN(session),
 	PHP_RINIT(session), PHP_RSHUTDOWN(session),
 	PHP_MINFO(session),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c
index 93efcd4d41..9d5ca97ce6 100644
--- a/ext/shmop/shmop.c
+++ b/ext/shmop/shmop.c
@@ -61,6 +61,7 @@ function_entry shmop_functions[] = {
 /* {{{ shmop_module_entry
  */
 zend_module_entry shmop_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"shmop",
 	shmop_functions,
 	PHP_MINIT(shmop),
@@ -68,6 +69,7 @@ zend_module_entry shmop_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(shmop),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/skeleton/skeleton.c b/ext/skeleton/skeleton.c
index ec23799f0f..71ed12dc82 100644
--- a/ext/skeleton/skeleton.c
+++ b/ext/skeleton/skeleton.c
@@ -30,6 +30,7 @@ function_entry extname_functions[] = {
 /* {{{ extname_module_entry
  */
 zend_module_entry extname_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"extname",
 	extname_functions,
 	PHP_MINIT(extname),
@@ -37,6 +38,7 @@ zend_module_entry extname_module_entry = {
 	PHP_RINIT(extname),		/* Replace with NULL if there's nothing to do at request start */
 	PHP_RSHUTDOWN(extname),	/* Replace with NULL if there's nothing to do at request end */
 	PHP_MINFO(extname),
+    "0.1", /* Replace with version number for your extension */
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index 9afa835dca..a5adb0070b 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -96,6 +96,7 @@ function_entry snmp_functions[] = {
 /* {{{ snmp_module_entry
  */
 zend_module_entry snmp_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"snmp",
 	snmp_functions,
 	PHP_MINIT(snmp),
@@ -103,6 +104,7 @@ zend_module_entry snmp_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(snmp),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/snmp/winsnmp.c b/ext/snmp/winsnmp.c
index 0a9bcb6f99..3a70948255 100644
--- a/ext/snmp/winsnmp.c
+++ b/ext/snmp/winsnmp.c
@@ -33,7 +33,16 @@ function_entry snmp_functions[] = {
 /* {{{ snmp_module_entry
  */
 zend_module_entry snmp_module_entry = {
-	"SNMP",snmp_functions,NULL,NULL,NULL,NULL,NULL,0,0,0,NULL
+	STANDARD_MODULE_HEADER,
+	"SNMP",
+    snmp_functions,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NO_VERSION_YET,
+    STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
 
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index ef80204db5..1bd8447ddb 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -152,6 +152,7 @@ function_entry sockets_functions[] = {
 /* }}} */
 
 zend_module_entry sockets_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"sockets",
 	sockets_functions,
 	PHP_MINIT(sockets),
@@ -159,6 +160,7 @@ zend_module_entry sockets_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(sockets),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index e6e136d3ea..0f0b1025df 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -833,6 +833,7 @@ PHP_INI_END()
 
 
 zend_module_entry basic_functions_module = {
+    STANDARD_MODULE_HEADER,
 	"standard",					/* extension name */
 	basic_functions,			/* function list */
 	PHP_MINIT(basic),			/* process startup */
@@ -840,6 +841,7 @@ zend_module_entry basic_functions_module = {
 	PHP_RINIT(basic),			/* request startup */
 	PHP_RSHUTDOWN(basic),		/* request shutdown */
 	PHP_MINFO(basic),			/* extension info */
+    PHP_VERSION,				/* extension version */
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/standard/info.c b/ext/standard/info.c
index df8a71cc75..0f04665998 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -473,15 +473,26 @@ PHP_FUNCTION(phpinfo)
 
 /* }}} */
 
-/* {{{ proto string phpversion(void)
+/* {{{ proto string phpversion([string extension])
    Return the current PHP version */
 PHP_FUNCTION(phpversion)
 {
-	if (ZEND_NUM_ARGS() != 0) {
+    zval **arg;
+    int argc = ZEND_NUM_ARGS();
+
+	if (argc == 0) {
+        RETURN_STRING(PHP_VERSION, 1);
+	} else if (argc == 1 && zend_get_parameters_ex(1, &arg) == SUCCESS) {
+        char *version;
+        convert_to_string_ex(arg);
+        version = zend_get_module_version(Z_STRVAL_PP(arg));
+        if (version == NULL) {
+            RETURN_FALSE;
+        }
+        RETURN_STRING(version, 1);
+    } else {
 		WRONG_PARAM_COUNT;
-	}
-
-    RETURN_STRING(PHP_VERSION, 1);
+    }
 }
 /* }}} */
 
diff --git a/ext/swf/swf.c b/ext/swf/swf.c
index de7eb545b0..5970943c69 100644
--- a/ext/swf/swf.c
+++ b/ext/swf/swf.c
@@ -111,6 +111,7 @@ function_entry swf_functions[] = {
 /* {{{ swf_module_entry
  */
 zend_module_entry swf_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"swf",
 	swf_functions,
 	PHP_MINIT(swf),
@@ -118,6 +119,7 @@ zend_module_entry swf_module_entry = {
 	PHP_RINIT(swf),
 	NULL,
 	PHP_MINFO(swf),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
index 266c41b532..9c20af92b5 100644
--- a/ext/sybase/php_sybase_db.c
+++ b/ext/sybase/php_sybase_db.c
@@ -123,7 +123,8 @@ function_entry sybase_functions[] = {
 };
 
 zend_module_entry sybase_module_entry = {
-	"sybase", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), STANDARD_MODULE_PROPERTIES
+	STANDARD_MODULE_HEADER,
+	"sybase", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_SYBASE
diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index fc20ad3053..dacd311216 100644
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -80,7 +80,8 @@ function_entry sybase_functions[] = {
 };
 
 zend_module_entry sybase_module_entry = {
-	"sybase_ct", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), STANDARD_MODULE_PROPERTIES
+	STANDARD_MODULE_HEADER,
+	"sybase_ct", sybase_functions, PHP_MINIT(sybase), PHP_MSHUTDOWN(sybase), PHP_RINIT(sybase), PHP_RSHUTDOWN(sybase), PHP_MINFO(sybase), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
 };
 
 ZEND_DECLARE_MODULE_GLOBALS(sybase)
diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
index 5f9a2d8d65..ea02a2db22 100644
--- a/ext/sysvsem/sysvsem.c
+++ b/ext/sysvsem/sysvsem.c
@@ -70,7 +70,8 @@ function_entry sysvsem_functions[] = {
 /* {{{ sysvsem_module_entry
  */
 zend_module_entry sysvsem_module_entry = {
-	"sysvsem", sysvsem_functions, PHP_MINIT(sysvsem), NULL, NULL, NULL, NULL, STANDARD_MODULE_PROPERTIES
+    STANDARD_MODULE_HEADER,
+	"sysvsem", sysvsem_functions, PHP_MINIT(sysvsem), NULL, NULL, NULL, NULL, NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
 
diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index 6e80e3268a..481ce14f75 100644
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -54,10 +54,12 @@ function_entry sysvshm_functions[] = {
 /* {{{ sysvshm_module_entry
  */
 zend_module_entry sysvshm_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"sysvshm", sysvshm_functions, 
 	PHP_MINIT(sysvshm), NULL,
 	NULL, NULL,
 	NULL,
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/vpopmail/php_vpopmail.c b/ext/vpopmail/php_vpopmail.c
index 2d74e40495..79b44b8bd0 100644
--- a/ext/vpopmail/php_vpopmail.c
+++ b/ext/vpopmail/php_vpopmail.c
@@ -91,6 +91,7 @@ function_entry vpopmail_functions[] = {
 };
 
 zend_module_entry vpopmail_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"vpopmail",
 	vpopmail_functions,
 	PHP_MINIT(vpopmail),
@@ -98,6 +99,7 @@ zend_module_entry vpopmail_module_entry = {
 	PHP_RINIT(vpopmail),
 	PHP_RSHUTDOWN(vpopmail),
 	PHP_MINFO(vpopmail),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 290673e4cc..278422432c 100644
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -105,6 +105,7 @@ PHP_MINFO_FUNCTION(wddx);
 /* {{{ wddx_module_entry
  */
 zend_module_entry wddx_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"wddx",
 	wddx_functions,
 	PHP_MINIT(wddx),
@@ -112,6 +113,7 @@ zend_module_entry wddx_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(wddx),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 2f470b21e8..bb494bea1e 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -130,6 +130,7 @@ function_entry xml_functions[] = {
 };
 
 zend_module_entry xml_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"xml",                /* extension name */
 	xml_functions,        /* extension function list */
 	PHP_MINIT(xml),       /* extension-wide startup function */
@@ -137,6 +138,7 @@ zend_module_entry xml_module_entry = {
 	PHP_RINIT(xml),       /* per-request startup function */
 	PHP_RSHUTDOWN(xml),   /* per-request shutdown function */
 	PHP_MINFO(xml),       /* information function */
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index d68e355def..942a812d1d 100644
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -57,6 +57,8 @@
 #include "php_xmlrpc.h"
 #include "xmlrpc.h"
 
+#define PHP_EXT_VERSION "0.41"
+
 /* You should tweak config.m4 so this symbol (or some else suitable)
    gets defined.
 */
@@ -88,6 +90,7 @@ function_entry xmlrpc_functions[] = {
 };
 
 zend_module_entry xmlrpc_module_entry = {
+   STANDARD_MODULE_HEADER,
    "xmlrpc",
    xmlrpc_functions,
    PHP_MINIT(xmlrpc),
@@ -95,6 +98,7 @@ zend_module_entry xmlrpc_module_entry = {
    PHP_RINIT(xmlrpc),      /* Replace with NULL if there's nothing to do at request start */
    PHP_RSHUTDOWN(xmlrpc),  /* Replace with NULL if there's nothing to do at request end */
    PHP_MINFO(xmlrpc),
+   PHP_EXT_VERSION,
    STANDARD_MODULE_PROPERTIES
 };
 
@@ -135,8 +139,6 @@ typedef struct _xmlrpc_callback_data {
    char php_executed;
 } xmlrpc_callback_data;
 
-#define PHP_EXT_VERSION "0.41"
-
 // output options
 #define OUTPUT_TYPE_KEY "output_type"
 #define OUTPUT_TYPE_KEY_LEN (sizeof(OUTPUT_TYPE_KEY) - 1)
diff --git a/ext/xslt/sablot.c b/ext/xslt/sablot.c
index 5bbe97f57a..2bad8c6e81 100644
--- a/ext/xslt/sablot.c
+++ b/ext/xslt/sablot.c
@@ -95,6 +95,7 @@ function_entry xslt_functions[] = {
 /* {{{ xslt_module_entry
  */
 zend_module_entry xslt_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"xslt",
 	xslt_functions,
 	PHP_MINIT(xslt),
@@ -102,6 +103,7 @@ zend_module_entry xslt_module_entry = {
 	NULL,	
 	NULL,
 	PHP_MINFO(xslt),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/yaz/php_yaz.c b/ext/yaz/php_yaz.c
index a97e162473..7c420868ac 100644
--- a/ext/yaz/php_yaz.c
+++ b/ext/yaz/php_yaz.c
@@ -2678,6 +2678,7 @@ PHP_RINIT_FUNCTION(yaz)
 }
 
 zend_module_entry yaz_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"yaz",
 	yaz_functions,
 	PHP_MINIT(yaz),
@@ -2685,6 +2686,7 @@ zend_module_entry yaz_module_entry = {
 	PHP_RINIT(yaz),
 	PHP_RSHUTDOWN(yaz),
 	PHP_MINFO(yaz),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/yp/yp.c b/ext/yp/yp.c
index 715031fe78..8b992718a1 100644
--- a/ext/yp/yp.c
+++ b/ext/yp/yp.c
@@ -56,6 +56,7 @@ function_entry yp_functions[] = {
 };
 
 zend_module_entry yp_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"yp",
 	yp_functions,
 	PHP_MINIT(yp),
@@ -63,6 +64,7 @@ zend_module_entry yp_module_entry = {
 	PHP_RINIT(yp),
 	NULL,
 	PHP_MINFO(yp),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/zip/zip.c b/ext/zip/zip.c
index 91100888f6..2e00243d59 100644
--- a/ext/zip/zip.c
+++ b/ext/zip/zip.c
@@ -56,6 +56,7 @@ function_entry zip_functions[] = {
 /* {{{ zip_module_entry
  */
 zend_module_entry zip_module_entry = {
+    STANDARD_MODULE_HEADER,
 	"zip",
 	zip_functions,
 	PHP_MINIT(zip),
@@ -63,6 +64,7 @@ zend_module_entry zip_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(zip),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index ba6fb8d420..57fe6cf711 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -112,6 +112,7 @@ function_entry php_zlib_functions[] = {
 /* {{{ php_zlib_module_entry
  */
 zend_module_entry php_zlib_module_entry = {
+	STANDARD_MODULE_HEADER,
 	"zlib",
 	php_zlib_functions,
 	PHP_MINIT(zlib),
@@ -119,6 +120,7 @@ zend_module_entry php_zlib_module_entry = {
 	PHP_RINIT(zlib),
 	NULL,
 	PHP_MINFO(zlib),
+    NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */