2 files changed, 33 insertions, 5 deletions
diff --git a/include/inspircd.h b/include/inspircd.h
index b8403b76b..a5544d904 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -88,14 +88,11 @@ void WriteFrom(int sock, userrec *user,char* text, ...);
 void WriteTo(userrec *source, userrec *dest,char *data, ...);
 void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...);
 void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...);
-int common_channels(userrec *u, userrec *u2);
 void WriteCommon(userrec *u, char* text, ...);
 void WriteCommonExcept(userrec *u, char* text, ...);
 void WriteWallOps(userrec *source, bool local_only, char* text, ...);
-int isnick(const char *n);
 userrec* Find(std::string nick);
 chanrec* FindChan(const char* chan);
-char* cmode(userrec *user, chanrec *chan);
 std::string getservername();
 std::string getserverdesc();
 std::string getnetworkname();
@@ -114,8 +111,6 @@ void kill_link(userrec *user,const char* r);
 int usercount(chanrec *c);
 void call_handler(const char* commandname,char **parameters, int pcnt, userrec *user);
 void send_network_quit(const char* nick, const char* reason);
-void ChangeName(userrec* user, const char* gecos);
-void ChangeDisplayedHost(userrec* user, const char* host);
 long GetRevision();
 
 // mesh network functions
diff --git a/include/message.h b/include/message.h
new file mode 100644
index 000000000..4958af0f1
--- /dev/null
+++ b/include/message.h
@@ -0,0 +1,33 @@
+#ifndef __MESSAGE_H
+#define __MESSAGE_H
+
+// include the common header files
+
+#include <typeinfo>
+#include <iostream>
+#include <string>
+#include <deque>
+#include <sstream>
+#include <vector>
+#include "users.h"
+#include "channels.h"
+
+int common_channels(userrec *u, userrec *u2);
+void chop(char* str);
+void tidystring(char* str);
+void safedelete(chanrec *p);
+void safedelete(userrec *p);
+void Blocking(int s);
+void NonBlocking(int s);
+int CleanAndResolve (char *resolvedHost, const char *unresolvedHost);
+int c_count(userrec* u);
+bool hasumode(userrec* user, char mode);
+void ChangeName(userrec* user, const char* gecos);
+void ChangeDisplayedHost(userrec* user, const char* host);
+int isident(const char* n);
+int isnick(const char* n);
+char* cmode(userrec *user, chanrec *chan);
+int cstatus(userrec *user, chanrec *chan);
+int has_channel(userrec *u, chanrec *c);
+
+#endif