9 files changed, 9 insertions, 219 deletions
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 1cacef956..490b63016 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -100,27 +100,4 @@ class ModuleSetHost : public Module
 	
 };
 
-class ModuleSetHostFactory : public ModuleFactory
-{
- public:
-	ModuleSetHostFactory()
-	{
-	}
-	
-	~ModuleSetHostFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSetHost(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSetHostFactory;
-}
-
+MODULE_INIT(ModuleSetHost);
diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index 5122781f1..4bd19fd7a 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -76,29 +76,5 @@ class ModuleSetIdent : public Module
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSetIdentFactory : public ModuleFactory
-{
- public:
-	ModuleSetIdentFactory()
-	{
-	}
-	
-	~ModuleSetIdentFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSetIdent(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSetIdentFactory;
-}
 
+MODULE_INIT(ModuleSetIdent);
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index f396c5a04..88c94ce70 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -70,29 +70,4 @@ class ModuleSetIdle : public Module
 	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSetIdleFactory : public ModuleFactory
-{
- public:
-	ModuleSetIdleFactory()
-	{
-	}
-	
-	~ModuleSetIdleFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSetIdle(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSetIdleFactory;
-}
-
+MODULE_INIT(ModuleSetIdle);
diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index bc2810da3..8804f185d 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -67,29 +67,4 @@ class ModuleSetName : public Module
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSetNameFactory : public ModuleFactory
-{
- public:
-	ModuleSetNameFactory()
-	{
-	}
-	
-	~ModuleSetNameFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSetName(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSetNameFactory;
-}
-
+MODULE_INIT(ModuleSetName);
diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp
index 26c70346e..eb2af4e0e 100644
--- a/src/modules/m_sha256.cpp
+++ b/src/modules/m_sha256.cpp
@@ -292,26 +292,5 @@ class ModuleSHA256 : public Module
 	}
 };
 
+MODULE_INIT(ModuleSHA256);
 
-class ModuleSHA256Factory : public ModuleFactory
-{
-public:
-	ModuleSHA256Factory()
-	{
-	}
-
-	~ModuleSHA256Factory()
-	{
-	}
-
-	virtual Module *CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSHA256(Me);
-	}
-
-};
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSHA256Factory;
-}
diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index d2324eb73..fd1381f22 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -106,25 +106,4 @@ class ModuleShowwhois : public Module
 
 };
 
-class ModuleShowwhoisFactory : public ModuleFactory
-{
-	public:
-		ModuleShowwhoisFactory()
-		{
-		}
-
-		~ModuleShowwhoisFactory()
-		{
-		}
-
-		virtual Module* CreateModule(InspIRCd* Me)
-		{
-			return new ModuleShowwhois(Me);
-		}
-
-};
-
-extern "C" DllExport void* init_module()
-{
-	return new ModuleShowwhoisFactory;
-}
+MODULE_INIT(ModuleShowwhois);
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 8d8ed43c7..782bee000 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -212,28 +212,4 @@ class ModuleSilence : public Module
 	}
 };
 
-
-class ModuleSilenceFactory : public ModuleFactory
-{
- public:
-	ModuleSilenceFactory()
-	{
-	}
-	
-	~ModuleSilenceFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSilence(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSilenceFactory;
-}
-
+MODULE_INIT(ModuleSilence);
diff --git a/src/modules/m_silence_ext.cpp b/src/modules/m_silence_ext.cpp
index 450cb14f8..30f2d7280 100644
--- a/src/modules/m_silence_ext.cpp
+++ b/src/modules/m_silence_ext.cpp
@@ -369,28 +369,4 @@ class ModuleSilence : public Module
 	}
 };
 
-
-class ModuleSilenceFactory : public ModuleFactory
-{
- public:
-	ModuleSilenceFactory()
-	{
-	}
-	
-	~ModuleSilenceFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSilence(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSilenceFactory;
-}
-
+MODULE_INIT(ModuleSilence);
diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index d8843094f..5e54899d0 100644
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -160,27 +160,4 @@ class ModuleSpy : public Module
 	}
 };
 
-
-class ModuleSpyFactory : public ModuleFactory
-{
- public:
-	ModuleSpyFactory()
-	{
-	}
-	
-	~ModuleSpyFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSpy(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleSpyFactory;
-}
+MODULE_INIT(ModuleSpy);