7 files changed, 7 insertions, 168 deletions
diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index e358492bc..e01a22fe6 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -106,27 +106,4 @@ class ModuleModesOnOper : public Module
 	}
 };
 
-class ModuleModesOnOperFactory : public ModuleFactory
-{
- public:
-	ModuleModesOnOperFactory()
-	{
-	}
-	
-	~ModuleModesOnOperFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleModesOnOper(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleModesOnOperFactory;
-}
-
+MODULE_INIT(ModuleModesOnOper);
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 294ea4c2b..da4361ca3 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -113,24 +113,4 @@ class ModuleOpermotd : public Module
 	}
 };
 
-class ModuleOpermotdFactory : public ModuleFactory
-{
- public:
-	ModuleOpermotdFactory()
-	{
-	}
-
-	~ModuleOpermotdFactory()
-	{
-	}
-
-	virtual Module* CreateModule(InspIRCd* Me)
-	{
-		return new ModuleOpermotd(Me);
-	}
-};
-
-extern "C" DllExport void* init_module(void)
-{
-	return new ModuleOpermotdFactory;
-}
+MODULE_INIT(ModuleOpermotd);
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index e19cf7652..313d5f112 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -291,27 +291,4 @@ class ModuleOverride : public Module
 	}
 };
 
-
-class ModuleOverrideFactory : public ModuleFactory
-{
- public:
-	ModuleOverrideFactory()
-	{
-	}
-	
-	~ModuleOverrideFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleOverride(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleOverrideFactory;
-}
+MODULE_INIT(ModuleOverride);
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index ce1fcfb07..9a467833f 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -135,27 +135,4 @@ class ModuleRandQuote : public Module
 	}
 };
 
-
-class ModuleRandQuoteFactory : public ModuleFactory
-{
- public:
-	ModuleRandQuoteFactory()
-	{
-	}
-	
-	~ModuleRandQuoteFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleRandQuote(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleRandQuoteFactory;
-}
+MODULE_INIT(ModuleRandQuote);
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 97be309d8..a6dc353de 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -157,28 +157,4 @@ class ModuleRedirect : public Module
 	}
 };
 
-
-class ModuleRedirectFactory : public ModuleFactory
-{
- public:
-	ModuleRedirectFactory()
-	{
-	}
-	
-	~ModuleRedirectFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleRedirect(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleRedirectFactory;
-}
-
+MODULE_INIT(ModuleRedirect);
diff --git a/src/modules/m_regonlycreate.cpp b/src/modules/m_regonlycreate.cpp
index 5a85f4d65..eb293b11b 100644
--- a/src/modules/m_regonlycreate.cpp
+++ b/src/modules/m_regonlycreate.cpp
@@ -58,28 +58,4 @@ class ModuleRegOnlyCreate : public Module
 	}
 };
 
-
-class ModuleRegOnlyCreateFactory : public ModuleFactory
-{
- public:
-	ModuleRegOnlyCreateFactory()
-	{
-	}
-	
-	~ModuleRegOnlyCreateFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleRegOnlyCreate(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleRegOnlyCreateFactory;
-}
-
+MODULE_INIT(ModuleRegOnlyCreate);
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 714490d82..4efbefaaf 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -287,28 +287,4 @@ class ModuleRemove : public Module
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleRemoveFactory : public ModuleFactory
-{
- public:
-	ModuleRemoveFactory()
-	{
-	}
-	
-	~ModuleRemoveFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleRemove(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleRemoveFactory;
-}
+MODULE_INIT(ModuleRemove);