9 files changed, 9 insertions, 225 deletions
diff --git a/src/modules/m_restrictbanned.cpp b/src/modules/m_restrictbanned.cpp
index c78fd621d..99f727fe8 100644
--- a/src/modules/m_restrictbanned.cpp
+++ b/src/modules/m_restrictbanned.cpp
@@ -95,28 +95,4 @@ class ModuleRestrictBanned : public Module
 	}
 };
 
-
-class ModuleRestrictBannedFactory : public ModuleFactory
-{
- public:
-	ModuleRestrictBannedFactory()
-	{
-	}
-	
-	~ModuleRestrictBannedFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleRestrictBanned(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleRestrictBannedFactory;
-}
-
+MODULE_INIT(ModuleRestrictBanned);
diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 4f8bc04bd..3d5325fe6 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -82,28 +82,4 @@ class ModuleRestrictChans : public Module
 	}
 };
 
-
-class ModuleRestrictChansFactory : public ModuleFactory
-{
- public:
-	ModuleRestrictChansFactory()
-	{
-	}
-	
-	~ModuleRestrictChansFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleRestrictChans(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleRestrictChansFactory;
-}
-
+MODULE_INIT(ModuleRestrictChans);
diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index 0f4379030..faa272b13 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -72,28 +72,4 @@ class ModuleRestrictMsg : public Module
 	}
 };
 
-
-class ModuleRestrictMsgFactory : public ModuleFactory
-{
- public:
-	ModuleRestrictMsgFactory()
-	{
-	}
-	
-	~ModuleRestrictMsgFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleRestrictMsg(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleRestrictMsgFactory;
-}
-
+MODULE_INIT(ModuleRestrictMsg);
diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 174b84833..cd6c9a014 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -265,26 +265,4 @@ class ModuleSafeList : public Module
 
 };
 
-
-class ModuleSafeListFactory : public ModuleFactory
-{
- public:
-	ModuleSafeListFactory()
-	{
-	}
- 
-	~ModuleSafeListFactory()
-	{
-	}
- 
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSafeList(Me);
-	}
- 
-};
- 
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSafeListFactory;
-}
+MODULE_INIT(ModuleSafeList);
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 29abc0ba9..394a21577 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -111,29 +111,4 @@ class ModuleSajoin : public Module
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSajoinFactory : public ModuleFactory
-{
- public:
-	ModuleSajoinFactory()
-	{
-	}
-	
-	~ModuleSajoinFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSajoin(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSajoinFactory;
-}
-
+MODULE_INIT(ModuleSajoin);
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 92800e701..32d9f8f67 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -95,27 +95,4 @@ class ModuleSaMode : public Module
 	}
 };
 
-
-class ModuleSaModeFactory : public ModuleFactory
-{
- public:
-	ModuleSaModeFactory()
-	{
-	}
-	
-	~ModuleSaModeFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSaMode(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSaModeFactory;
-}
+MODULE_INIT(ModuleSaMode);
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 0bebff0b1..b553fb75f 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -94,29 +94,4 @@ class ModuleSanick : public Module
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSanickFactory : public ModuleFactory
-{
- public:
-	ModuleSanickFactory()
-	{
-	}
-	
-	~ModuleSanickFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSanick(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSanickFactory;
-}
-
+MODULE_INIT(ModuleSanick);
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 8d01bdf01..d07a96fb7 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -109,29 +109,5 @@ class ModuleSapart : public Module
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSapartFactory : public ModuleFactory
-{
- public:
-	ModuleSapartFactory()
-	{
-	}
-	
-	~ModuleSapartFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSapart(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSapartFactory;
-}
+MODULE_INIT(ModuleSapart);
 
diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 037b7016a..5ca3d9861 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -79,29 +79,4 @@ class ModuleSaquit : public Module
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSaquitFactory : public ModuleFactory
-{
- public:
-	ModuleSaquitFactory()
-	{
-	}
-	
-	~ModuleSaquitFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSaquit(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSaquitFactory;
-}
-
+MODULE_INIT(ModuleSaquit);