3 files changed, 3 insertions, 71 deletions
diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index f271bfa03..d48a029a6 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -145,25 +145,4 @@ class ModuleWaitPong : public Module
 	
 };
 
-class ModuleWaitPongFactory : public ModuleFactory
-{
- public:
-	ModuleWaitPongFactory()
-	{
-	}
-	
-	~ModuleWaitPongFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleWaitPong(Me);
-	}
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleWaitPongFactory;
-}
+MODULE_INIT(ModuleWaitPong);
diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index eb9c9af92..493157a49 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -117,26 +117,4 @@ public:
 
 };
 
-
-class ModuleConnFloodFactory : public ModuleFactory
-{
-public:
-	ModuleConnFloodFactory()
-	{
-	}
-
-	~ModuleConnFloodFactory()
-	{
-	}
-
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleConnFlood(Me);
-	}
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleConnFloodFactory;
-}
+MODULE_INIT(ModuleConnFlood);
diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index 1ffc0b2e7..d9833ef78 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -96,29 +96,4 @@ class ModuleCycle : public Module
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleCycleFactory : public ModuleFactory
-{
- public:
-	ModuleCycleFactory()
-	{
-	}
-	
-	~ModuleCycleFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleCycle(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleCycleFactory;
-}
-
+MODULE_INIT(ModuleCycle);