4 files changed, 4 insertions, 98 deletions
diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index d98870425..18a7eab8d 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -94,29 +94,4 @@ class ModuleSecureList : public Module
 
 };
  
- 
- 
-/******************************************************************************************************/
- 
-class ModuleSecureListFactory : public ModuleFactory
-{
- public:
-	ModuleSecureListFactory()
-	{
-	}
- 
-	~ModuleSecureListFactory()
-	{
-	}
- 
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSecureList(Me);
-	}
- 
-};
- 
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSecureListFactory;
-}
+MODULE_INIT(ModuleSecureList);
diff --git a/src/modules/m_seenicks.cpp b/src/modules/m_seenicks.cpp
index e472e60bb..5aa0f9069 100644
--- a/src/modules/m_seenicks.cpp
+++ b/src/modules/m_seenicks.cpp
@@ -52,27 +52,4 @@ class ModuleSeeNicks : public Module
 	}
 };
 
-class ModuleSeeNicksFactory : public ModuleFactory
-{
- public:
-	ModuleSeeNicksFactory()
-	{
-	}
-	
-	~ModuleSeeNicksFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSeeNicks(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSeeNicksFactory;
-}
-
+MODULE_INIT(ModuleSeeNicks);
diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index 0e5c6b588..7f13918f5 100644
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -307,27 +307,4 @@ class ModuleServices : public Module
 };
 
 
-class ModuleServicesFactory : public ModuleFactory
-{
- public:
-	ModuleServicesFactory()
-	{
-	}
-	
-	~ModuleServicesFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleServices(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleServicesFactory;
-}
-
+MODULE_INIT(ModuleServices);
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 27d9b335e..d9352964a 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -329,27 +329,4 @@ class ModuleServicesAccount : public Module
 	}
 };
 
-
-class ModuleServicesAccountFactory : public ModuleFactory
-{
- public:
-	ModuleServicesAccountFactory()
-	{
-	}
-	
-	~ModuleServicesAccountFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleServicesAccount(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleServicesAccountFactory;
-}
+MODULE_INIT(ModuleServicesAccount);