5 files changed, 5 insertions, 115 deletions
diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index 976d8bb49..44d503ff3 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -91,26 +91,5 @@ class ModuleHideChans : public Module
 	}
 };
 
-class ModuleHideChansFactory : public ModuleFactory
-{
- public:
-	ModuleHideChansFactory()
-	{
-	}
-	
-	~ModuleHideChansFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleHideChans(Me);
-	}
-	
-};
-
 
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleHideChansFactory;
-}
+MODULE_INIT(ModuleHideChans);
diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index cf9e9b062..dc7495cd5 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -90,26 +90,5 @@ class ModuleHideOper : public Module
 	}
 };
 
-class ModuleHideOperFactory : public ModuleFactory
-{
- public:
-	ModuleHideOperFactory()
-	{
-	}
-	
-	~ModuleHideOperFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleHideOper(Me);
-	}
-	
-};
-
 
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleHideOperFactory;
-}
+MODULE_INIT(ModuleHideOper);
diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index cf5c5f96d..d99b95c04 100644
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -145,29 +145,4 @@ class ModuleHostChange : public Module
 	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleHostChangeFactory : public ModuleFactory
-{
- public:
-	ModuleHostChangeFactory()
-	{
-	}
-	
-	~ModuleHostChangeFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleHostChange(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleHostChangeFactory;
-}
-
+MODULE_INIT(ModuleHostChange);
diff --git a/src/modules/m_http_client.cpp b/src/modules/m_http_client.cpp
index 4b31fadd7..073331f44 100644
--- a/src/modules/m_http_client.cpp
+++ b/src/modules/m_http_client.cpp
@@ -343,24 +343,4 @@ void HTTPSocket::OnClose()
 	delete response;
 }
 
-class ModuleHTTPClientFactory : public ModuleFactory
-{
- public:
-	ModuleHTTPClientFactory()
-	{
-	}
-	
-	~ModuleHTTPClientFactory()
-	{
-	}
-	
-	Module *CreateModule(InspIRCd* Me)
-	{
-		return new ModuleHTTPClient(Me);
-	}
-};
-
-extern "C" DllExport void *init_module(void)
-{
-	return new ModuleHTTPClientFactory;
-}
+MODULE_INIT(ModuleHTTPClient);
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index ed02c0a5c..f687c1cf4 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -417,27 +417,4 @@ class ModuleHttpServer : public Module
 	}
 };
 
-
-class ModuleHttpServerFactory : public ModuleFactory
-{
- public:
-	ModuleHttpServerFactory()
-	{
-	}
-	
-	~ModuleHttpServerFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		HttpModule = new ModuleHttpServer(Me);
-		return HttpModule;
-	}
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleHttpServerFactory;
-}
+MODULE_INIT(ModuleHttpServer);