4 files changed, 5 insertions, 98 deletions
diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index fe9950e98..6b0a09cdf 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -103,27 +103,5 @@ class ModuleUninvite : public Module
 	}
 };
 
+MODULE_INIT(ModuleUninvite);
 
-class ModuleUninviteFactory : public ModuleFactory
-{
- public:
-	ModuleUninviteFactory()
-	{
-	}
-	
-	~ModuleUninviteFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleUninvite(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleUninviteFactory;
-}
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 29b1eb5fa..64111da07 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -82,29 +82,5 @@ class ModuleUserIP : public Module
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleUserIPFactory : public ModuleFactory
-{
- public:
-	ModuleUserIPFactory()
-	{
-	}
-	
-	~ModuleUserIPFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleUserIP(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleUserIPFactory;
-}
+MODULE_INIT(ModuleUserIP);
 
diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 822867488..949094324 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -91,29 +91,5 @@ class ModuleVHost : public Module
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleVHostFactory : public ModuleFactory
-{
- public:
-	ModuleVHostFactory()
-	{
-	}
-	
-	~ModuleVHostFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleVHost(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleVHostFactory;
-}
+MODULE_INIT(ModuleVHost);
 
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index ca51fc690..5eda2d0e2 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -70,7 +70,7 @@ typedef nspace::hash_map<irc::string, std::deque<userrec*>, nspace::hash_compare
 #else
 typedef nspace::hash_map<irc::string, std::deque<userrec*>, nspace::hash<irc::string> > watchentries;
 #endif
-typedef std::map<irc::string, std::string>watchlist;
+typedef std::map<irc::string, std::string> watchlist;
 
 /* Who's watching each nickname.
  * NOTE: We do NOT iterate this to display a user's WATCH list!
@@ -468,28 +468,5 @@ class Modulewatch : public Module
 	}
 };
 
-
-class ModulewatchFactory : public ModuleFactory
-{
- public:
-	ModulewatchFactory()
-	{
-	}
-	
-	~ModulewatchFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new Modulewatch(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModulewatchFactory;
-}
+MODULE_INIT(Modulewatch);