5 files changed, 5 insertions, 122 deletions
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 817057b87..55f035c36 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -486,25 +486,4 @@ class ModuleDCCAllow : public Module
 	}
 };
 
-class ModuleDCCAllowFactory : public ModuleFactory
-{
- public:
-	ModuleDCCAllowFactory()
-	{
-	}
-
-	~ModuleDCCAllowFactory()
-	{
-	}
-
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleDCCAllow(Me);
-	}
-
-};
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleDCCAllowFactory;
-}
+MODULE_INIT(ModuleDCCAllow);
diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 20a2e0f3d..423fe9c55 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -132,28 +132,4 @@ class ModuleDeaf : public Module
 
 };
 
-
-class ModuleDeafFactory : public ModuleFactory
-{
- public:
-	ModuleDeafFactory()
-	{
-	}
-	
-	~ModuleDeafFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleDeaf(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleDeafFactory;
-}
-
+MODULE_INIT(ModuleDeaf);
diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index 3b3cd50fa..0ce9c3d75 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -77,29 +77,4 @@ class ModuleDenyChannels : public Module
 	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleDenyChannelsFactory : public ModuleFactory
-{
- public:
-	ModuleDenyChannelsFactory()
-	{
-	}
-	
-	~ModuleDenyChannelsFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleDenyChannels(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleDenyChannelsFactory;
-}
-
+MODULE_INIT(ModuleDenyChannels);
diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index 37ad8e4c6..7c1ffe965 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -78,27 +78,4 @@ class ModuleDeVoice : public Module
 	}
 };
 
-
-class ModuleDeVoiceFactory : public ModuleFactory
-{
- public:
-	ModuleDeVoiceFactory()
-	{
-	}
-
-	~ModuleDeVoiceFactory()
-	{
-	}
-
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleDeVoice(Me);
-	}
-
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleDeVoiceFactory;
-}
+MODULE_INIT(ModuleDeVoice);
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 7ff0fcdc3..54d2cf697 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -350,28 +350,4 @@ class ModuleDNSBL : public Module
 	}
 };
 
-// stuff down here is the module-factory stuff.
-
-class ModuleDNSBLFactory : public ModuleFactory
-{
- public:
-	ModuleDNSBLFactory()
-	{
-	}
-
-	~ModuleDNSBLFactory()
-	{
-	}
-
-	virtual Module *CreateModule(InspIRCd *Me)
-	{
-		return new ModuleDNSBL(Me);
-	}
-
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleDNSBLFactory;
-}
+MODULE_INIT(ModuleDNSBL);