4 files changed, 4 insertions, 24 deletions
diff --git a/include/globals.h b/include/globals.h
index d30f18ede..4a5c1e1e4 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -31,6 +31,4 @@ typedef std::pair< std::string, std::string > KeyVal;
 typedef std::vector< KeyVal > KeyValList;
 typedef std::multimap< std::string, KeyValList > ConfigDataHash;
 
-int isnick(const char *n);
-
 #endif
diff --git a/include/inspircd.h b/include/inspircd.h
index dadab34fa..b2ed4da20 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -209,6 +209,9 @@ class InspIRCd : public classbase
 
 	const std::string& GetModuleName(Module* m);
 
+	bool IsNick(const char* n);
+	bool IsIdent(const char* n);
+
 	std::string GetRevision();
 	std::string GetVersionString();
 	void WritePID(const std::string &filename);
diff --git a/include/message.h b/include/message.h
index f68eb8f6f..aab2f6973 100644
--- a/include/message.h
+++ b/include/message.h
@@ -14,21 +14,5 @@
  * ---------------------------------------------------
  */
 
-#ifndef __MESSAGE_H
-#define __MESSAGE_H
+#warning "message.h is deprecated and may be removed from a future version"
 
-// include the common header files
-
-#include <typeinfo>
-#include <iostream>
-#include <string>
-#include <deque>
-#include <sstream>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-
-int isident(const char* n);
-int isnick(const char* n);
-
-#endif
diff --git a/include/modules.h b/include/modules.h
index 1b9d8c25b..fc68db62e 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1250,11 +1250,6 @@ class Module : public Extensible
 class Server : public Extensible
 {
  public:
-	/** Returns true if a nick is valid.
-	 * Nicks for unregistered connections will return false.
-	 */
-	bool IsNick(const std::string &nick);
-
 	/** Attempts to look up a nick using the file descriptor associated with that nick.
 	 * This function will return NULL if the file descriptor is not associated with a valid user.
 	 */