Fix a bunch of really obvious unnecessary includes.

diff --git a/include/base.h b/include/base.h
index e36e5118c6b089cc3bb8ec563854876d1bb5a4d4..98ce20fd5485feee477181ddd2cb9b4f93e2c0d5 100644 (file)
--- 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>
 
 /** Dummy class to help enforce culls being parent-called up to classbase */
 class CullResult

diff --git a/include/configreader.h b/include/configreader.h
index d14ab294465445e943ee468c7cae99b1c89b5311..66f7920be7471b6d9f0ad4c9513e407c6506f3b9 100644 (file)
--- 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 */

diff --git a/include/event.h b/include/event.h
index d3b7792164237cc0995ead826da08529584936b0..baa24d7d08798b9f5c9a370dac3bae2af1f64510 100644 (file)
--- 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 320b570318094591a6dc7f23ebcbc211ee91402b..483910cb793d123fdfa2c3e8e1de64b071c11ad6 100644 (file)
--- 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 de0f8be42f4f26931d8428f492347e1ea8658b04..17093eb7cfbb49a5646ed80e0d4d98399287147f 100644 (file)
--- 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 3521fa76de875704fee9f69f3db6f1b9fe4e9690..b36326b1b6b5b5874dfef96552852caa07cb9c49 100644 (file)
--- 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 23e547915198b1bc0230c301b95d9f274ccac661..5a0ea49031037046c00436299dd9db22f21c2c60 100644 (file)
--- a/include/modules/regex.h
+++ b/include/modules/regex.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "inspircd.h"
+#include "event.h"
 
 class Regex : public classbase
 {

diff --git a/include/protocol.h b/include/protocol.h
index 69f78562a8440ac59488e9e374ce19875f2126d2..f69acde0b2b0b6b675844c6cb0121f9485b56413 100644 (file)
--- 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 99892b80a3cfe906b7056454d232eabf6bc53bb6..26d31c168d1c9ff77d9847ddc8f20d7644240e79 100644 (file)
--- 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/threadengine.h b/include/threadengine.h
index 73aafe7aacf7e939ca0f087154683e3255e3e2d6..0c2d26ce6e14f4546cb8b5a952c3ac40372838b4 100644 (file)
--- a/include/threadengine.h
+++ b/include/threadengine.h
@@ -23,10 +23,6 @@
 
 #pragma once
 
-#include <vector>
-#include <string>
-#include <map>
-#include "config.h"
 #include "base.h"
 
 /** Derive from this class to implement your own threaded sections of

diff --git a/include/threadengines/threadengine_pthread.h b/include/threadengines/threadengine_pthread.h
index d1810c812320317243f2745c2cff59f7e4734cfe..cabb6ebd2ceb08d58ca821b5f9696e3e13c16ef3 100644 (file)
--- a/include/threadengines/threadengine_pthread.h
+++ b/include/threadengines/threadengine_pthread.h
@@ -24,7 +24,8 @@
 #pragma once
 
 #include <pthread.h>
-#include "typedefs.h"
+
+class Thread;
 
 /** The ThreadEngine class has the responsibility of initialising
  * Thread derived classes. It does this by creating operating system

diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index 2fdf1cb242d2bc631f851a80714f9895bb046d02..77999e541bbceed68fc337d507de1f7e8191593f 100644 (file)
--- a/include/threadengines/threadengine_win32.h
+++ b/include/threadengines/threadengine_win32.h
@@ -24,7 +24,6 @@
 
 #pragma once
 
-#include "config.h"
 #include "base.h"
 
 class Thread;

diff --git a/src/base.cpp b/src/base.cpp
index 1f9ba3264d46bfb9be29403f8c14ba56257d9026..17c619fbe28e99a2ae0d6b4b15360cc0f6256d14 100644 (file)
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -25,7 +25,7 @@
 
 #include "inspircd.h"
 #include "base.h"
-#include <time.h>
+
 #ifdef INSPIRCD_ENABLE_RTTI
 #include <typeinfo>
 #endif

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 7ce5fa454917f809d05eb0c99aad1a0a8f29e2f3..800d147ebf8e4989b22bbe11b1631c7effd2499e 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -35,8 +35,6 @@
 
 #include "inspircd.h"
 #include "xline.h"
-#include "exitcodes.h"
-#include <iostream>
 
 /* Find a user record by nickname and return a pointer to it */
 User* InspIRCd::FindNick(const std::string &nick)

diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index 3f0b5ac1139787d5a453a5d7be0954d2c6fd81d1..1b62bbebb5ad6145083d1a95f5b2be1a201fed9a 100644 (file)
--- a/src/modules/m_regex_glob.cpp
+++ b/src/modules/m_regex_glob.cpp
@@ -23,8 +23,8 @@
  */
 
 
-#include "modules/regex.h"
 #include "inspircd.h"
+#include "modules/regex.h"
 
 class GlobRegex : public Regex
 {

diff --git a/win/win32service.cpp b/win/win32service.cpp
index 7ca8d084bef0e0e7de1d874273398ce8ab99bbd8..45aba726824c0d3af6146934f159887c97a500fa 100644 (file)
--- a/win/win32service.cpp
+++ b/win/win32service.cpp
@@ -21,7 +21,6 @@
  */
 
 
-#include "config.h"
 #include "inspircd.h"
 #include "exitcodes.h"
 #include <windows.h>