diff options
37 files changed, 3 insertions, 82 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index 6a864fafe..f49d359cd 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -25,8 +25,6 @@ #include "inspircd.h" #include "listmode.h" -#include <cstdarg> -#include "mode.h" namespace { diff --git a/src/commands.cpp b/src/commands.cpp index d5a89c086..c72a5dc73 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -22,8 +22,6 @@ #include "inspircd.h" -#include "xline.h" -#include "command_parse.h" CmdResult SplitCommand::Handle(const std::vector<std::string>& parms, User* u) { diff --git a/src/dynamic.cpp b/src/dynamic.cpp index 1470dff0c..2fb5211fb 100644 --- a/src/dynamic.cpp +++ b/src/dynamic.cpp @@ -22,7 +22,7 @@ #include "inspircd.h" -#include "dynamic.h" + #ifndef _WIN32 #include <dlfcn.h> #else diff --git a/src/filelogger.cpp b/src/filelogger.cpp index fff0b37fa..edb753a50 100644 --- a/src/filelogger.cpp +++ b/src/filelogger.cpp @@ -21,8 +21,6 @@ #include "inspircd.h" #include <fstream> -#include "socketengine.h" -#include "filelogger.h" FileLogStream::FileLogStream(LogLevel loglevel, FileWriter *fw) : LogStream(loglevel), f(fw) { diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp index 32f74475f..895b500ae 100644 --- a/src/hashcomp.cpp +++ b/src/hashcomp.cpp @@ -21,7 +21,6 @@ #include "inspircd.h" -#include "hashcomp.h" /****************************************************** * diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 50c79fb7b..6d072b0e5 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -52,11 +52,7 @@ #include <fstream> #include <iostream> #include "xline.h" -#include "socketengine.h" -#include "socket.h" -#include "command_parse.h" #include "exitcodes.h" -#include "caller.h" #include "testsuite.h" InspIRCd* ServerInstance = NULL; diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index f22645168..eb59bf4f1 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -23,9 +23,6 @@ #include "inspircd.h" -#include "socket.h" -#include "inspstring.h" -#include "socketengine.h" #include "iohook.h" #ifndef DISABLE_WRITEV diff --git a/src/listensocket.cpp b/src/listensocket.cpp index 2a74c0b68..c1339fb3d 100644 --- a/src/listensocket.cpp +++ b/src/listensocket.cpp @@ -19,8 +19,6 @@ #include "inspircd.h" -#include "socket.h" -#include "socketengine.h" #ifndef _WIN32 #include <netinet/tcp.h> diff --git a/src/logger.cpp b/src/logger.cpp index 78809c555..bf4ef582a 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -21,7 +21,6 @@ #include "inspircd.h" -#include "filelogger.h" /* * Suggested implementation... diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp index e14f93a77..0f8070cb4 100644 --- a/src/modes/cmode_k.cpp +++ b/src/modes/cmode_k.cpp @@ -21,9 +21,6 @@ #include "inspircd.h" -#include "mode.h" -#include "channels.h" -#include "users.h" #include "builtinmodes.h" ModeChannelKey::ModeChannelKey() diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp index 128854b50..9121d64ec 100644 --- a/src/modes/cmode_l.cpp +++ b/src/modes/cmode_l.cpp @@ -20,9 +20,6 @@ #include "inspircd.h" -#include "mode.h" -#include "channels.h" -#include "users.h" #include "builtinmodes.h" ModeChannelLimit::ModeChannelLimit() diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp index 6e96afa67..496a32718 100644 --- a/src/modes/cmode_o.cpp +++ b/src/modes/cmode_o.cpp @@ -21,11 +21,6 @@ #include "inspircd.h" -#include "configreader.h" -#include "mode.h" -#include "channels.h" -#include "users.h" -#include "modules.h" #include "builtinmodes.h" ModeChannelOp::ModeChannelOp() : PrefixMode(NULL, "op", 'o') diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp index c8ce30ab1..d6108a984 100644 --- a/src/modes/cmode_v.cpp +++ b/src/modes/cmode_v.cpp @@ -21,11 +21,6 @@ #include "inspircd.h" -#include "configreader.h" -#include "mode.h" -#include "channels.h" -#include "users.h" -#include "modules.h" #include "builtinmodes.h" ModeChannelVoice::ModeChannelVoice() : PrefixMode(NULL, "voice", 'v') diff --git a/src/modes/umode_o.cpp b/src/modes/umode_o.cpp index affd6b50c..6e9517a4f 100644 --- a/src/modes/umode_o.cpp +++ b/src/modes/umode_o.cpp @@ -19,9 +19,6 @@ #include "inspircd.h" -#include "mode.h" -#include "channels.h" -#include "users.h" #include "builtinmodes.h" ModeUserOperator::ModeUserOperator() : ModeHandler(NULL, "oper", 'o', PARAM_NONE, MODETYPE_USER) diff --git a/src/modes/umode_s.cpp b/src/modes/umode_s.cpp index b355cb824..08ee7f562 100644 --- a/src/modes/umode_s.cpp +++ b/src/modes/umode_s.cpp @@ -20,9 +20,6 @@ #include "inspircd.h" -#include "mode.h" -#include "channels.h" -#include "users.h" #include "builtinmodes.h" ModeUserServerNoticeMask::ModeUserServerNoticeMask() : ModeHandler(NULL, "snomask", 's', PARAM_SETONLY, MODETYPE_USER) diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp index afb690207..184013a4e 100644 --- a/src/modmanager_dynamic.cpp +++ b/src/modmanager_dynamic.cpp @@ -18,10 +18,6 @@ #include "inspircd.h" -#include "xline.h" -#include "socket.h" -#include "socketengine.h" -#include "command_parse.h" #include "exitcodes.h" #include <iostream> diff --git a/src/modules.cpp b/src/modules.cpp index 16459eeb4..2825b2d0e 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -26,10 +26,6 @@ #include <iostream> #include "inspircd.h" -#include "xline.h" -#include "socket.h" -#include "socketengine.h" -#include "command_parse.h" #include "exitcodes.h" #ifndef _WIN32 diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp index 8fc605df9..725a647c0 100644 --- a/src/modules/extra/m_mssql.cpp +++ b/src/modules/extra/m_mssql.cpp @@ -24,9 +24,6 @@ #include "inspircd.h" #include <tds.h> #include <tdsconvert.h> -#include "users.h" -#include "channels.h" -#include "modules.h" #include "m_sqlv2.h" diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index e6abbfcf9..1f7d7c450 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -24,7 +24,6 @@ #include "inspircd.h" #include <cstdlib> -#include <sstream> #include <libpq-fe.h> #include "modules/sql.h" diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index b3165c7be..0a883265f 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -21,7 +21,6 @@ #include "inspircd.h" -#include <stdarg.h> class DelayJoinMode : public ModeHandler { diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp index 74d25deba..58bbbde2a 100644 --- a/src/modules/m_httpd_acl.cpp +++ b/src/modules/m_httpd_acl.cpp @@ -20,7 +20,6 @@ #include "inspircd.h" #include "modules/httpd.h" -#include "protocol.h" class HTTPACL { diff --git a/src/modules/m_httpd_config.cpp b/src/modules/m_httpd_config.cpp index 8333d9f9c..3c4680799 100644 --- a/src/modules/m_httpd_config.cpp +++ b/src/modules/m_httpd_config.cpp @@ -20,7 +20,6 @@ #include "inspircd.h" #include "modules/httpd.h" -#include "protocol.h" class ModuleHttpConfig : public Module { diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index 2dcf1e1cf..008c3f2cd 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -24,7 +24,6 @@ #include "inspircd.h" #include "modules/httpd.h" #include "xline.h" -#include "protocol.h" class ModuleHttpStats : public Module { diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp index eb2d080c8..6889e388f 100644 --- a/src/modules/m_nationalchars.cpp +++ b/src/modules/m_nationalchars.cpp @@ -26,7 +26,6 @@ by Chernov-Phoenix Alexey (Phoenix@RusNet) mailto:phoenix /email address separator/ pravmail.ru */ #include "inspircd.h" -#include "caller.h" #include <fstream> class lwbNickHandler : public HandlerBase1<bool, const std::string&> diff --git a/src/snomasks.cpp b/src/snomasks.cpp index 738d0970d..fd6a2709a 100644 --- a/src/snomasks.cpp +++ b/src/snomasks.cpp @@ -21,7 +21,6 @@ #include "inspircd.h" -#include <stdarg.h> void SnomaskManager::FlushSnotices() { diff --git a/src/socket.cpp b/src/socket.cpp index 4ff43cde7..89c9969ff 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -22,8 +22,7 @@ #include "inspircd.h" -#include "socket.h" -#include "socketengine.h" + using irc::sockets::sockaddrs; /** This will bind a socket to a port. It works for UDP/TCP. diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp index 7d919ec9f..29404f416 100644 --- a/src/socketengines/socketengine_epoll.cpp +++ b/src/socketengines/socketengine_epoll.cpp @@ -18,12 +18,9 @@ */ -#include <vector> -#include <string> -#include <map> #include "inspircd.h" #include "exitcodes.h" -#include "socketengine.h" + #include <sys/epoll.h> #include <ulimit.h> #include <iostream> diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp index d5a3bb793..8cc8a33f9 100644 --- a/src/socketengines/socketengine_kqueue.cpp +++ b/src/socketengines/socketengine_kqueue.cpp @@ -24,7 +24,6 @@ #include <sys/types.h> #include <sys/event.h> #include <sys/time.h> -#include "socketengine.h" #include <iostream> #include <sys/sysctl.h> diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp index 4e6d0b9f5..dc63fe0ed 100644 --- a/src/socketengines/socketengine_poll.cpp +++ b/src/socketengines/socketengine_poll.cpp @@ -21,12 +21,8 @@ */ -#include <vector> -#include <string> -#include <map> #include "exitcodes.h" #include "inspircd.h" -#include "socketengine.h" #include <sys/poll.h> #include <sys/resource.h> diff --git a/src/socketengines/socketengine_ports.cpp b/src/socketengines/socketengine_ports.cpp index c6ddb041c..0d77954e4 100644 --- a/src/socketengines/socketengine_ports.cpp +++ b/src/socketengines/socketengine_ports.cpp @@ -25,11 +25,7 @@ # error You need Solaris 10 or later to make use of this code. #endif -#include <vector> -#include <string> -#include <map> #include "inspircd.h" -#include "socketengine.h" #include <port.h> #include <iostream> #include <ulimit.h> diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp index be4a7d186..f44346ad8 100644 --- a/src/socketengines/socketengine_select.cpp +++ b/src/socketengines/socketengine_select.cpp @@ -20,7 +20,6 @@ #include "inspircd.h" -#include "socketengine.h" #ifndef _WIN32 #include <sys/select.h> diff --git a/src/testsuite.cpp b/src/testsuite.cpp index b57a21ab8..a7a9ec99b 100644 --- a/src/testsuite.cpp +++ b/src/testsuite.cpp @@ -23,7 +23,6 @@ #include "inspircd.h" #include "testsuite.h" -#include "threadengine.h" #include <iostream> class TestSuiteThread : public Thread diff --git a/src/threadengine.cpp b/src/threadengine.cpp index 8e1bac470..4269c1aef 100644 --- a/src/threadengine.cpp +++ b/src/threadengine.cpp @@ -18,7 +18,6 @@ #include "inspircd.h" -#include "threadengine.h" void Thread::SetExitFlag() { diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp index 8527907c4..255fefe63 100644 --- a/src/threadengines/threadengine_pthread.cpp +++ b/src/threadengines/threadengine_pthread.cpp @@ -21,7 +21,6 @@ #include "inspircd.h" #include "threadengines/threadengine_pthread.h" #include <pthread.h> -#include <signal.h> #include <fcntl.h> ThreadEngine::ThreadEngine() diff --git a/src/timer.cpp b/src/timer.cpp index 8e11ee4a7..1c8de4cb9 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -21,7 +21,6 @@ #include "inspircd.h" -#include "timer.h" void Timer::SetInterval(time_t newinterval) { diff --git a/src/users.cpp b/src/users.cpp index 39e1ec796..4988590d9 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -24,8 +24,6 @@ #include "inspircd.h" -#include <stdarg.h> -#include "socketengine.h" #include "xline.h" already_sent_t LocalUser::already_sent_id = 0; diff --git a/src/wildcard.cpp b/src/wildcard.cpp index b62fd8a61..6711f953a 100644 --- a/src/wildcard.cpp +++ b/src/wildcard.cpp @@ -20,8 +20,6 @@ #include "inspircd.h" -#include "hashcomp.h" -#include "inspstring.h" static bool MatchInternal(const unsigned char* str, const unsigned char* mask, unsigned const char* map) { |