diff --git a/src/irc/bot/bot-events.c b/src/irc/bot/bot-events.c
index 4268c239..f00fc5f8 100644
--- a/src/irc/bot/bot-events.c
+++ b/src/irc/bot/bot-events.c
@@ -24,7 +24,7 @@
 
 #include "irc.h"
 #include "irc-servers.h"
-#include "channels.h"
+#include "irc-channels.h"
 #include "nicklist.h"
 #include "modes.h"
 #include "netsplit.h"
diff --git a/src/irc/bot/bot-users.c b/src/irc/bot/bot-users.c
index bc9906a6..f9f6eae7 100644
--- a/src/irc/bot/bot-users.c
+++ b/src/irc/bot/bot-users.c
@@ -27,7 +27,9 @@
 #include "misc.h"
 #include "lib-config/iconfig.h"
 
-#include "channels.h"
+#include "irc.h"
+#include "irc-servers.h"
+#include "irc-channels.h"
 #include "irc-nicklist.h"
 #include "masks.h"
 
diff --git a/src/irc/proxy/module.h b/src/irc/proxy/module.h
index 3905a065..5a5c800f 100644
--- a/src/irc/proxy/module.h
+++ b/src/irc/proxy/module.h
@@ -4,6 +4,7 @@
 
 #include "network.h"
 #include "line-split.h"
+#include "irc.h"
 #include "irc-servers.h"
 
 typedef struct {