From 2e975068301631a3159e7a8fb54b70c75cdce98e Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Sun, 29 Oct 2017 18:55:29 +0100 Subject: [PATCH] use includes from irssi --- src/irc/core/bans.c | 10 +++++----- src/irc/core/channel-events.c | 10 +++++----- src/irc/core/channel-rejoin.c | 6 +++--- src/irc/core/channels-query.c | 8 ++++---- src/irc/core/ctcp.c | 12 ++++++------ src/irc/core/irc-cap.c | 4 ++-- src/irc/core/irc-channels-setup.c | 4 ++-- src/irc/core/irc-channels.c | 8 ++++---- src/irc/core/irc-channels.h | 7 ++++--- src/irc/core/irc-chatnets.c | 6 +++--- src/irc/core/irc-chatnets.h | 6 +++--- src/irc/core/irc-commands.c | 16 ++++++++-------- src/irc/core/irc-commands.h | 2 +- src/irc/core/irc-core.c | 6 +++--- src/irc/core/irc-expandos.c | 8 ++++---- src/irc/core/irc-masks.c | 2 +- src/irc/core/irc-masks.h | 2 +- src/irc/core/irc-nicklist.c | 6 +++--- src/irc/core/irc-nicklist.h | 2 +- src/irc/core/irc-queries.c | 4 ++-- src/irc/core/irc-queries.h | 4 ++-- src/irc/core/irc-servers-reconnect.c | 8 ++++---- src/irc/core/irc-servers-setup.c | 10 +++++----- src/irc/core/irc-servers-setup.h | 6 +++--- src/irc/core/irc-servers.c | 20 ++++++++++---------- src/irc/core/irc-servers.h | 8 ++++---- src/irc/core/irc-session.c | 8 ++++---- src/irc/core/irc.c | 10 +++++----- src/irc/core/irc.h | 2 +- src/irc/core/lag.c | 6 +++--- src/irc/core/massjoin.c | 4 ++-- src/irc/core/mode-lists.c | 4 ++-- src/irc/core/modes.c | 6 +++--- src/irc/core/modes.h | 2 +- src/irc/core/module.h | 2 +- src/irc/core/netsplit.c | 6 +++--- src/irc/core/netsplit.h | 2 +- src/irc/core/sasl.c | 4 ++-- src/irc/core/servers-idle.c | 2 +- src/irc/core/servers-redirect.c | 6 +++--- src/irc/dcc/dcc-autoget.c | 10 +++++----- src/irc/dcc/dcc-chat.c | 16 ++++++++-------- src/irc/dcc/dcc-get.c | 12 ++++++------ src/irc/dcc/dcc-queue.c | 12 ++++++------ src/irc/dcc/dcc-resume.c | 8 ++++---- src/irc/dcc/dcc-send.c | 12 ++++++------ src/irc/dcc/dcc-server.c | 10 +++++----- src/irc/dcc/dcc.c | 16 ++++++++-------- src/irc/dcc/dcc.h | 4 ++-- src/irc/dcc/module.h | 2 +- src/irc/flood/autoignore.c | 14 +++++++------- src/irc/flood/flood.c | 12 ++++++------ src/irc/flood/module.h | 2 +- src/irc/notifylist/module.h | 2 +- src/irc/notifylist/notify-commands.c | 8 ++++---- src/irc/notifylist/notify-ison.c | 6 +++--- src/irc/notifylist/notify-setup.c | 4 ++-- src/irc/notifylist/notify-whois.c | 6 +++--- src/irc/notifylist/notifylist.c | 10 +++++----- src/irc/proxy/proxy.h | 4 ++-- 60 files changed, 210 insertions(+), 209 deletions(-) diff --git a/src/irc/core/bans.c b/src/irc/core/bans.c index 198fdc4a..14a2bfe1 100644 --- a/src/irc/core/bans.c +++ b/src/irc/core/bans.c @@ -18,10 +18,10 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "module.h" -#include "signals.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include #include "irc-servers.h" #include "irc-channels.h" @@ -29,7 +29,7 @@ #include "irc-commands.h" #include "modes.h" #include "mode-lists.h" -#include "nicklist.h" +#include #define BAN_TYPE_NORMAL (IRC_MASK_USER | IRC_MASK_DOMAIN) #define BAN_TYPE_USER (IRC_MASK_USER) diff --git a/src/irc/core/channel-events.c b/src/irc/core/channel-events.c index b0bddab2..1798c945 100644 --- a/src/irc/core/channel-events.c +++ b/src/irc/core/channel-events.c @@ -19,11 +19,11 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "channels-setup.h" -#include "settings.h" -#include "recode.h" +#include +#include +#include +#include +#include #include "irc-servers.h" #include "irc-channels.h" diff --git a/src/irc/core/channel-rejoin.c b/src/irc/core/channel-rejoin.c index 154035ae..17400023 100644 --- a/src/irc/core/channel-rejoin.c +++ b/src/irc/core/channel-rejoin.c @@ -20,9 +20,9 @@ */ #include "module.h" -#include "signals.h" -#include "settings.h" -#include "misc.h" +#include +#include +#include #include "irc-servers.h" #include "irc-channels.h" diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c index d7dadf04..eeb9e5cd 100644 --- a/src/irc/core/channels-query.c +++ b/src/irc/core/channels-query.c @@ -39,13 +39,13 @@ loop: */ #include "module.h" -#include "misc.h" -#include "signals.h" -#include "settings.h" +#include +#include +#include #include "modes.h" #include "mode-lists.h" -#include "nicklist.h" +#include #include "irc-servers.h" #include "irc-channels.h" #include "servers-redirect.h" diff --git a/src/irc/core/ctcp.c b/src/irc/core/ctcp.c index accbb57f..65de47f6 100644 --- a/src/irc/core/ctcp.c +++ b/src/irc/core/ctcp.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "signals.h" -#include "levels.h" -#include "misc.h" -#include "special-vars.h" -#include "settings.h" +#include +#include +#include +#include +#include #include "irc-servers.h" #include "servers-idle.h" -#include "ignore.h" +#include #include "ctcp.h" typedef struct { diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c index 5464e493..1c5cc393 100644 --- a/src/irc/core/irc-cap.c +++ b/src/irc/core/irc-cap.c @@ -18,8 +18,8 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" +#include +#include #include "irc-cap.h" #include "irc-servers.h" diff --git a/src/irc/core/irc-channels-setup.c b/src/irc/core/irc-channels-setup.c index bbbc095c..93874d35 100644 --- a/src/irc/core/irc-channels-setup.c +++ b/src/irc/core/irc-channels-setup.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "signals.h" -#include "channels.h" +#include +#include void irc_channels_setup_init(void) { diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c index e775f530..d3351d69 100644 --- a/src/irc/core/irc-channels.c +++ b/src/irc/core/irc-channels.c @@ -19,10 +19,10 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "levels.h" -#include "channels-setup.h" +#include +#include +#include +#include #include "bans.h" #include "modes.h" diff --git a/src/irc/core/irc-channels.h b/src/irc/core/irc-channels.h index 8cfc4992..935cec4e 100644 --- a/src/irc/core/irc-channels.h +++ b/src/irc/core/irc-channels.h @@ -1,8 +1,9 @@ #ifndef __IRC_CHANNELS_H #define __IRC_CHANNELS_H -#include "chat-protocols.h" -#include "channels.h" +#include +#include +#include "irc.h" /* Returns IRC_CHANNEL_REC if it's IRC channel, NULL if it isn't. */ #define IRC_CHANNEL(channel) \ @@ -13,7 +14,7 @@ #define STRUCT_SERVER_REC IRC_SERVER_REC struct _IRC_CHANNEL_REC { -#include "channel-rec.h" +#include GSList *banlist; /* list of bans */ diff --git a/src/irc/core/irc-chatnets.c b/src/irc/core/irc-chatnets.c index 98ce89c3..73fc6ad4 100644 --- a/src/irc/core/irc-chatnets.c +++ b/src/irc/core/irc-chatnets.c @@ -19,9 +19,9 @@ */ #include "module.h" -#include "signals.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include +#include #include "irc-chatnets.h" diff --git a/src/irc/core/irc-chatnets.h b/src/irc/core/irc-chatnets.h index 3fd44472..00aea848 100644 --- a/src/irc/core/irc-chatnets.h +++ b/src/irc/core/irc-chatnets.h @@ -1,8 +1,8 @@ #ifndef __IRC_CHATNETS_H #define __IRC_CHATNETS_H -#include "chat-protocols.h" -#include "chatnets.h" +#include +#include /* returns IRC_CHATNET_REC if it's IRC network, NULL if it isn't */ #define IRC_CHATNET(chatnet) \ @@ -15,7 +15,7 @@ #define IRCNET(ircnet) IRC_CHATNET(ircnet) struct _IRC_CHATNET_REC { -#include "chatnet-rec.h" +#include char *usermode; char *alternate_nick; diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c index 32ee8845..7779dbe1 100644 --- a/src/irc/core/irc-commands.c +++ b/src/irc/core/irc-commands.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "misc.h" -#include "recode.h" -#include "special-vars.h" -#include "settings.h" -#include "window-item-def.h" +#include +#include +#include +#include +#include -#include "servers-reconnect.h" +#include #include "servers-redirect.h" -#include "servers-setup.h" -#include "nicklist.h" +#include +#include #include "bans.h" #include "irc-commands.h" diff --git a/src/irc/core/irc-commands.h b/src/irc/core/irc-commands.h index 739bd443..3e24c5a8 100644 --- a/src/irc/core/irc-commands.h +++ b/src/irc/core/irc-commands.h @@ -1,7 +1,7 @@ #ifndef __IRC_COMMANDS_H #define __IRC_COMMANDS_H -#include "commands.h" +#include #define command_bind_irc(cmd, section, signal) \ command_bind_proto(cmd, IRC_PROTOCOL, section, signal) diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c index a9221e02..1878ebf6 100644 --- a/src/irc/core/irc-core.c +++ b/src/irc/core/irc-core.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "chat-protocols.h" -#include "settings.h" +#include +#include #include "irc-servers.h" #include "irc-chatnets.h" @@ -30,7 +30,7 @@ #include "sasl.h" #include "irc-servers-setup.h" -#include "channels-setup.h" +#include #include "ctcp.h" #include "irc-commands.h" diff --git a/src/irc/core/irc-expandos.c b/src/irc/core/irc-expandos.c index 62ef577a..d8d55454 100644 --- a/src/irc/core/irc-expandos.c +++ b/src/irc/core/irc-expandos.c @@ -19,13 +19,13 @@ */ #include "module.h" -#include "misc.h" -#include "expandos.h" -#include "settings.h" +#include +#include +#include #include "irc-servers.h" #include "irc-channels.h" -#include "nicklist.h" +#include #ifndef HOST_NAME_MAX #define HOST_NAME_MAX 255 diff --git a/src/irc/core/irc-masks.c b/src/irc/core/irc-masks.c index d93a083d..b7a7c4c0 100644 --- a/src/irc/core/irc-masks.c +++ b/src/irc/core/irc-masks.c @@ -19,7 +19,7 @@ */ #include "module.h" -#include "network.h" +#include #include "irc-masks.h" diff --git a/src/irc/core/irc-masks.h b/src/irc/core/irc-masks.h index 680877c9..e152c52a 100644 --- a/src/irc/core/irc-masks.h +++ b/src/irc/core/irc-masks.h @@ -1,7 +1,7 @@ #ifndef __IRC_MASKS_H #define __IRC_MASKS_H -#include "masks.h" +#include #define IRC_MASK_NICK 0x01 #define IRC_MASK_USER 0x02 diff --git a/src/irc/core/irc-nicklist.c b/src/irc/core/irc-nicklist.c index 1cb1f3e9..4ce2f3ec 100644 --- a/src/irc/core/irc-nicklist.c +++ b/src/irc/core/irc-nicklist.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" +#include +#include #include "irc-servers.h" #include "irc-channels.h" #include "irc-masks.h" #include "irc-nicklist.h" #include "modes.h" -#include "servers.h" +#include /* Add new nick to list */ NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick, diff --git a/src/irc/core/irc-nicklist.h b/src/irc/core/irc-nicklist.h index 2ae17d2c..e9b30f30 100644 --- a/src/irc/core/irc-nicklist.h +++ b/src/irc/core/irc-nicklist.h @@ -1,7 +1,7 @@ #ifndef __IRC_NICKLIST_H #define __IRC_NICKLIST_H -#include "nicklist.h" +#include /* Add new nick to list */ NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick, diff --git a/src/irc/core/irc-queries.c b/src/irc/core/irc-queries.c index 64995ead..ee4e41f7 100644 --- a/src/irc/core/irc-queries.c +++ b/src/irc/core/irc-queries.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" +#include +#include #include "irc-nicklist.h" #include "irc-servers.h" diff --git a/src/irc/core/irc-queries.h b/src/irc/core/irc-queries.h index 0a3cc7a5..323006ad 100644 --- a/src/irc/core/irc-queries.h +++ b/src/irc/core/irc-queries.h @@ -1,8 +1,8 @@ #ifndef __IRC_QUERIES_H #define __IRC_QUERIES_H -#include "chat-protocols.h" -#include "queries.h" +#include +#include /* Returns IRC_QUERY_REC if it's IRC query, NULL if it isn't. */ #define IRC_QUERY(query) \ diff --git a/src/irc/core/irc-servers-reconnect.c b/src/irc/core/irc-servers-reconnect.c index ca61492d..ea1fa1d7 100644 --- a/src/irc/core/irc-servers-reconnect.c +++ b/src/irc/core/irc-servers-reconnect.c @@ -19,14 +19,14 @@ */ #include "module.h" -#include "commands.h" -#include "network.h" -#include "signals.h" +#include +#include +#include #include "modes.h" #include "irc-servers.h" -#include "settings.h" +#include static void sig_server_connect_copy(SERVER_CONNECT_REC **dest, IRC_SERVER_CONNECT_REC *src) diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c index bae7d3b4..ce7df745 100644 --- a/src/irc/core/irc-servers-setup.c +++ b/src/irc/core/irc-servers-setup.c @@ -19,11 +19,11 @@ */ #include "module.h" -#include "signals.h" -#include "network.h" -#include "servers-setup.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include +#include +#include +#include #include "irc-chatnets.h" #include "irc-servers-setup.h" diff --git a/src/irc/core/irc-servers-setup.h b/src/irc/core/irc-servers-setup.h index 92629c2b..ac2ca2fc 100644 --- a/src/irc/core/irc-servers-setup.h +++ b/src/irc/core/irc-servers-setup.h @@ -1,8 +1,8 @@ #ifndef __IRC_SERVERS_SETUP_H #define __IRC_SERVERS_SETUP_H -#include "chat-protocols.h" -#include "servers-setup.h" +#include +#include #define IRC_SERVER_SETUP(server) \ PROTO_CHECK_CAST(SERVER_SETUP(server), IRC_SERVER_SETUP_REC, \ @@ -12,7 +12,7 @@ (IRC_SERVER_SETUP(server) ? TRUE : FALSE) typedef struct { -#include "server-setup-rec.h" +#include /* override the default if > 0 */ int max_cmds_at_once; diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c index 4eaab712..58d3aa01 100644 --- a/src/irc/core/irc-servers.c +++ b/src/irc/core/irc-servers.c @@ -20,13 +20,13 @@ #include "module.h" -#include "net-sendbuffer.h" -#include "signals.h" -#include "rawlog.h" -#include "misc.h" +#include +#include +#include +#include -#include "channels.h" -#include "queries.h" +#include +#include #include "irc-nicklist.h" #include "irc-queries.h" @@ -35,15 +35,15 @@ #include "irc-cap.h" #include "sasl.h" -#include "channels-setup.h" +#include #include "channel-rejoin.h" #include "servers-idle.h" -#include "servers-reconnect.h" +#include #include "servers-redirect.h" #include "modes.h" -#include "settings.h" -#include "recode.h" +#include +#include #define DEFAULT_MAX_KICKS 1 #define DEFAULT_MAX_MODES 3 diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h index 09f3f81d..83ebef03 100644 --- a/src/irc/core/irc-servers.h +++ b/src/irc/core/irc-servers.h @@ -1,8 +1,8 @@ #ifndef __IRC_SERVERS_H #define __IRC_SERVERS_H -#include "chat-protocols.h" -#include "servers.h" +#include +#include #include "modes.h" /* returns IRC_SERVER_REC if it's IRC server, NULL if it isn't */ @@ -22,7 +22,7 @@ /* all strings should be either NULL or dynamically allocated */ /* address and nick are mandatory, rest are optional */ struct _IRC_SERVER_CONNECT_REC { -#include "server-connect-rec.h" +#include char *usermode; char *alternate_nick; @@ -40,7 +40,7 @@ struct _IRC_SERVER_CONNECT_REC { #define STRUCT_SERVER_CONNECT_REC IRC_SERVER_CONNECT_REC struct _IRC_SERVER_REC { -#include "server-rec.h" +#include /* For deciding if event should be redirected */ GSList *redirects; diff --git a/src/irc/core/irc-session.c b/src/irc/core/irc-session.c index 18e8e5c7..5521fe08 100644 --- a/src/irc/core/irc-session.c +++ b/src/irc/core/irc-session.c @@ -19,10 +19,10 @@ */ #include "module.h" -#include "signals.h" -#include "net-sendbuffer.h" -#include "lib-config/iconfig.h" -#include "misc.h" +#include +#include +#include +#include #include "irc-servers.h" #include "irc-channels.h" diff --git a/src/irc/core/irc.c b/src/irc/core/irc.c index 4dce3fcf..d51d1c1c 100644 --- a/src/irc/core/irc.c +++ b/src/irc/core/irc.c @@ -19,11 +19,11 @@ */ #include "module.h" -#include "modules.h" -#include "network.h" -#include "net-sendbuffer.h" -#include "rawlog.h" -#include "misc.h" +#include +#include +#include +#include +#include #include "irc-servers.h" #include "irc-channels.h" diff --git a/src/irc/core/irc.h b/src/irc/core/irc.h index b5bd833a..d018b90c 100644 --- a/src/irc/core/irc.h +++ b/src/irc/core/irc.h @@ -49,7 +49,7 @@ void irc_send_cmd_full(IRC_SERVER_REC *server, const char *cmd, int send_now, int immediate, int raw); /* Get count parameters from data */ -#include "commands.h" +#include char *event_get_param(char **data); char *event_get_params(const char *data, int count, ...); diff --git a/src/irc/core/lag.c b/src/irc/core/lag.c index 787505f0..9815ab78 100644 --- a/src/irc/core/lag.c +++ b/src/irc/core/lag.c @@ -19,9 +19,9 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include #include "irc-servers.h" #include "servers-redirect.h" diff --git a/src/irc/core/massjoin.c b/src/irc/core/massjoin.c index 6cc2b7c7..a6b2031a 100644 --- a/src/irc/core/massjoin.c +++ b/src/irc/core/massjoin.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "signals.h" -#include "settings.h" +#include +#include #include "irc-servers.h" #include "irc-channels.h" diff --git a/src/irc/core/mode-lists.c b/src/irc/core/mode-lists.c index 73b7a6b2..346e2b9e 100644 --- a/src/irc/core/mode-lists.c +++ b/src/irc/core/mode-lists.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "misc.h" -#include "signals.h" +#include +#include #include "irc-servers.h" #include "irc-channels.h" diff --git a/src/irc/core/modes.c b/src/irc/core/modes.c index cc3d0faf..539a559c 100644 --- a/src/irc/core/modes.c +++ b/src/irc/core/modes.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "signals.h" -#include "settings.h" +#include +#include #include "irc-commands.h" #include "irc-servers.h" @@ -28,7 +28,7 @@ #include "servers-redirect.h" #include "modes.h" #include "mode-lists.h" -#include "nicklist.h" +#include /* Change nick's mode in channel */ static void nick_mode_change(IRC_CHANNEL_REC *channel, const char *nick, diff --git a/src/irc/core/modes.h b/src/irc/core/modes.h index bef017ba..65911311 100644 --- a/src/irc/core/modes.h +++ b/src/irc/core/modes.h @@ -2,7 +2,7 @@ #define __MODES_H #include "irc-channels.h" -#include "nicklist.h" /* MAX_USER_PREFIXES */ +#include /* MAX_USER_PREFIXES */ typedef void mode_func_t(IRC_CHANNEL_REC *, const char *, char, char, char *, GString *); diff --git a/src/irc/core/module.h b/src/irc/core/module.h index 19c0b3cc..56b45a1b 100644 --- a/src/irc/core/module.h +++ b/src/irc/core/module.h @@ -1,4 +1,4 @@ -#include "common.h" +#include #include "irc.h" #define MODULE_NAME "irc/core" diff --git a/src/irc/core/netsplit.c b/src/irc/core/netsplit.c index 0642846f..67518c9b 100644 --- a/src/irc/core/netsplit.c +++ b/src/irc/core/netsplit.c @@ -19,9 +19,9 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "misc.h" +#include +#include +#include #include "irc-servers.h" #include "irc-channels.h" diff --git a/src/irc/core/netsplit.h b/src/irc/core/netsplit.h index cbe3f26f..7cdee694 100644 --- a/src/irc/core/netsplit.h +++ b/src/irc/core/netsplit.h @@ -1,7 +1,7 @@ #ifndef __NETSPLIT_H #define __NETSPLIT_H -#include "nicklist.h" +#include typedef struct { char *server; diff --git a/src/irc/core/sasl.c b/src/irc/core/sasl.c index 635b7dfb..dbd2212d 100644 --- a/src/irc/core/sasl.c +++ b/src/irc/core/sasl.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "misc.h" -#include "settings.h" +#include +#include #include "irc-cap.h" #include "irc-servers.h" diff --git a/src/irc/core/servers-idle.c b/src/irc/core/servers-idle.c index 2b1851af..ed88b9d1 100644 --- a/src/irc/core/servers-idle.c +++ b/src/irc/core/servers-idle.c @@ -19,7 +19,7 @@ */ #include "module.h" -#include "signals.h" +#include #include "irc-servers.h" #include "servers-idle.h" diff --git a/src/irc/core/servers-redirect.c b/src/irc/core/servers-redirect.c index aeb9c010..9f8d22d3 100644 --- a/src/irc/core/servers-redirect.c +++ b/src/irc/core/servers-redirect.c @@ -19,9 +19,9 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "rawlog.h" +#include +#include +#include #include "irc-servers.h" #include "servers-redirect.h" diff --git a/src/irc/dcc/dcc-autoget.c b/src/irc/dcc/dcc-autoget.c index dd12f438..33aad42a 100644 --- a/src/irc/dcc/dcc-autoget.c +++ b/src/irc/dcc/dcc-autoget.c @@ -19,11 +19,11 @@ */ #include "module.h" -#include "signals.h" -#include "masks.h" -#include "settings.h" -#include "servers.h" -#include "misc.h" +#include +#include +#include +#include +#include #include "dcc-get.h" diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c index 88c577f7..0186cbc5 100644 --- a/src/irc/dcc/dcc-chat.c +++ b/src/irc/dcc/dcc-chat.c @@ -19,17 +19,17 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "recode.h" -#include "network.h" -#include "net-sendbuffer.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include +#include #include "irc-servers.h" #include "irc-queries.h" -#include "masks.h" +#include #include "dcc-chat.h" diff --git a/src/irc/dcc/dcc-get.c b/src/irc/dcc/dcc-get.c index cecbb076..4da70109 100644 --- a/src/irc/dcc/dcc-get.c +++ b/src/irc/dcc/dcc-get.c @@ -19,12 +19,12 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "misc.h" -#include "settings.h" -#include "net-sendbuffer.h" +#include +#include +#include +#include +#include +#include #include "irc-servers.h" #include "dcc-get.h" diff --git a/src/irc/dcc/dcc-queue.c b/src/irc/dcc/dcc-queue.c index 895f9e44..bf4788f5 100644 --- a/src/irc/dcc/dcc-queue.c +++ b/src/irc/dcc/dcc-queue.c @@ -21,12 +21,12 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "net-sendbuffer.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include #include "irc-servers.h" #include "dcc-queue.h" diff --git a/src/irc/dcc/dcc-resume.c b/src/irc/dcc/dcc-resume.c index ce0ac925..d421b930 100644 --- a/src/irc/dcc/dcc-resume.c +++ b/src/irc/dcc/dcc-resume.c @@ -19,10 +19,10 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "misc.h" +#include +#include +#include +#include #include "dcc-file.h" #include "dcc-get.h" diff --git a/src/irc/dcc/dcc-send.c b/src/irc/dcc/dcc-send.c index 912129b7..d8894eb8 100644 --- a/src/irc/dcc/dcc-send.c +++ b/src/irc/dcc/dcc-send.c @@ -19,12 +19,12 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "net-sendbuffer.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include #include "irc-servers.h" diff --git a/src/irc/dcc/dcc-server.c b/src/irc/dcc/dcc-server.c index 7ae572cd..05fe0d14 100644 --- a/src/irc/dcc/dcc-server.c +++ b/src/irc/dcc/dcc-server.c @@ -19,11 +19,11 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "net-sendbuffer.h" -#include "misc.h" +#include +#include +#include +#include +#include #include "irc-servers.h" diff --git a/src/irc/dcc/dcc.c b/src/irc/dcc/dcc.c index c51f7c7a..8402ba51 100644 --- a/src/irc/dcc/dcc.c +++ b/src/irc/dcc/dcc.c @@ -19,16 +19,16 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "network.h" -#include "misc.h" -#include "settings.h" -#include "ignore.h" -#include "levels.h" +#include +#include +#include +#include +#include +#include +#include #include "irc-servers.h" -#include "servers-setup.h" +#include #include "dcc-chat.h" #include "dcc-get.h" diff --git a/src/irc/dcc/dcc.h b/src/irc/dcc/dcc.h index 144cc89b..908e10ed 100644 --- a/src/irc/dcc/dcc.h +++ b/src/irc/dcc/dcc.h @@ -1,8 +1,8 @@ #ifndef __DCC_H #define __DCC_H -#include "modules.h" -#include "network.h" +#include +#include #define DCC(dcc) ((DCC_REC *) (dcc)) diff --git a/src/irc/dcc/module.h b/src/irc/dcc/module.h index 8436945d..5c0c1a62 100644 --- a/src/irc/dcc/module.h +++ b/src/irc/dcc/module.h @@ -1,4 +1,4 @@ -#include "common.h" +#include #include "irc.h" #define MODULE_NAME "irc/dcc" diff --git a/src/irc/flood/autoignore.c b/src/irc/flood/autoignore.c index 86ff3ec5..715d428d 100644 --- a/src/irc/flood/autoignore.c +++ b/src/irc/flood/autoignore.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "modules.h" -#include "signals.h" -#include "commands.h" -#include "levels.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include +#include #include "irc-servers.h" -#include "ignore.h" +#include void autoignore_update(IGNORE_REC *rec, int level) { diff --git a/src/irc/flood/flood.c b/src/irc/flood/flood.c index 0944a6eb..fe0c148a 100644 --- a/src/irc/flood/flood.c +++ b/src/irc/flood/flood.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "modules.h" -#include "signals.h" -#include "levels.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include +#include #include "irc.h" #include "irc-servers.h" -#include "ignore.h" +#include void autoignore_init(void); void autoignore_deinit(void); diff --git a/src/irc/flood/module.h b/src/irc/flood/module.h index fc7eceeb..277ff369 100644 --- a/src/irc/flood/module.h +++ b/src/irc/flood/module.h @@ -1,4 +1,4 @@ -#include "common.h" +#include #include "irc.h" typedef struct { diff --git a/src/irc/notifylist/module.h b/src/irc/notifylist/module.h index c7239a88..b6d698e9 100644 --- a/src/irc/notifylist/module.h +++ b/src/irc/notifylist/module.h @@ -1,4 +1,4 @@ -#include "common.h" +#include #include "irc.h" #define MODULE_NAME "irc/notifylist" diff --git a/src/irc/notifylist/notify-commands.c b/src/irc/notifylist/notify-commands.c index 0d4fd4f2..9114db6c 100644 --- a/src/irc/notifylist/notify-commands.c +++ b/src/irc/notifylist/notify-commands.c @@ -19,10 +19,10 @@ */ #include "module.h" -#include "signals.h" -#include "commands.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include +#include #include "notifylist.h" diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c index 8a8865cc..2d0a355e 100644 --- a/src/irc/notifylist/notify-ison.c +++ b/src/irc/notifylist/notify-ison.c @@ -19,9 +19,9 @@ */ #include "module.h" -#include "signals.h" -#include "misc.h" -#include "settings.h" +#include +#include +#include #include "irc.h" #include "irc-servers.h" diff --git a/src/irc/notifylist/notify-setup.c b/src/irc/notifylist/notify-setup.c index 9ea481ca..d975a37d 100644 --- a/src/irc/notifylist/notify-setup.c +++ b/src/irc/notifylist/notify-setup.c @@ -19,8 +19,8 @@ */ #include "module.h" -#include "lib-config/iconfig.h" -#include "settings.h" +#include +#include #include "irc-servers.h" #include "notifylist.h" diff --git a/src/irc/notifylist/notify-whois.c b/src/irc/notifylist/notify-whois.c index 2d0736b5..dff332f3 100644 --- a/src/irc/notifylist/notify-whois.c +++ b/src/irc/notifylist/notify-whois.c @@ -19,12 +19,12 @@ */ #include "module.h" -#include "signals.h" -#include "expandos.h" +#include +#include #include "irc.h" #include "irc-servers.h" -#include "masks.h" +#include #include "notifylist.h" diff --git a/src/irc/notifylist/notifylist.c b/src/irc/notifylist/notifylist.c index 573f7a7f..6215dab6 100644 --- a/src/irc/notifylist/notifylist.c +++ b/src/irc/notifylist/notifylist.c @@ -19,15 +19,15 @@ */ #include "module.h" -#include "modules.h" -#include "signals.h" -#include "settings.h" +#include +#include +#include #include "irc.h" #include "irc-channels.h" #include "servers-redirect.h" -#include "masks.h" -#include "nicklist.h" +#include +#include #include "notifylist.h" #include "notify-setup.h" diff --git a/src/irc/proxy/proxy.h b/src/irc/proxy/proxy.h index 620ea605..6572464a 100644 --- a/src/irc/proxy/proxy.h +++ b/src/irc/proxy/proxy.h @@ -1,9 +1,9 @@ #ifndef PROXY_H #define PROXY_H -#include "common.h" +#include -#include "network.h" +#include #include "irc.h" #include "irc-servers.h"