diff --git a/account.c b/account.c
index cb54731..912cba6 100644
--- a/account.c
+++ b/account.c
@@ -26,6 +26,7 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
 #include "account.h"
+#include "chat.h"
 
 account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass )
 {
diff --git a/bitlbee.h b/bitlbee.h
index cbda42c..46a9141 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -128,7 +128,6 @@
 #include "commands.h"
 #include "account.h"
 #include "nick.h"
-#include "chat.h"
 #include "conf.h"
 #include "log.h"
 #include "ini.h"
diff --git a/chat.c b/chat.c
index 87c262b..8c5ce0b 100644
--- a/chat.c
+++ b/chat.c
@@ -24,6 +24,7 @@
 */
 
 #include "bitlbee.h"
+#include "chat.h"
 
 struct chat *chat_add( irc_t *irc, account_t *acc, char *handle, char *channel )
 {
diff --git a/irc_commands.c b/irc_commands.c
index 044ff62..74334ee 100644
--- a/irc_commands.c
+++ b/irc_commands.c
@@ -26,6 +26,7 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
 #include "ipc.h"
+#include "chat.h"
 
 static void irc_cmd_pass( irc_t *irc, char **cmd )
 {
diff --git a/protocols/nogaim.h b/protocols/nogaim.h
index 1e5df50..ade8c23 100644
--- a/protocols/nogaim.h
+++ b/protocols/nogaim.h
@@ -43,6 +43,7 @@
 #include "proxy.h"
 #include "query.h"
 #include "md5.h"
+#include "chat.h"
 
 #define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */
 
diff --git a/root_commands.c b/root_commands.c
index 678ee14..5de616f 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -28,6 +28,7 @@
 #include "crypting.h"
 #include "bitlbee.h"
 #include "help.h"
+#include "chat.h"
 
 #include <string.h>
 
diff --git a/storage_xml.c b/storage_xml.c
index b78c366..b6745c7 100644
--- a/storage_xml.c
+++ b/storage_xml.c
@@ -28,6 +28,7 @@
 #include "base64.h"
 #include "arc.h"
 #include "md5.h"
+#include "chat.h"
 
 #if GLIB_CHECK_VERSION(2,8,0)
 #include <glib/gstdio.h>