2 files changed, 2 insertions, 45 deletions
diff --git a/src/modules/extra/m_testclient.cpp b/src/modules/extra/m_testclient.cpp
index 670533dc3..f4e58b7b5 100644
--- a/src/modules/extra/m_testclient.cpp
+++ b/src/modules/extra/m_testclient.cpp
@@ -106,25 +106,5 @@ public:
 	}	
 };
 
-class ModuleTestClientFactory : public ModuleFactory
-{
- public:
-	ModuleTestClientFactory()
-	{
-	}
-	
-	~ModuleTestClientFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleTestClient(Me);
-	}
-};
-
+MODULE_INIT(ModuleTestClient);
 
-extern "C" void * init_module( void )
-{
-	return new ModuleTestClientFactory;
-}
diff --git a/src/modules/m_taxonomy.cpp b/src/modules/m_taxonomy.cpp
index 413218082..7b3e57aae 100644
--- a/src/modules/m_taxonomy.cpp
+++ b/src/modules/m_taxonomy.cpp
@@ -95,28 +95,5 @@ class ModuleTaxonomy : public Module
 	}
 };
 
-
-class ModuleTaxonomyFactory : public ModuleFactory
-{
- public:
-	ModuleTaxonomyFactory()
-	{
-	}
-	
-	~ModuleTaxonomyFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleTaxonomy(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleTaxonomyFactory;
-}
+MODULE_INIT(ModuleTaxonomy);