cleanup mod version macros and mod defs, round x

51 files changed, 99 insertions, 48 deletions

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 6e37f18287..9beb72890f 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -762,7 +762,7 @@ zend_module_entry pgsql_module_entry = {
 	PHP_RINIT(pgsql),
 	PHP_RSHUTDOWN(pgsql),
 	PHP_MINFO(pgsql),
-	NO_VERSION_YET,
+	PHP_PGSQL_VERSION,
 	PHP_MODULE_GLOBALS(pgsql),
 	PHP_GINIT(pgsql),
 	NULL,
diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h
index 3e5fcbe851..1b31c75b31 100644
--- a/ext/pgsql/php_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@@ -29,6 +29,9 @@
 extern zend_module_entry pgsql_module_entry;
 #define pgsql_module_ptr &pgsql_module_entry
 
+#include "php_version.h"
+#define PHP_PGSQL_VERSION PHP_VERSION
+
 #ifdef PHP_PGSQL_PRIVATE
 #undef SOCKET_SIZE_TYPE
 #include <libpq-fe.h>
diff --git a/ext/posix/php_posix.h b/ext/posix/php_posix.h
index de42574b8d..ced4afe2c6 100644
--- a/ext/posix/php_posix.h
+++ b/ext/posix/php_posix.h
@@ -34,6 +34,9 @@
 extern zend_module_entry posix_module_entry;
 #define posix_module_ptr &posix_module_entry
 
+#include "php_version.h"
+#define PHP_POSIX_VERSION PHP_VERSION
+
 /* POSIX.1, 3.3 */
 PHP_FUNCTION(posix_kill);
 
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 6a0d4ccc3a..12fb3f3e36 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -360,7 +360,7 @@ zend_module_entry posix_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(posix),
-	NO_VERSION_YET,
+	PHP_POSIX_VERSION,
 	PHP_MODULE_GLOBALS(posix),
 	PHP_GINIT(posix),
 	NULL,
diff --git a/ext/pspell/php_pspell.h b/ext/pspell/php_pspell.h
index 754ebc71ba..1f6e3cfcbf 100644
--- a/ext/pspell/php_pspell.h
+++ b/ext/pspell/php_pspell.h
@@ -23,6 +23,10 @@
 #if HAVE_PSPELL
 extern zend_module_entry pspell_module_entry;
 #define pspell_module_ptr &pspell_module_entry
+
+#include "php_version.h"
+#define PHP_PSPELL_VERSION PHP_VERSION
+
 #else
 #define pspell_module_ptr NULL
 #endif
diff --git a/ext/pspell/pspell.c b/ext/pspell/pspell.c
index 0e9b5c4371..a7c42f7621 100644
--- a/ext/pspell/pspell.c
+++ b/ext/pspell/pspell.c
@@ -206,7 +206,7 @@ static int le_pspell, le_pspell_config;
 
 zend_module_entry pspell_module_entry = {
     STANDARD_MODULE_HEADER,
-	"pspell", pspell_functions, PHP_MINIT(pspell), NULL, NULL, NULL, PHP_MINFO(pspell), NO_VERSION_YET, STANDARD_MODULE_PROPERTIES
+	"pspell", pspell_functions, PHP_MINIT(pspell), NULL, NULL, NULL, PHP_MINFO(pspell), PHP_PSPELL_VERSION, STANDARD_MODULE_PROPERTIES
 };
 
 #ifdef COMPILE_DL_PSPELL
diff --git a/ext/readline/php_readline.h b/ext/readline/php_readline.h
index 136f4450b4..dac79f04e7 100644
--- a/ext/readline/php_readline.h
+++ b/ext/readline/php_readline.h
@@ -29,6 +29,9 @@
 extern zend_module_entry readline_module_entry;
 #define phpext_readline_ptr &readline_module_entry
 
+#include "php_version.h"
+#define PHP_READLINE_VERSION PHP_VERSION
+
 #else
 
 #define phpext_readline_ptr NULL
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 84b5bd3d66..3d49f6e96d 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -160,7 +160,7 @@ zend_module_entry readline_module_entry = {
 	NULL,
 	PHP_RSHUTDOWN(readline),
 	PHP_MINFO(readline),
-	PHP_VERSION,
+	PHP_READLINE_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 
diff --git a/ext/recode/php_recode.h b/ext/recode/php_recode.h
index 69931b5718..83c021f701 100644
--- a/ext/recode/php_recode.h
+++ b/ext/recode/php_recode.h
@@ -26,6 +26,9 @@
 extern zend_module_entry recode_module_entry;
 #define phpext_recode_ptr &recode_module_entry
 
+#include "php_version.h"
+#define PHP_RECODE_VERSION PHP_VERSION
+
 PHP_MINIT_FUNCTION(recode);
 PHP_MSHUTDOWN_FUNCTION(recode);
 PHP_MINFO_FUNCTION(recode);
diff --git a/ext/recode/recode.c b/ext/recode/recode.c
index 7d9233a374..d945431636 100644
--- a/ext/recode/recode.c
+++ b/ext/recode/recode.c
@@ -96,7 +96,7 @@ zend_module_entry recode_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(recode),
-	NO_VERSION_YET,
+	PHP_RECODE_VERSION,
 	PHP_MODULE_GLOBALS(recode),
 	PHP_GINIT(recode),
 	NULL,
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 72a88be47c..e78410ec71 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -6233,7 +6233,7 @@ zend_module_entry reflection_module_entry = { /* {{{ */
 	NULL,
 	NULL,
 	PHP_MINFO(reflection),
-	"$Id$",
+	PHP_REFLECTION_VERSION,
 	STANDARD_MODULE_PROPERTIES
 }; /* }}} */
 
diff --git a/ext/reflection/php_reflection.h b/ext/reflection/php_reflection.h
index 0579e5a8a7..1bb47b16c8 100644
--- a/ext/reflection/php_reflection.h
+++ b/ext/reflection/php_reflection.h
@@ -26,6 +26,8 @@
 extern zend_module_entry reflection_module_entry;
 #define phpext_reflection_ptr &reflection_module_entry
 
+#define PHP_REFLECTION_VERSION PHP_VERSION
+
 BEGIN_EXTERN_C()
 
 /* Class entry pointers */
diff --git a/ext/session/php_session.h b/ext/session/php_session.h
index b575ca0812..c6734acfa9 100644
--- a/ext/session/php_session.h
+++ b/ext/session/php_session.h
@@ -29,6 +29,9 @@
 
 #define PHP_SESSION_API 20150121
 
+#include "php_version.h"
+#define PHP_SESSION_VERSION PHP_VERSION
+
 /* save handler macros */
 #define PS_NUM_APIS      9
 #define PS_OPEN_ARGS     void **mod_data, const char *save_path, const char *session_name
diff --git a/ext/session/session.c b/ext/session/session.c
index 0ddf6003bb..b1582c0e8a 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -3015,7 +3015,7 @@ zend_module_entry session_module_entry = {
 	PHP_MINIT(session), PHP_MSHUTDOWN(session),
 	PHP_RINIT(session), PHP_RSHUTDOWN(session),
 	PHP_MINFO(session),
-	NO_VERSION_YET,
+	PHP_SESSION_VERSION,
 	PHP_MODULE_GLOBALS(ps),
 	PHP_GINIT(ps),
 	NULL,
diff --git a/ext/shmop/php_shmop.h b/ext/shmop/php_shmop.h
index 8cb5144001..805f3a380c 100644
--- a/ext/shmop/php_shmop.h
+++ b/ext/shmop/php_shmop.h
@@ -24,6 +24,9 @@
 extern zend_module_entry shmop_module_entry;
 #define phpext_shmop_ptr &shmop_module_entry
 
+#include "php_version.h"
+#define PHP_SHMOP_VERSION PHP_VERSION
+
 PHP_MINIT_FUNCTION(shmop);
 PHP_MINFO_FUNCTION(shmop);
 
diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c
index 751cb05c0d..1b77c35f26 100644
--- a/ext/shmop/shmop.c
+++ b/ext/shmop/shmop.c
@@ -102,7 +102,7 @@ zend_module_entry shmop_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(shmop),
-	NO_VERSION_YET,
+	PHP_SHMOP_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/simplexml/php_simplexml.h b/ext/simplexml/php_simplexml.h
index 3398232539..1dec6796de 100644
--- a/ext/simplexml/php_simplexml.h
+++ b/ext/simplexml/php_simplexml.h
@@ -24,6 +24,9 @@
 extern zend_module_entry simplexml_module_entry;
 #define phpext_simplexml_ptr &simplexml_module_entry
 
+#include "php_version.h"
+#define PHP_SIMPLEXML_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index b125d16f71..ee21bbfbeb 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -2524,7 +2524,7 @@ zend_module_entry simplexml_module_entry = { /* {{{ */
 	NULL,
 	NULL,
 	PHP_MINFO(simplexml),
-	"0.1",
+	PHP_SIMPLEXML_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index e7cb87096e..8e89c4d4f9 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -2470,13 +2470,9 @@ static const zend_module_dep snmp_module_deps[] = {
 /* {{{ snmp_module_entry
  */
 zend_module_entry snmp_module_entry = {
-#if ZEND_MODULE_API_NO >= 20050922
 	STANDARD_MODULE_HEADER_EX,
 	NULL,
 	snmp_module_deps,
-#else
-	STANDARD_MODULE_HEADER,
-#endif
 	"snmp",
 	snmp_functions,
 	PHP_MINIT(snmp),
diff --git a/ext/soap/php_soap.h b/ext/soap/php_soap.h
index 02b734cd3c..ea3b54ce4d 100644
--- a/ext/soap/php_soap.h
+++ b/ext/soap/php_soap.h
@@ -35,9 +35,7 @@
 #include <libxml/parser.h>
 #include <libxml/xpath.h>
 
-#ifndef PHP_HAVE_STREAMS
-# error You lose - must be compiled against PHP 4.3.0 or later
-#endif
+#define PHP_SOAP_VERSION PHP_VERSION
 
 #ifndef PHP_WIN32
 # define TRUE 1
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index ccfb951333..ec4a5fd4c4 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -460,7 +460,7 @@ zend_module_entry soap_module_entry = {
   NULL,
   PHP_MINFO(soap),
 #ifdef STANDARD_MODULE_HEADER
-  NO_VERSION_YET,
+  PHP_SOAP_VERSION,
 #endif
   STANDARD_MODULE_PROPERTIES,
 };
diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index 366a34dfec..2e90e120a4 100644
--- a/ext/sockets/php_sockets.h
+++ b/ext/sockets/php_sockets.h
@@ -35,6 +35,8 @@
 # include "windows_common.h"
 #endif
 
+#define PHP_SOCKETS_VERSION PHP_VERSION
+
 extern zend_module_entry sockets_module_entry;
 #define phpext_sockets_ptr &sockets_module_entry
 
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 5f6c17af9a..45f7c25096 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -360,7 +360,7 @@ zend_module_entry sockets_module_entry = {
 	NULL,
 	PHP_RSHUTDOWN(sockets),
 	PHP_MINFO(sockets),
-	NO_VERSION_YET,
+	PHP_SOCKETS_VERSION,
 	PHP_MODULE_GLOBALS(sockets),
 	PHP_GINIT(sockets),
 	NULL,
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index 78bdd6744f..917411ab6f 100644
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -956,7 +956,7 @@ zend_module_entry spl_module_entry = {
 	PHP_RINIT(spl),
 	PHP_RSHUTDOWN(spl),
 	PHP_MINFO(spl),
-	"0.2",
+	PHP_SPL_VERSION,
 	PHP_MODULE_GLOBALS(spl),
 	PHP_GINIT(spl),
 	NULL,
diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h
index 5a0f4be384..015ada4ac2 100644
--- a/ext/spl/php_spl.h
+++ b/ext/spl/php_spl.h
@@ -22,6 +22,8 @@
 #include "php.h"
 #include <stdarg.h>
 
+#define PHP_SPL_VERSION PHP_VERSION
+
 #if 0
 #define SPL_DEBUG(x)	x
 #else
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 5c103df735..4c3e833188 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3372,7 +3372,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 */
+	PHP_STANDARD_VERSION,		/* extension version */
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/standard/php_standard.h b/ext/standard/php_standard.h
index 9038c9de45..545406bef7 100644
--- a/ext/standard/php_standard.h
+++ b/ext/standard/php_standard.h
@@ -60,6 +60,9 @@
 #include "php_type.h"
 #include "php_password.h"
 
+#include "php_version.h"
+#define PHP_STANDARD_VERSION PHP_VERSION
+
 #define phpext_standard_ptr basic_functions_module_ptr
 PHP_MINIT_FUNCTION(standard_filters);
 PHP_MSHUTDOWN_FUNCTION(standard_filters);
diff --git a/ext/sysvmsg/php_sysvmsg.h b/ext/sysvmsg/php_sysvmsg.h
index 6a32734910..8ee9aa97db 100644
--- a/ext/sysvmsg/php_sysvmsg.h
+++ b/ext/sysvmsg/php_sysvmsg.h
@@ -26,6 +26,9 @@
 extern zend_module_entry sysvmsg_module_entry;
 #define phpext_sysvmsg_ptr &sysvmsg_module_entry
 
+#include "php_version.h"
+#define PHP_SYSVMSG_VERSION PHP_VERSION
+
 #ifndef __USE_GNU
 /* we want to use mtype instead of __mtype */
 #define __USE_GNU
diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c
index 7f4682c92e..80fd7e940f 100644
--- a/ext/sysvmsg/sysvmsg.c
+++ b/ext/sysvmsg/sysvmsg.c
@@ -110,7 +110,7 @@ zend_module_entry sysvmsg_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(sysvmsg),
-	NO_VERSION_YET,
+	PHP_SYSVMSG_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/sysvsem/php_sysvsem.h b/ext/sysvsem/php_sysvsem.h
index adca9fd3c2..f7a40b5677 100644
--- a/ext/sysvsem/php_sysvsem.h
+++ b/ext/sysvsem/php_sysvsem.h
@@ -26,6 +26,9 @@
 extern zend_module_entry sysvsem_module_entry;
 #define sysvsem_module_ptr &sysvsem_module_entry
 
+#include "php_version.h"
+#define PHP_SYSVSEM_VERSION PHP_VERSION
+
 PHP_MINIT_FUNCTION(sysvsem);
 PHP_FUNCTION(sem_get);
 PHP_FUNCTION(sem_acquire);
diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
index 647d59191c..3b3290a7de 100644
--- a/ext/sysvsem/sysvsem.c
+++ b/ext/sysvsem/sysvsem.c
@@ -100,7 +100,7 @@ zend_module_entry sysvsem_module_entry = {
 	NULL,
 	NULL,
 	NULL,
-	NO_VERSION_YET,
+	PHP_SYSVSEM_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/sysvshm/php_sysvshm.h b/ext/sysvshm/php_sysvshm.h
index edd4e6dbc6..72e09b71ec 100644
--- a/ext/sysvshm/php_sysvshm.h
+++ b/ext/sysvshm/php_sysvshm.h
@@ -26,6 +26,9 @@
 extern zend_module_entry sysvshm_module_entry;
 #define sysvshm_module_ptr &sysvshm_module_entry
 
+#include "php_version.h"
+#define PHP_SYSVSHM_VERSION PHP_VERSION
+
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index fb03e950db..ac90b47496 100644
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -101,7 +101,7 @@ zend_module_entry sysvshm_module_entry = {
 	NULL,
 	NULL,
 	NULL,
-	NO_VERSION_YET,
+	PHP_SYSVSHM_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/tidy/php_tidy.h b/ext/tidy/php_tidy.h
index 8f4ecf8750..76d42e4566 100644
--- a/ext/tidy/php_tidy.h
+++ b/ext/tidy/php_tidy.h
@@ -24,6 +24,9 @@
 extern zend_module_entry tidy_module_entry;
 #define phpext_tidy_ptr &tidy_module_entry
 
+#include "php_version.h"
+#define PHP_TIDY_VERSION PHP_VERSION
+
 #define TIDY_METHOD_MAP(name, func_name, arg_types) \
 	ZEND_NAMED_FE(name, ZEND_FN(func_name), arg_types)
 #define TIDY_NODE_METHOD(name)    PHP_FUNCTION(tnm_ ##name)
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 5985957990..f6b987d5b2 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -38,8 +38,6 @@
 #define TIDY_CALL
 #endif
 
-#define PHP_TIDY_MODULE_VERSION	"2.0"
-
 /* {{{ ext/tidy macros
 */
 #define FIX_BUFFER(bptr) do { if ((bptr)->size) { (bptr)->bp[(bptr)->size-1] = '\0'; } } while(0)
@@ -458,7 +456,7 @@ zend_module_entry tidy_module_entry = {
 	PHP_RINIT(tidy),
 	NULL,
 	PHP_MINFO(tidy),
-	PHP_TIDY_MODULE_VERSION,
+	PHP_TIDY_VERSION,
 	PHP_MODULE_GLOBALS(tidy),
 	NULL,
 	NULL,
@@ -1077,7 +1075,7 @@ static PHP_MINFO_FUNCTION(tidy)
 	php_info_print_table_start();
 	php_info_print_table_header(2, "Tidy support", "enabled");
 	php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate());
-	php_info_print_table_row(2, "Extension Version", PHP_TIDY_MODULE_VERSION " ($Id$)");
+	php_info_print_table_row(2, "Extension Version", PHP_TIDY_VERSION " ($Id$)");
 	php_info_print_table_end();
 
 	DISPLAY_INI_ENTRIES();
diff --git a/ext/tokenizer/php_tokenizer.h b/ext/tokenizer/php_tokenizer.h
index 3097f115da..ec042192fc 100644
--- a/ext/tokenizer/php_tokenizer.h
+++ b/ext/tokenizer/php_tokenizer.h
@@ -24,6 +24,9 @@
 extern zend_module_entry tokenizer_module_entry;
 #define phpext_tokenizer_ptr &tokenizer_module_entry
 
+#include "php_version.h"
+#define PHP_TOKENIZER_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c
index aaab111c6a..52095d077d 100644
--- a/ext/tokenizer/tokenizer.c
+++ b/ext/tokenizer/tokenizer.c
@@ -61,9 +61,7 @@ const zend_function_entry tokenizer_functions[] = {
 /* {{{ tokenizer_module_entry
  */
 zend_module_entry tokenizer_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
 	STANDARD_MODULE_HEADER,
-#endif
 	"tokenizer",
 	tokenizer_functions,
 	PHP_MINIT(tokenizer),
@@ -71,9 +69,7 @@ zend_module_entry tokenizer_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(tokenizer),
-#if ZEND_MODULE_API_NO >= 20010901
-	"0.1", /* Replace with version number for your extension */
-#endif
+	PHP_TOKENIZER_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/wddx/php_wddx.h b/ext/wddx/php_wddx.h
index c9a7598f83..480f4c0488 100644
--- a/ext/wddx/php_wddx.h
+++ b/ext/wddx/php_wddx.h
@@ -26,6 +26,9 @@
 extern zend_module_entry wddx_module_entry;
 #define wddx_module_ptr &wddx_module_entry
 
+#include "php_version.h"
+#define PHP_WDDX_VERSION PHP_VERSION
+
 PHP_FUNCTION(wddx_serialize_value);
 PHP_FUNCTION(wddx_serialize_vars);
 PHP_FUNCTION(wddx_packet_start);
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 235efcdd18..c0dc964e57 100644
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -163,7 +163,7 @@ zend_module_entry wddx_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(wddx),
-    NO_VERSION_YET,
+    PHP_WDDX_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/xml/php_xml.h b/ext/xml/php_xml.h
index 44815d979c..c8eb3cf6d1 100644
--- a/ext/xml/php_xml.h
+++ b/ext/xml/php_xml.h
@@ -26,6 +26,10 @@
 #ifdef HAVE_XML
 extern zend_module_entry xml_module_entry;
 #define xml_module_ptr &xml_module_entry
+
+#include "php_version.h"
+#define PHP_XML_VERSION PHP_VERSION
+
 #else
 #define xml_module_ptr NULL
 #endif
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index f5756ef0b3..386d8ed587 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -265,7 +265,7 @@ zend_module_entry xml_module_entry = {
 	NULL,                 /* per-request startup function */
 	NULL,                 /* per-request shutdown function */
 	PHP_MINFO(xml),       /* information function */
-    NO_VERSION_YET,
+    PHP_XML_VERSION,
     PHP_MODULE_GLOBALS(xml), /* globals descriptor */
     PHP_GINIT(xml),          /* globals ctor */
     NULL,                    /* globals dtor */
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index 338682702e..f636903e90 100644
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -332,7 +332,7 @@ zend_module_entry xmlreader_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(xmlreader),
-	"0.1", /* Replace with version number for your extension */
+	PHP_XMLREADER_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/xmlreader/php_xmlreader.h b/ext/xmlreader/php_xmlreader.h
index 3f7bf3d64e..c5cc22cf57 100644
--- a/ext/xmlreader/php_xmlreader.h
+++ b/ext/xmlreader/php_xmlreader.h
@@ -24,6 +24,9 @@
 extern zend_module_entry xmlreader_module_entry;
 #define phpext_xmlreader_ptr &xmlreader_module_entry
 
+#include "php_version.h"
+#define PHP_XMLREADER_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/xmlrpc/php_xmlrpc.h b/ext/xmlrpc/php_xmlrpc.h
index e153cc57d7..2adfb71346 100644
--- a/ext/xmlrpc/php_xmlrpc.h
+++ b/ext/xmlrpc/php_xmlrpc.h
@@ -61,6 +61,9 @@
 extern zend_module_entry xmlrpc_module_entry;
 #define phpext_xmlrpc_ptr &xmlrpc_module_entry
 
+#include "php_version.h"
+#define PHP_XMLRPC_VERSION PHP_VERSION
+
 PHP_MINIT_FUNCTION(xmlrpc);
 PHP_MINFO_FUNCTION(xmlrpc);
 
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index 228cbc4c03..1d3de75d6d 100644
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -73,8 +73,6 @@
 #include "php_xmlrpc.h"
 #include "xmlrpc.h"
 
-#define PHP_EXT_VERSION "0.51"
-
 static int le_xmlrpc_server;
 
 /* {{{ arginfo */
@@ -170,7 +168,7 @@ zend_module_entry xmlrpc_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(xmlrpc),
-	PHP_EXT_VERSION,
+	PHP_XMLRPC_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 
@@ -300,7 +298,7 @@ PHP_MINFO_FUNCTION(xmlrpc)
 {
 	php_info_print_table_start();
 	php_info_print_table_row(2, "core library version", XMLRPC_GetVersionString());
-	php_info_print_table_row(2, "php extension version", PHP_EXT_VERSION);
+	php_info_print_table_row(2, "php extension version", PHP_XMLRPC_VERSION);
 	php_info_print_table_row(2, "author", "Dan Libby");
 	php_info_print_table_row(2, "homepage", "http://xmlrpc-epi.sourceforge.net");
 	php_info_print_table_row(2, "open sourced by", "Epinions.com");
diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c
index f2e458f64f..122ed0c31e 100644
--- a/ext/xmlwriter/php_xmlwriter.c
+++ b/ext/xmlwriter/php_xmlwriter.c
@@ -664,7 +664,7 @@ zend_module_entry xmlwriter_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(xmlwriter),
-	"0.1",
+	PHP_XMLWRITER_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/xmlwriter/php_xmlwriter.h b/ext/xmlwriter/php_xmlwriter.h
index 5e6723b5a9..ff4a6b8617 100644
--- a/ext/xmlwriter/php_xmlwriter.h
+++ b/ext/xmlwriter/php_xmlwriter.h
@@ -25,6 +25,9 @@
 extern zend_module_entry xmlwriter_module_entry;
 #define phpext_xmlwriter_ptr &xmlwriter_module_entry
 
+#include "php_version.h"
+#define PHP_XMLWRITER_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c
index d89b4cbd33..60338bb997 100644
--- a/ext/xsl/php_xsl.c
+++ b/ext/xsl/php_xsl.c
@@ -47,12 +47,8 @@ static const zend_module_dep xsl_deps[] = {
 /* {{{ xsl_module_entry
  */
 zend_module_entry xsl_module_entry = {
-#if ZEND_MODULE_API_NO >= 20050617
 	STANDARD_MODULE_HEADER_EX, NULL,
 	xsl_deps,
-#elif ZEND_MODULE_API_NO >= 20010901
-	STANDARD_MODULE_HEADER,
-#endif
 	"xsl",
 	xsl_functions,
 	PHP_MINIT(xsl),
@@ -60,9 +56,7 @@ zend_module_entry xsl_module_entry = {
 	NULL,
 	NULL,
 	PHP_MINFO(xsl),
-#if ZEND_MODULE_API_NO >= 20010901
-	"0.1", /* Replace with version number for your extension */
-#endif
+	PHP_XSL_VERSION,
 	STANDARD_MODULE_PROPERTIES
 };
 /* }}} */
diff --git a/ext/xsl/php_xsl.h b/ext/xsl/php_xsl.h
index 38715eb8af..4250ae83d6 100644
--- a/ext/xsl/php_xsl.h
+++ b/ext/xsl/php_xsl.h
@@ -24,6 +24,9 @@
 extern zend_module_entry xsl_module_entry;
 #define phpext_xsl_ptr &xsl_module_entry
 
+#include "php_version.h"
+#define PHP_XSL_VERSION PHP_VERSION
+
 #ifdef ZTS
 #include "TSRM.h"
 #endif
diff --git a/ext/zlib/php_zlib.h b/ext/zlib/php_zlib.h
index 2a8e443eba..6da5e2e543 100644
--- a/ext/zlib/php_zlib.h
+++ b/ext/zlib/php_zlib.h
@@ -23,6 +23,9 @@
 #ifndef PHP_ZLIB_H
 #define PHP_ZLIB_H
 
+#include "php_version.h"
+#define PHP_ZLIB_VERSION PHP_VERSION
+
 #include <zlib.h>
 
 #define PHP_ZLIB_ENCODING_RAW		-0xf
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index b638ab4377..0cb94fe6e4 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -1037,7 +1037,7 @@ zend_module_entry php_zlib_module_entry = {
 	PHP_RINIT(zlib),
 	PHP_RSHUTDOWN(zlib),
 	PHP_MINFO(zlib),
-	"2.0",
+	PHP_ZLIB_VERSION,
 	PHP_MODULE_GLOBALS(zlib),
 	PHP_GINIT(zlib),
 	NULL,