4 files changed, 13 insertions, 13 deletions
diff --git a/src/irc/bot/bot-events.c b/src/irc/bot/bot-events.c
index d344bb12..ffc403b1 100644
--- a/src/irc/bot/bot-events.c
+++ b/src/irc/bot/bot-events.c
@@ -23,7 +23,7 @@
 #include "commands.h"
 
 #include "irc.h"
-#include "irc-server.h"
+#include "irc-servers.h"
 #include "channels.h"
 #include "nicklist.h"
 #include "modes.h"
@@ -31,7 +31,7 @@
 
 #include "bot-users.h"
 
-static int get_flags(USER_REC *user, CHANNEL_REC *channel)
+static int get_flags(USER_REC *user, IRC_CHANNEL_REC *channel)
 {
 	USER_CHAN_REC *userchan;
 
@@ -43,7 +43,7 @@ static int get_flags(USER_REC *user, CHANNEL_REC *channel)
 		(~user->not_flags);
 }
 
-static void event_massjoin(CHANNEL_REC *channel, GSList *users)
+static void event_massjoin(IRC_CHANNEL_REC *channel, GSList *users)
 {
 	USER_REC *user;
 	USER_CHAN_REC *userchan;
@@ -86,7 +86,7 @@ static void event_massjoin(CHANNEL_REC *channel, GSList *users)
 }
 
 /* Parse channel mode string */
-static void parse_channel_mode(CHANNEL_REC *channel, const char *mode,
+static void parse_channel_mode(IRC_CHANNEL_REC *channel, const char *mode,
 			       const char *nick, const char *address)
 {
 	NICK_REC *nickrec, *splitnick;
@@ -140,7 +140,7 @@ static void parse_channel_mode(CHANNEL_REC *channel, const char *mode,
 			continue;
 
 		/* check that op is valid */
-		nickrec = nicklist_find(channel, ptr);
+		nickrec = nicklist_find(CHANNEL(channel), ptr);
 		if (nickrec == NULL || nickrec->host == NULL)
 			continue;
 
@@ -169,7 +169,7 @@ static void parse_channel_mode(CHANNEL_REC *channel, const char *mode,
 static void event_mode(const char *data, IRC_SERVER_REC *server,
 		       const char *nick, const char *address)
 {
-	CHANNEL_REC *chanrec;
+	IRC_CHANNEL_REC *chanrec;
 	char *params, *channel, *mode;
 
 	g_return_if_fail(data != NULL);
@@ -178,7 +178,7 @@ static void event_mode(const char *data, IRC_SERVER_REC *server,
 
 	if (ischannel(*channel)) {
 		/* channel mode change */
-		chanrec = channel_find(server, channel);
+		chanrec = irc_channel_find(server, channel);
 		if (chanrec != NULL)
 			parse_channel_mode(chanrec, mode, nick, address);
 	}
diff --git a/src/irc/bot/bot-irc-commands.c b/src/irc/bot/bot-irc-commands.c
index f4b2b7f3..5713ccca 100644
--- a/src/irc/bot/bot-irc-commands.c
+++ b/src/irc/bot/bot-irc-commands.c
@@ -23,10 +23,10 @@
 #include "commands.h"
 
 #include "irc.h"
-#include "irc-server.h"
+#include "irc-servers.h"
 #include "channels.h"
 #include "nicklist.h"
-#include "masks.h"
+#include "irc-masks.h"
 
 #include "bot-users.h"
 #include "botnet-users.h"
diff --git a/src/irc/bot/bot-users.c b/src/irc/bot/bot-users.c
index 2a012b66..26354188 100644
--- a/src/irc/bot/bot-users.c
+++ b/src/irc/bot/bot-users.c
@@ -28,7 +28,7 @@
 #include "lib-config/iconfig.h"
 
 #include "channels.h"
-#include "nicklist.h"
+#include "irc-nicklist.h"
 #include "masks.h"
 
 #include "bot-users.h"
@@ -154,7 +154,7 @@ static int botuser_find_mask(USER_REC *user, const char *nick, const char *host)
 	for (tmp = user->masks; tmp != NULL; tmp = tmp->next) {
 		USER_MASK_REC *rec = tmp->data;
 
-		if (irc_mask_match_address(rec->mask, nick, host)) {
+		if (mask_match_address(NULL, rec->mask, nick, host)) {
 			user->not_flags = rec->not_flags;
 			return TRUE;
 		}
@@ -194,7 +194,7 @@ USER_REC *botuser_find(const char *nick, const char *host)
 	g_return_val_if_fail(nick != NULL, NULL);
 
 	/* First check for user with same nick */
-	stripnick = nick_strip(nick);
+	stripnick = irc_nick_strip(nick);
 	user = g_hash_table_lookup(users, stripnick);
 	g_free(stripnick);
 
diff --git a/src/irc/bot/botnet-users.c b/src/irc/bot/botnet-users.c
index 3b366ac6..4f5d6c06 100644
--- a/src/irc/bot/botnet-users.c
+++ b/src/irc/bot/botnet-users.c
@@ -23,7 +23,7 @@
 #include "commands.h"
 
 #include "irc.h"
-#include "irc-server.h"
+#include "irc-servers.h"
 #include "channels.h"
 #include "nicklist.h"
 #include "masks.h"