diff options
| -rw-r--r-- | include/base.h | 4 | ||||
| -rw-r--r-- | include/configreader.h | 7 | ||||
| -rw-r--r-- | include/event.h | 2 | ||||
| -rw-r--r-- | include/hashcomp.h | 6 | ||||
| -rw-r--r-- | include/inspstring.h | 2 | ||||
| -rw-r--r-- | include/modules.h | 1 | ||||
| -rw-r--r-- | include/modules/regex.h | 2 | ||||
| -rw-r--r-- | include/protocol.h | 2 | ||||
| -rw-r--r-- | include/socketengine.h | 3 | ||||
| -rw-r--r-- | include/threadengine.h | 4 | ||||
| -rw-r--r-- | include/threadengines/threadengine_pthread.h | 3 | ||||
| -rw-r--r-- | include/threadengines/threadengine_win32.h | 1 | ||||
| -rw-r--r-- | src/base.cpp | 2 | ||||
| -rw-r--r-- | src/helperfuncs.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_regex_glob.cpp | 2 | ||||
| -rw-r--r-- | win/win32service.cpp | 1 |
16 files changed, 8 insertions, 36 deletions
diff --git a/include/base.h b/include/base.h index e36e5118c..98ce20fd5 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> /** 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 d14ab2944..66f7920be 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 */ diff --git a/include/event.h b/include/event.h index d3b779216..baa24d7d0 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 320b57031..483910cb7 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 3521fa76d..b36326b1b 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 23e547915..5a0ea4903 100644 --- 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 69f78562a..f69acde0b 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 99892b80a..26d31c168 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/threadengine.h b/include/threadengine.h index 73aafe7aa..0c2d26ce6 100644 --- 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 d1810c812..cabb6ebd2 100644 --- 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 2fdf1cb24..77999e541 100644 --- 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 1f9ba3264..17c619fbe 100644 --- 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 7ce5fa454..800d147eb 100644 --- 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 3f0b5ac11..1b62bbebb 100644 --- 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 7ca8d084b..45aba7268 100644 --- a/win/win32service.cpp +++ b/win/win32service.cpp @@ -21,7 +21,6 @@ */ -#include "config.h" #include "inspircd.h" #include "exitcodes.h" #include <windows.h> |