10 files changed, 9 insertions, 13 deletions
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 8da57d9f2..180a989c9 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -19,7 +19,6 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "message.h"
 #include "commands.h"
 #include "inspircd.h"
 #include "helperfuncs.h"
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 391f4b20b..7efe2e755 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -1,7 +1,6 @@
 #include <string>
 #include "users.h"
 #include "modules.h"
-#include "message.h"
 #include "helperfuncs.h"
 #include "inspircd.h"
 
@@ -26,7 +25,7 @@ class cmd_chgident : public command_t
 
 		if(dest)
 		{
-			if(!isident(parameters[1]))
+			if(!ServerInstance->IsIdent(parameters[1]))
 			{
 				user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
 				return;
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 3d924bb0f..32e87272a 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -87,9 +87,12 @@ class RFC1413 : public InspSocket
 							{
 								if (u && (fd_ref_table[ufd] == u))
 								{
-									strlcpy(u->ident,section,IDENTMAX);
-									log(DEBUG,"IDENT SET: "+std::string(u->ident));
-									u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Found your ident: "+std::string(u->ident));
+									if (ServerInstance->IsIdent(section))
+									{
+										strlcpy(u->ident,section,IDENTMAX);
+										log(DEBUG,"IDENT SET: "+std::string(u->ident));
+										u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Found your ident: "+std::string(u->ident));
+									}
 								}
 							}
 							return false;
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 58a4c2686..f6f88993a 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -53,7 +53,7 @@ class cmd_nicklock : public command_t
 				user->WriteServ("946 %s %s :This user's nickname is already locked.",user->nick,source->nick);
 				return;
 			}
-			if (Srv->IsNick(std::string(parameters[1])))
+			if (ServerInstance->IsNick(parameters[1]))
 			{
 				// give them a lock flag
 				ServerInstance->WriteOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+parameters[0]+" to "+parameters[1]);
diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 091d59d1a..2ffb851b9 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -20,7 +20,6 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
-#include "message.h"
 #include <vector>
 #include "configreader.h"
 #include "inspircd.h"
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index a323844d5..42d54731c 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -47,7 +47,7 @@ class cmd_sanick : public command_t
 				user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
 				return;
 			}
-			if (Srv->IsNick(std::string(parameters[1])))
+			if (ServerInstance->IsNick(parameters[1]))
 			{
 				// FIX by brain: Cant use source->nick here because if it traverses a server link then
 				// source->nick becomes invalid as the object data moves in memory.
diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 00e860467..fcb2a4e94 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -20,7 +20,6 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
-#include "message.h"
 #include <vector>
 #include "inspircd.h"
 
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index e4fbd4b33..cd13e5bfd 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -36,7 +36,6 @@ using namespace std;
 #include "inspircd.h"
 #include "inspstring.h"
 #include "hashcomp.h"
-#include "message.h"
 #include "xline.h"
 #include "typedefs.h"
 #include "cull_list.h"
diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index 939af8662..4ded5374f 100644
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -38,7 +38,6 @@ using namespace std;
 #include "inspircd.h"
 #include "inspstring.h"
 #include "hashcomp.h"
-#include "message.h"
 #include "xline.h"
 #include "typedefs.h"
 #include "cull_list.h"
diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 06f5b1924..5159f218f 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -23,7 +23,6 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "helperfuncs.h"
-#include "message.h"
 #include "configreader.h"
 #include "inspircd.h"