3 files changed, 18 insertions, 11 deletions

diff --git a/include/helperfuncs.h b/include/helperfuncs.h
index 40df4c93c..bae7f8326 100644
--- a/include/helperfuncs.h
+++ b/include/helperfuncs.h
@@ -48,9 +48,4 @@ enum DebugLevel
 #define STRINGIFY(x) STRINGIFY2(x) 
 #define log(l, x, args...) InspIRCd::Log(l, __FILE__ ":" STRINGIFY(__LINE__) ": " x, ##args)
 
-void Error(int status);
-void ShowMOTD(userrec *user);
-void ShowRULES(userrec *user);
-bool IsValidChannelName(const char *);
-
 #endif
diff --git a/include/inspircd.h b/include/inspircd.h
index 59dc7eab0..63e8c8ce5 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -135,6 +135,11 @@ class InspIRCd : public classbase
 	chanrec* FindChan(const std::string &chan);
 	chanrec* FindChan(const char* chan);
 
+	void LoadAllModules();
+	void CheckDie();
+	void CheckRoot();
+	void OpenLog(char** argv, int argc);
+
 	bool UserToPseudo(userrec* user, const std::string &message);
 	bool PseudoToUser(userrec* alive, userrec* zombie, const std::string &message);
 
@@ -142,6 +147,12 @@ class InspIRCd : public classbase
 	void ServerPrivmsgAll(char* text, ...);
 	void WriteMode(const char* modes, int flags, const char* text, ...);
 
+	bool IsChannel(const char *chname);
+
+	static void Error(int status);
+	static void Rehash(int status);
+	static void Exit(int status);
+
 	int usercnt();
 	int registered_usercount();
 	int usercount_invisible();
@@ -227,7 +238,4 @@ class InspIRCd : public classbase
 	int Run();
 };
 
-/* Miscellaneous stuff here, moved from inspircd_io.h */
-void Exit(int status);
-
 #endif
diff --git a/include/users.h b/include/users.h
index 165b74aa4..cd12ceec6 100644
--- a/include/users.h
+++ b/include/users.h
@@ -251,9 +251,9 @@ class userrec : public connection
 	 */
 	char oper[NICKMAX];
 
-        /** True when DNS lookups are completed.
-         */
-        bool dns_done;
+	/** True when DNS lookups are completed.
+	 */
+	bool dns_done;
 
 	/** Number of seconds between PINGs for this user (set from <connect:allow> tag
 	 */
@@ -654,6 +654,10 @@ class userrec : public connection
 
 	ConnectClass& GetClass();
 
+	void ShowMOTD();
+
+	void ShowRULES();
+
 	/** Default destructor
 	 */
 	virtual ~userrec();