3 files changed, 4 insertions, 75 deletions
diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp
index 7e848245a..6fc377083 100644
--- a/src/modules/m_alltime.cpp
+++ b/src/modules/m_alltime.cpp
@@ -57,6 +57,7 @@ class cmd_alltime : public command_t
 	}
 };
 
+
 class Modulealltime : public Module
 {
 	cmd_alltime *mycommand;
@@ -79,25 +80,4 @@ class Modulealltime : public Module
 	
 };
 
-class ModulealltimeFactory : public ModuleFactory
-{
- public:
-	ModulealltimeFactory()
-	{
-	}
-	
-	~ModulealltimeFactory()
-	{
-	}
-	
-	virtual Module *CreateModule(InspIRCd *Me)
-	{
-		return new Modulealltime(Me);
-	}
-};
-
-
-extern "C" DllExport void *init_module(void)
-{
-	return new ModulealltimeFactory;
-}
+MODULE_INIT(Modulealltime);
diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index f72d607b5..a5eb5612b 100644
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -75,31 +75,4 @@ class ModuleAntiBear : public Module
 	}
 };
 
-class ModuleAntiBearFactory : public ModuleFactory
-{
- public:
-	ModuleAntiBearFactory()
-	{
-	}
-	
-	~ModuleAntiBearFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleAntiBear(Me);
-	}
-	
-};
-
-
-//
-// The "C" linkage factory0() function creates the ModuleAntiBearFactory
-// class for this library
-//
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleAntiBearFactory;
-}
+MODULE_INIT(ModuleAntiBear);
diff --git a/src/modules/m_antibottler.cpp b/src/modules/m_antibottler.cpp
index 38ef873d8..2c96495a4 100644
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.cpp
@@ -96,28 +96,4 @@ class ModuleAntiBottler : public Module
  	}
 };
 
-
-class ModuleAntiBottlerFactory : public ModuleFactory
-{
- public:
-	ModuleAntiBottlerFactory()
-	{
-	}
-	
-	~ModuleAntiBottlerFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleAntiBottler(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleAntiBottlerFactory;
-}
-
+MODULE_INIT(ModuleAntiBottler);