6 files changed, 6 insertions, 144 deletions
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index b5cf0c02c..7ae7cff66 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -282,28 +282,4 @@ class ModuleJoinFlood : public Module
 	}
 };
 
-
-class ModuleJoinFloodFactory : public ModuleFactory
-{
- public:
-	ModuleJoinFloodFactory()
-	{
-	}
-	
-	~ModuleJoinFloodFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleJoinFlood(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleJoinFloodFactory;
-}
-
+MODULE_INIT(ModuleJoinFlood);
diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index c4c58bde5..474cedb69 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -161,27 +161,4 @@ class ModuleJumpServer : public Module
 	
 };
 
-class ModuleJumpServerFactory : public ModuleFactory
-{
- public:
-	ModuleJumpServerFactory()
-	{
-	}
-	
-	~ModuleJumpServerFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleJumpServer(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleJumpServerFactory;
-}
-
+MODULE_INIT(ModuleJumpServer);
diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 3fa6c6c60..790e8f680 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -221,27 +221,4 @@ public:
 };
 
 
-class ModuleKickNoRejoinFactory : public ModuleFactory
-{
- public:
-	ModuleKickNoRejoinFactory()
-	{
-	}
-	
-	~ModuleKickNoRejoinFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleKickNoRejoin(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleKickNoRejoinFactory;
-}
-
+MODULE_INIT(ModuleKickNoRejoin);
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 075064554..fa54e08c7 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -126,29 +126,4 @@ class ModuleKnock : public Module
 	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleKnockFactory : public ModuleFactory
-{
- public:
-	ModuleKnockFactory()
-	{
-	}
-	
-	~ModuleKnockFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleKnock(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleKnockFactory;
-}
-
+MODULE_INIT(ModuleKnock);
diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 89ac627de..517609fa3 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -128,24 +128,4 @@ public:
 	}
 };
 
-class ModuleLockservFactory : public ModuleFactory
-{
-public:
-	ModuleLockservFactory()
-	{
-	}
-
-	~ModuleLockservFactory()
-	{
-	}
-
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleLockserv(Me);
-	}
-};
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleLockservFactory;
-}
+MODULE_INIT(ModuleLockserv);
diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp
index ada92df81..fe3f43829 100644
--- a/src/modules/m_md5.cpp
+++ b/src/modules/m_md5.cpp
@@ -319,27 +319,4 @@ class ModuleMD5 : public Module
 	}
 };
 
-
-class ModuleMD5Factory : public ModuleFactory
-{
- public:
-	ModuleMD5Factory()
-	{
-	}
-	
-	~ModuleMD5Factory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleMD5(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleMD5Factory;
-}
+MODULE_INIT(ModuleMD5);