Merge branch 'insp3' into master.

10 files changed, 6 insertions, 28 deletions

diff --git a/include/base.h b/include/base.h
index 7e541d6b3..4c15f6253 100644
--- a/include/base.h
+++ b/include/base.h
@@ -28,10 +28,8 @@
 
 #pragma once
 
-#include <map>
-#include <deque>
+#include "compat.h"
 #include <string>
-#include <list>
 
 #include "utility/uncopiable.h"
 #include "cull.h"
diff --git a/include/configreader.h b/include/configreader.h
index 20dbc6d4b..1e9cf77c5 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -30,14 +30,7 @@
 
 #pragma once
 
-#include <sstream>
-#include <string>
-#include <vector>
-#include <map>
 #include "inspircd.h"
-#include "modules.h"
-#include "socketengine.h"
-#include "socket.h"
 #include "token_list.h"
 
 /** Structure representing a single \<tag> in config */
@@ -460,7 +453,7 @@ class CoreExport ServerConfig
 	 */
 	OperIndex OperTypes;
 
-	/** TS6-like server ID.
+	/** Unique server ID.
 	 * NOTE: 000...999 are usable for InspIRCd servers. This
 	 * makes code simpler. 0AA, 1BB etc with letters are reserved
 	 * for services use.
diff --git a/include/event.h b/include/event.h
index 03c8b9d05..dec19c96f 100644
--- a/include/event.h
+++ b/include/event.h
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include "base.h"
+
 namespace Events
 {
 	class ModuleEventListener;
diff --git a/include/hashcomp.h b/include/hashcomp.h
index 4ea9de159..ee41c61d2 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -29,12 +29,6 @@
 
 #pragma once
 
-#include <cstring>
-#include <string>
-#include <vector>
-#include <deque>
-#include <map>
-#include <set>
 #include "inspircd.h"
 #include "convto.h"
 
diff --git a/include/inspstring.h b/include/inspstring.h
index de0f8be42..17093eb7c 100644
--- a/include/inspstring.h
+++ b/include/inspstring.h
@@ -27,8 +27,6 @@
 
 #pragma once
 
-// This (config) is needed as inspstring doesn't pull in the central header
-#include "config.h"
 #include <cstring>
 
 /** Sets ret to the formatted string. last is the last parameter before ..., and format is the format in printf-style */
diff --git a/include/modules.h b/include/modules.h
index e6e4b965f..ed01ef2bf 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -37,7 +37,6 @@
 #include "base.h"
 #include "ctables.h"
 #include "inspsocket.h"
-#include "timer.h"
 #include "mode.h"
 
 /** Used to specify the behaviour of a module. */
diff --git a/include/modules/regex.h b/include/modules/regex.h
index 344423e8b..6c9f659da 100644
--- a/include/modules/regex.h
+++ b/include/modules/regex.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "inspircd.h"
+#include "event.h"
 
 namespace Regex
 {
diff --git a/include/protocol.h b/include/protocol.h
index 586b7a5d2..24001300e 100644
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -24,8 +24,6 @@
 
 #pragma once
 
-#include "hashcomp.h"
-
 class User;
 
 class ProtocolServer
diff --git a/include/socketengine.h b/include/socketengine.h
index 9f2d6de0f..a660e7c5e 100644
--- a/include/socketengine.h
+++ b/include/socketengine.h
@@ -27,10 +27,7 @@
 
 #pragma once
 
-#include <vector>
 #include <string>
-#include <map>
-#include "config.h"
 #include "socket.h"
 #include "base.h"
 
diff --git a/include/uid.h b/include/uid.h
index aeacb977a..c00161cac 100644
--- a/include/uid.h
+++ b/include/uid.h
@@ -36,8 +36,7 @@ class CoreExport UIDGenerator
  public:
 	/**
 	* This is the maximum length of a UUID (unique user identifier).
-	* This length is set in compliance with TS6 protocol, and really should not be changed. Ever.
-	* It allows for a lot of clients as-is. -- w00t.
+	* It allows up to 12,960 servers and 2,176,782,336 users per server.
 	*/
 	static const unsigned int UUID_LENGTH = 9;