4 files changed, 4 insertions, 95 deletions
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 6dd42209f..93048047a 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -115,27 +115,4 @@ class ModuleBlockColour : public Module
 	}
 };
 
-
-class ModuleBlockColourFactory : public ModuleFactory
-{
- public:
-	ModuleBlockColourFactory()
-	{
-	}
-	
-	~ModuleBlockColourFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleBlockColour(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleBlockColourFactory;
-}
+MODULE_INIT(ModuleBlockColour);
diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 6e53273ac..646df57a0 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -91,28 +91,5 @@ class ModuleBotMode : public Module
 
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleBotModeFactory : public ModuleFactory
-{
- public:
-	ModuleBotModeFactory()
-	{
-	}
-	
-	~ModuleBotModeFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleBotMode(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleBotModeFactory;
-}
+MODULE_INIT(ModuleBotMode);
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index df24ddf18..35005c741 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -247,26 +247,5 @@ class ModuleCBan : public Module
 	}
 };
 
-class ModuleCBanFactory : public ModuleFactory
-{
- public:
-	ModuleCBanFactory()
-	{
-	}
-	
-	~ModuleCBanFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleCBan(Me);
-	}
-	
-};
+MODULE_INIT(ModuleCBan);
 
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleCBanFactory;
-}
diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 37c23566d..7fea6be06 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -193,28 +193,4 @@ class ModuleCensor : public Module
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleCensorFactory : public ModuleFactory
-{
- public:
-	ModuleCensorFactory()
-	{
-	}
-	
-	~ModuleCensorFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleCensor(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleCensorFactory;
-}
+MODULE_INIT(ModuleCensor);