6 files changed, 6 insertions, 147 deletions
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index e7f23e145..7f40c4ac9 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -99,29 +99,4 @@ class ModuleNoNickChange : public Module
 	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleNoNickChangeFactory : public ModuleFactory
-{
- public:
-	ModuleNoNickChangeFactory()
-	{
-	}
-	
-	~ModuleNoNickChangeFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleNoNickChange(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleNoNickChangeFactory;
-}
-
+MODULE_INIT(ModuleNoNickChange);
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 58a69da04..eb856ac1b 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -100,28 +100,4 @@ class ModuleNoNotice : public Module
 	}
 };
 
-
-class ModuleNoNoticeFactory : public ModuleFactory
-{
- public:
-	ModuleNoNoticeFactory()
-	{
-	}
-	
-	~ModuleNoNoticeFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleNoNotice(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleNoNoticeFactory;
-}
-
+MODULE_INIT(ModuleNoNotice);
diff --git a/src/modules/m_oper_hash.cpp b/src/modules/m_oper_hash.cpp
index a3f6e5210..f7f0ab65b 100644
--- a/src/modules/m_oper_hash.cpp
+++ b/src/modules/m_oper_hash.cpp
@@ -160,27 +160,4 @@ class ModuleOperHash : public Module
 	}
 };
 
-
-class ModuleOperHashFactory : public ModuleFactory
-{
- public:
-	ModuleOperHashFactory()
-	{
-	}
-	
-	~ModuleOperHashFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleOperHash(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleOperHashFactory;
-}
+MODULE_INIT(ModuleOperHash);
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 404a02183..883849dca 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -94,28 +94,4 @@ class ModuleOperChans : public Module
 	}
 };
 
-
-class ModuleOperChansFactory : public ModuleFactory
-{
- public:
-	ModuleOperChansFactory()
-	{
-	}
-	
-	~ModuleOperChansFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleOperChans(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleOperChansFactory;
-}
-
+MODULE_INIT(ModuleOperChans);
diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 5576fd3f9..110f2fbf3 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -87,24 +87,4 @@ class ModuleOperjoin : public Module
 
 };
 
-class ModuleOperjoinFactory : public ModuleFactory
-{
-	public:
-		ModuleOperjoinFactory()
-		{
-		}
-
-		~ModuleOperjoinFactory()
-		{
-		}
-
-		virtual Module * CreateModule(InspIRCd* Me)
-		{
-			return new ModuleOperjoin(Me);
-		}
-};
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleOperjoinFactory;
-}
+MODULE_INIT(ModuleOperjoin);
diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index e617c47e0..295bc2b58 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -72,29 +72,4 @@ class ModuleOperLog : public Module
 };
  
  
- 
-/******************************************************************************************************/
- 
-class ModuleOperLogFactory : public ModuleFactory
-{
- public:
-	ModuleOperLogFactory()
-	{
-	}
- 
-	~ModuleOperLogFactory()
-	{
-	}
- 
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleOperLog(Me);
-	}
- 
-};
- 
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleOperLogFactory;
-}
-
+MODULE_INIT(ModuleOperLog);