Now with binary versioning goodness

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5366 e03df62e-2008-0410-955e-edbf42e46eb7

102 files changed, 122 insertions, 116 deletions

diff --git a/include/modules.h b/include/modules.h
index 5506cc214..df9497fd2 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -68,9 +68,14 @@ enum TargetTypeFlags {
 #include "mode.h"
 #include "dns.h"
 
+/** If you change the module API, change this value
+ */
+#define API_VERSION 11001
+
 class ServerConfig;
 
-// Forward-delacare module for ModuleMessage etc
+/* Forward-delacare module for ModuleMessage etc
+ */
 class Module;
 
 /** Low level definition of a FileReader classes file cache area
@@ -176,8 +181,8 @@ typedef std::map<std::string,Module*> featurelist;
 class Version : public classbase
 {
  public:
-	 const int Major, Minor, Revision, Build, Flags;
-	 Version(int major, int minor, int revision, int build, int flags);
+	 const int Major, Minor, Revision, Build, Flags, API;
+	 Version(int major, int minor, int revision, int build, int flags, int api_ver);
 };
 
 /** The ModuleMessage class is the base class of Request and Event
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 25acba68f..6801700f1 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -566,6 +566,18 @@ bool InspIRCd::LoadModule(const char* filename)
 			if ((long)factory[this->ModCount+1]->factory != -1)
 			{
 				Module* m = factory[this->ModCount+1]->factory->CreateModule(this);
+
+				Version v = m->GetVersion();
+
+				if (v.API != API_VERSION)
+				{
+					delete m;
+					delete a;
+					this->Log(DEFAULT,"Unable to load %s: Incorrect module API version: %d (our version: %d)",modfile,v.API,API_VERSION);
+					snprintf(MODERR,MAXBUF,"Loader/Linker error: Incorrect module API version: %d (our version: %d)",v.API,API_VERSION);
+					return false;
+				}
+
 				modules[this->ModCount+1] = m;
 				/* save the module and the module's classfactory, if
 				 * this isnt done, random crashes can occur :/ */
diff --git a/src/modules.cpp b/src/modules.cpp
index 2b62ba382..6d6b39d87 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -27,8 +27,8 @@
 #include "inspircd.h"
 
 // version is a simple class for holding a modules version number
-Version::Version(int major, int minor, int revision, int build, int flags)
-: Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags)
+Version::Version(int major, int minor, int revision, int build, int flags, int api_ver)
+: Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags), API(api_ver)
 {
 }
 
@@ -116,7 +116,7 @@ void		Module::OnRehash(const std::string &parameter) { }
 void		Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
 int		Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { return 0; }
 void		Module::OnMode(userrec* user, void* dest, int target_type, const std::string &text) { };
-Version		Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR); }
+Version		Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); }
 void		Module::OnOper(userrec* user, const std::string &opertype) { };
 void		Module::OnPostOper(userrec* user, const std::string &opertype) { };
 void		Module::OnInfo(userrec* user) { };
diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index d040497d3..1b8a74159 100644
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -183,7 +183,7 @@ class ModuleFilterPCRE : public Module
 	virtual Version GetVersion()
 	{
 		/* Version 1.x is the unreleased unrealircd module */
-		return Version(3,2,0,0,VF_VENDOR);
+		return Version(3,2,0,0,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 8b6efb2c6..a59ad3b6c 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -808,7 +808,7 @@ class ModuleSQL : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER);
+		return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 103c9edfc..4e316b9ec 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -657,7 +657,7 @@ public:
 		
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER);
+		return Version(1, 0, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
 	}
 	
 	virtual ~ModulePgSQL()
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index acdd5da51..4bc08dd7a 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -215,7 +215,7 @@ public:
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,1,0,VF_VENDOR);
+		return Version(1,0,1,0,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index c3130079c..bba55369b 100644
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -383,7 +383,7 @@ class ModuleSQLLog : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index e36e97cae..f961f93ff 100644
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -246,7 +246,7 @@ public:
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,1,0,VF_VENDOR);
+		return Version(1,0,1,0,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp
index 700f69e7d..55e7f2dc9 100644
--- a/src/modules/extra/m_sqlutils.cpp
+++ b/src/modules/extra/m_sqlutils.cpp
@@ -268,7 +268,7 @@ public:
 			
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER);
+		return Version(1, 0, 0, 0, VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
 	}
 	
 	virtual ~ModuleSQLutils()
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 53aad2379..4a5f45aef 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -244,7 +244,7 @@ class ModuleSSLGnuTLS : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index bb57a8467..35780ecac 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -283,7 +283,7 @@ class ModuleSSLOpenSSL : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp
index e441755fb..23314ec57 100644
--- a/src/modules/extra/m_ssl_oper_cert.cpp
+++ b/src/modules/extra/m_ssl_oper_cert.cpp
@@ -161,7 +161,7 @@ class ModuleOperSSLCert : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR);
+		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/extra/m_sslinfo.cpp b/src/modules/extra/m_sslinfo.cpp
index 185e9bf0d..1be1d8a5a 100644
--- a/src/modules/extra/m_sslinfo.cpp
+++ b/src/modules/extra/m_sslinfo.cpp
@@ -89,7 +89,7 @@ class ModuleSSLInfo : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/extra/m_testclient.cpp b/src/modules/extra/m_testclient.cpp
index cff09ba41..5a60d5b39 100644
--- a/src/modules/extra/m_testclient.cpp
+++ b/src/modules/extra/m_testclient.cpp
@@ -28,7 +28,7 @@ public:
 		
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
 	}
 	
 	virtual void OnBackgroundTimer(time_t foo)
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 6a7507f77..7c302dcda 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -88,7 +88,7 @@ class ModuleAlias : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 
 	std::string GetVar(std::string varname, const std::string &original_line)
diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index 557d2ca0c..d042f9388 100644
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -39,7 +39,7 @@ class ModuleAntiBear : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,0,0,0,VF_VENDOR,API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_antibottler.cpp b/src/modules/m_antibottler.cpp
index 9c7d75ea2..fe2556f10 100644
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.cpp
@@ -42,7 +42,7 @@ class ModuleAntiBottler : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnServerRaw(std::string &raw, bool inbound, userrec* user)
diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 5095a4e5d..1e7e93326 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -116,7 +116,7 @@ public:
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 3, VF_COMMON | VF_VENDOR);
+		return Version(1, 0, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 	virtual ~ModuleBanException()
diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 55f3d3829..cf09bfecd 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -68,7 +68,7 @@ public:
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,0,0,0,VF_VENDOR,API_VERSION);
 	}
 	
 	virtual void OnRehash(const std::string &parameter)
diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 7c98fc771..d5ba3bacf 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -109,7 +109,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
+		return Version(1,0,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index e8a05bed3..8eb9f8beb 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -115,7 +115,7 @@ class ModuleBlockColour : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
+		return Version(1,0,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 8d67c4a14..3a1096650 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -86,7 +86,7 @@ class ModuleBotMode : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
+		return Version(1,0,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnWhois(userrec* src, userrec* dst)
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 2cc893504..9a662e33f 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -199,7 +199,7 @@ class ModuleCBan : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 
 	std::string EncodeCBan(const CBan &ban)
diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index e81ee17a4..e0b453c5c 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -224,7 +224,7 @@ class ModuleCensor : public Module
 	virtual Version GetVersion()
 	{
 		// This is version 2 because version 1.x is the unreleased unrealircd module
-		return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
+		return Version(1,0,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 743e45003..09edefb82 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -414,7 +414,7 @@ public:
 	 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,0,0,0,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index f1ae55df8..3b6e85b37 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -141,7 +141,7 @@ class ModuleChanFilter : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 1, VF_COMMON | VF_VENDOR);
+		return Version(1, 0, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 	virtual ~ModuleChanFilter()
diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 0ceb1fd3f..61fb6be19 100644
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -449,7 +449,7 @@ class ModuleChanProtect : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 	virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 17ed26e3a..357c1c735 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -199,7 +199,7 @@ class ModuleCheck : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 3a80ceb1a..09265c254 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -95,7 +95,7 @@ class ModuleChgHost : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,1,VF_VENDOR);
+		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 412c3a6a5..50fd5337c 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -60,7 +60,7 @@ public:
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,0,0,0,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 29d26a9ec..6f2b4584c 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -428,7 +428,7 @@ class ModuleCloaking : public Module
 	{
 		// returns the version number of the module to be
 		// listed in /MODULES
-		return Version(1,0,0,2,VF_COMMON|VF_VENDOR);
+		return Version(1,0,0,2,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnRehash(const std::string &parameter)
diff --git a/src/modules/m_conn_lusers.cpp b/src/modules/m_conn_lusers.cpp
index 2c4f8da41..cf6d8bf37 100644
--- a/src/modules/m_conn_lusers.cpp
+++ b/src/modules/m_conn_lusers.cpp
@@ -47,7 +47,7 @@ class ModuleConnLUSERS : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 7551d32f3..04f6e3baf 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -58,7 +58,7 @@ class ModuleModesOnConnect : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 	virtual void OnPostConnect(userrec* user)
diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index 346555a1d..9b080af7a 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -146,7 +146,7 @@ class ModuleWaitPong : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 1, VF_VENDOR);
+		return Version(1, 0, 0, 1, VF_VENDOR, API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index 6a0ee948a..5f0ac299f 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -50,7 +50,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,0);
+		return Version(1,0,0,0,VF_VENDOR,API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index 611bb5e03..14c7166e6 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -50,7 +50,7 @@ class ModuleDenyChannels : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index c1f4e3bc8..2c652d20b 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -76,7 +76,7 @@ class ModuleDeVoice : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 46f5922f0..230573f68 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -164,7 +164,7 @@ class ModuleFilter : public Module
 	virtual Version GetVersion()
 	{
 		// This is version 2 because version 1.x is the unreleased unrealircd module
-		return Version(2,0,0,2,VF_VENDOR);
+		return Version(2,0,0,2,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_foobar.cpp b/src/modules/m_foobar.cpp
index 13c3477de..983fd8c4c 100644
--- a/src/modules/m_foobar.cpp
+++ b/src/modules/m_foobar.cpp
@@ -55,7 +55,7 @@ class ModuleFoobar : public Module
 		// this method instantiates a class of type Version, and returns
 		// the modules version information using it.
 	
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index eb6b85a78..0dbf9c16a 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -134,7 +134,7 @@ class ModuleGlobalLoad : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index c7889f1a7..cdfe0801f 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -71,7 +71,7 @@ class ModuleGlobops : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 1, VF_COMMON | VF_VENDOR);
+		return Version(1, 0, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 330a5d60e..120e95d8b 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -267,7 +267,7 @@ class ModuleHelpop : public Module
 	
 		virtual Version GetVersion()
 		{
-			return Version(1,0,0,1,VF_COMMON|VF_VENDOR);
+			return Version(1,0,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
 		}
 };
 
diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index 4de6a8202..9c5caf6d6 100644
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -94,7 +94,7 @@ class ModuleHostChange : public Module
 	{
 		// returns the version number of the module to be
 		// listed in /MODULES
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 	virtual void OnUserConnect(userrec* user)
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 11f8a78fd..6df26e9c0 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -425,7 +425,7 @@ class ModuleHttp : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR|VF_SERVICEPROVIDER);
+		return Version(1,0,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 24b5f7f91..5a3da04e0 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -245,7 +245,7 @@ class ModuleHttpStats : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 93fa498fc..53c13260f 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -271,7 +271,7 @@ class ModuleIdent : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,5,0,0,VF_VENDOR);
+		return Version(1,5,0,0,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 6c697e152..ea7d781b5 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -112,7 +112,7 @@ public:
 		
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 3, VF_VENDOR | VF_COMMON);
+		return Version(1, 0, 0, 3, VF_VENDOR | VF_COMMON, API_VERSION);
 	}
 
 	~ModuleInviteException()
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index c1c50f2d4..23f26647f 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -284,7 +284,7 @@ class ModuleJoinFlood : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 56322507c..d1237a7e6 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -212,7 +212,7 @@ public:
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 1e490ad12..b8f712fd1 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -133,7 +133,7 @@ class ModuleKnock : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_COMMON|VF_VENDOR);
+		return Version(1,0,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 52174792f..0421226d6 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -285,7 +285,7 @@ class ModuleMsgFlood : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 27bef92f5..a7b5aaa63 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -45,7 +45,7 @@ class ModuleNamesX : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 
         virtual void On005Numeric(std::string &output)
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index d44cc29ac..304065007 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -120,7 +120,7 @@ class ModuleNickLock : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 651c4acd5..14dc3199e 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -106,7 +106,7 @@ class ModuleNoCTCP : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
+		return Version(1,0,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index ea76cc023..2ed348dae 100644
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -85,7 +85,7 @@ class ModuleNoInvite : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
+		return Version(1,0,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index f3f5d537a..f776830bb 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -104,7 +104,7 @@ class ModuleNoKicks : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
+		return Version(1,0,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 338c472f5..99bb27de7 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -73,7 +73,7 @@ class ModuleNoNickChange : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_COMMON|VF_VENDOR);
+		return Version(1,0,0,1,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 8e03f2bca..feb8de98c 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -100,7 +100,7 @@ class ModuleNoNotice : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
+		return Version(1,0,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 29ce267bc..97fd9ac73 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -94,7 +94,7 @@ class ModuleOperChans : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR|VF_COMMON);
+		return Version(1,0,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 67512815d..9f9df9d42 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -65,7 +65,7 @@ class ModuleOperjoin : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version(1,0,0,1,VF_VENDOR);
+			return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 		}
 
 		virtual void OnPostOper(userrec* user, const std::string &opertype)
diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index ab4fee21f..279324111 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -47,7 +47,7 @@ class ModuleOperLevels : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version(1,0,0,1,VF_VENDOR);
+			return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 		}
 
 		virtual int OnKill(userrec* source, userrec* dest, const std::string &reason)
diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index 9b3028bd3..042cdf026 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -40,7 +40,7 @@ class ModuleOperLog : public Module
  
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,0,0,0,VF_VENDOR,API_VERSION);
 	}
  
 	void Implements(char* List)
diff --git a/src/modules/m_opermd5.cpp b/src/modules/m_opermd5.cpp
index 7a6610eca..4406afdcf 100644
--- a/src/modules/m_opermd5.cpp
+++ b/src/modules/m_opermd5.cpp
@@ -325,7 +325,7 @@ class ModuleOperMD5 : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index e0ae8209f..4f1f07459 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -58,7 +58,7 @@ class ModuleModesOnOper : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 	virtual void OnPostOper(userrec* user, const std::string &opertype)
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 2ab3e7dee..aa22a77a5 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -81,7 +81,7 @@ class ModuleOpermotd : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_opersha256.cpp b/src/modules/m_opersha256.cpp
index 44b2c936d..01452a2e1 100644
--- a/src/modules/m_opersha256.cpp
+++ b/src/modules/m_opersha256.cpp
@@ -284,7 +284,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 1, 0);
+		return Version(1, 0, 0, 1, VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index a4aac46d5..50b2cfce8 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -301,7 +301,7 @@ class ModuleOverride : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index b68eb5aa5..3163d37a0 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -125,7 +125,7 @@ class ModuleRandQuote : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 	virtual void OnUserConnect(userrec* user)
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 2abdabb9a..cf118ca3c 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -145,7 +145,7 @@ class ModuleRedirect : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index eeb5ee1a1..fd85ba280 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -298,7 +298,7 @@ class ModuleRemove : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,1,0,VF_VENDOR);
+		return Version(1,0,1,0,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 03d28c3ac..a4d0cc803 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -86,7 +86,7 @@ class ModuleRestrictChans : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index 8e10e2457..b23b3f248 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -76,7 +76,7 @@ class ModuleRestrictMsg : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 28d4ebd85..362988d61 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -157,7 +157,7 @@ class ModuleSafeList : public Module
  
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,0,0,0,VF_VENDOR,API_VERSION);
 	}
  
 	void Implements(char* List)
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index b305033c9..063f52e95 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -102,7 +102,7 @@ class ModuleSajoin : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 781875594..6491c9a3a 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -85,7 +85,7 @@ class ModuleSaMode : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,2,2,VF_VENDOR);
+		return Version(1,0,2,2,VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 9f967bb0b..e974e3eb5 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -93,7 +93,7 @@ class ModuleSanick : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index b5f97a66a..20201790b 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -98,7 +98,7 @@ class ModuleSapart : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 615ba5934..54eaf7ea8 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -92,7 +92,7 @@ class ModuleSaquit : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index f059c1038..c1315572d 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -41,7 +41,7 @@ class ModuleSecureList : public Module
  
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,0,0,0,VF_VENDOR,API_VERSION);
 	}
  
 	void Implements(char* List)
diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index d783952db..fb8b0d255 100644
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -306,7 +306,7 @@ class ModuleServices : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
+		return Version(1,0,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 66e1898d3..ca5b1c892 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -321,7 +321,7 @@ class ModuleServicesAccount : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
+		return Version(1,0,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index fb3d68529..3ec9fc4ca 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -85,7 +85,7 @@ class ModuleSetHost : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index dead4a393..2bcdceeb1 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -1,13 +1,9 @@
 #include "users.h"
 #include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETIDENT command */
 
-
-
-
 class cmd_setident : public command_t
 {
  public:
@@ -54,7 +50,7 @@ class ModuleSetIdent : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,0,0,0,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index dd8ad7560..6b8754311 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -21,13 +21,10 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Allows opers to set their idle time */
 
-
-
 class cmd_setidle : public command_t
 {
  public:
@@ -74,9 +71,8 @@ class ModuleSetIdle : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
-	
 };
 
 // stuff down here is the module-factory stuff. For basic modules you can ignore this.
diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index b590bdcdc..41dcd15bf 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -70,7 +70,7 @@ class ModuleSetName : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index bdf3a9ba8..d1d61ae61 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -72,7 +72,7 @@ class ModuleShowwhois : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,3,VF_COMMON|VF_VENDOR);
+		return Version(1,0,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnWhois(userrec* source, userrec* dest)
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index bbb3d79ac..4acc1b77c 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -211,7 +211,7 @@ class ModuleSilence : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index fc98ad701..2f4f0a801 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -4855,7 +4855,7 @@ class ModuleSpanningTree : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1,1,0,2,VF_STATIC|VF_VENDOR,API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index 1698b16e2..e47a91799 100644
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -146,7 +146,7 @@ class ModuleSpy : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_ssl_dummy.cpp b/src/modules/m_ssl_dummy.cpp
index 4b3390c8d..fadccae1e 100644
--- a/src/modules/m_ssl_dummy.cpp
+++ b/src/modules/m_ssl_dummy.cpp
@@ -38,7 +38,7 @@ class ModuleSSLDummy : public Module
 		
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 1d48d99ad..b2d86fe44 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -115,7 +115,7 @@ class ModuleSSLModes : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index fd149e5f2..7e4cf6e0e 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -205,8 +205,7 @@ class ModuleStripColor : public Module
 	
 	virtual Version GetVersion()
 	{
-		// This is version 2 because version 1.x is the unreleased unrealircd module
-		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index b66bc867e..331383b68 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -198,7 +198,7 @@ class ModuleSVSHold : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR|VF_COMMON);
+		return Version(1,0,0,1,VF_VENDOR|VF_COMMON,API_VERSION);
 	}
 
 	std::string EncodeSVSHold(const SVSHold &ban)
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 4b62db699..3b28716ff 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -223,7 +223,7 @@ class ModuleSWhois : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,0,0,0,VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_testcommand.cpp b/src/modules/m_testcommand.cpp
index bc268c34b..4f5d3a244 100644
--- a/src/modules/m_testcommand.cpp
+++ b/src/modules/m_testcommand.cpp
@@ -112,7 +112,7 @@ class ModuleTestCommand : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index a1f4411c3..4c58306f5 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -204,7 +204,7 @@ class ModuleTimedBans : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,0,0,0,VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index bde4737a7..2635d2b12 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -97,7 +97,7 @@ class ModuleTLine : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_VENDOR,API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index b967b3496..792429ce0 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -107,7 +107,7 @@ class ModuleUninvite : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_VENDOR, API_VERSION);
 	}
 };
 
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 033bb0ada..6f7a50453 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -86,7 +86,7 @@ class ModuleUserIP : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index eb6c3e38e..09a045564 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -91,9 +91,7 @@ class ModuleVHost : public Module
 	
 	virtual Version GetVersion()
 	{
-		// returns the version number of the module to be
-		// listed in /MODULES
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 	
 };
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 09dc8d384..ed56f7b8b 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -310,7 +310,7 @@ class Modulewatch : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version(1,0,0,1,VF_VENDOR,API_VERSION);
 	}
 };