5 files changed, 5 insertions, 115 deletions
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 8d73f94f0..20168aff5 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -188,26 +188,4 @@ class ModuleAuditorium : public Module
 	}
 };
 
-class ModuleAuditoriumFactory : public ModuleFactory
-{
- public:
-	ModuleAuditoriumFactory()
-	{
-	}
-	
-	~ModuleAuditoriumFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleAuditorium(Me);
-	}
-	
-};
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleAuditoriumFactory;
-}
-
+MODULE_INIT(ModuleAuditorium);
diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 5dd406e54..9cb5d0662 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -150,26 +150,4 @@ public:
 	}
 };
 
-class ModuleBanExceptionFactory : public ModuleFactory
-{
- public:
-	ModuleBanExceptionFactory()
-	{
-	}
-	
-	~ModuleBanExceptionFactory()
-	{
-	}
-	
-	virtual Module* CreateModule(InspIRCd* Me)
-	{
-		return new ModuleBanException(Me);
-	}
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleBanExceptionFactory;
-}
-
+MODULE_INIT(ModuleBanException);
diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 7ed690e13..06b9484c6 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -340,26 +340,4 @@ class ModuleBanRedirect : public Module
 };
 
 
-class ModuleBanRedirectFactory : public ModuleFactory
-{
- public:
-	ModuleBanRedirectFactory()
-	{
-	}
-	
-	~ModuleBanRedirectFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleBanRedirect(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleBanRedirectFactory;
-}
+MODULE_INIT(ModuleBanRedirect);
diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 1724f0e5f..0164590be 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -188,25 +188,4 @@ class ModuleBlockAmsg : public Module
 };
 
 
-class ModuleBlockAmsgFactory : public ModuleFactory
-{
-	public:
-		ModuleBlockAmsgFactory()
-		{
-		}
-	
-		~ModuleBlockAmsgFactory()
-		{
-		}
-	
-		virtual Module * CreateModule(InspIRCd* Me)
-		{
-			return new ModuleBlockAmsg(Me);
-		}
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleBlockAmsgFactory;
-}
+MODULE_INIT(ModuleBlockAmsg);
diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 2f5807c53..c07575d32 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -140,27 +140,4 @@ public:
 	}
 };
 
-
-class ModuleBlockCAPSFactory : public ModuleFactory
-{
- public:
-	ModuleBlockCAPSFactory()
-	{
-	}
-	
-	~ModuleBlockCAPSFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleBlockCAPS(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleBlockCAPSFactory;
-}
+MODULE_INIT(ModuleBlockCAPS);