diff --git a/src/common.h b/src/common.h
index 1ec4b48b..6f9a3cbb 100644
--- a/src/common.h
+++ b/src/common.h
@@ -91,4 +91,6 @@ typedef struct _SERVER_CONNECT_REC SERVER_CONNECT_REC;
 typedef struct _SERVER_SETUP_REC SERVER_SETUP_REC;
 typedef struct _CHANNEL_SETUP_REC CHANNEL_SETUP_REC;
 
+typedef struct _WINDOW_REC WINDOW_REC;
+
 #endif
diff --git a/src/core/nicklist.c b/src/core/nicklist.c
index 66b58ffb..c4b27e9c 100644
--- a/src/core/nicklist.c
+++ b/src/core/nicklist.c
@@ -102,6 +102,7 @@ static void nicklist_destroy(CHANNEL_REC *channel, NICK_REC *nick)
 {
 	signal_emit("nicklist remove", 2, channel, nick);
 
+	if (g_hash_table_size(nick->module_data) > 5) g_error("BUG!"); // FIXME: debug
         MODULE_DATA_DEINIT(nick);
 	g_free(nick->nick);
 	g_free_not_null(nick->realname);
diff --git a/src/fe-common/core/chat-completion.c b/src/fe-common/core/chat-completion.c
index 28a9017f..0c401cfb 100644
--- a/src/fe-common/core/chat-completion.c
+++ b/src/fe-common/core/chat-completion.c
@@ -25,6 +25,7 @@
 #include "settings.h"
 
 #include "chatnets.h"
+#include "servers.h"
 #include "servers-setup.h"
 #include "channels.h"
 #include "channels-setup.h"
diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 0b82df64..83638ddf 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -29,6 +29,7 @@
 
 #include "chat-protocols.h"
 #include "chatnets.h"
+#include "servers.h"
 #include "channels.h"
 #include "channels-setup.h"
 #include "nicklist.h"
diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c
index ae38a2e2..fc7598d0 100644
--- a/src/fe-common/core/fe-common-core.c
+++ b/src/fe-common/core/fe-common-core.c
@@ -26,6 +26,7 @@
 #include "settings.h"
 #include "irssi-version.h"
 
+#include "servers.h"
 #include "channels.h"
 #include "servers-setup.h"
 
diff --git a/src/fe-common/core/fe-core-commands.c b/src/fe-common/core/fe-core-commands.c
index 3bf5a201..cf7938ea 100644
--- a/src/fe-common/core/fe-core-commands.c
+++ b/src/fe-common/core/fe-core-commands.c
@@ -27,6 +27,7 @@
 #include "line-split.h"
 #include "settings.h"
 #include "irssi-version.h"
+#include "servers.h"
 
 #include "fe-windows.h"
 #include "printtext.h"
diff --git a/src/fe-common/core/fe-exec.c b/src/fe-common/core/fe-exec.c
index 1bac8eb6..5d78894a 100644
--- a/src/fe-common/core/fe-exec.c
+++ b/src/fe-common/core/fe-exec.c
@@ -19,6 +19,7 @@
 */
 
 #include "module.h"
+#include "modules.h"
 #include "signals.h"
 #include "commands.h"
 #include "pidwait.h"
diff --git a/src/fe-common/core/fe-messages.c b/src/fe-common/core/fe-messages.c
index f77ee843..ffb46ca4 100644
--- a/src/fe-common/core/fe-messages.c
+++ b/src/fe-common/core/fe-messages.c
@@ -27,12 +27,14 @@
 #include "special-vars.h"
 #include "settings.h"
 
-#include "window-items.h"
-#include "fe-queries.h"
+#include "servers.h"
 #include "channels.h"
 #include "nicklist.h"
-#include "hilight-text.h"
 #include "ignore.h"
+
+#include "window-items.h"
+#include "fe-queries.h"
+#include "hilight-text.h"
 #include "printtext.h"
 
 #define ishighalnum(c) ((unsigned char) (c) >= 128 || isalnum(c))
diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c
index 9be07fce..9847c886 100644
--- a/src/fe-common/core/fe-queries.c
+++ b/src/fe-common/core/fe-queries.c
@@ -27,6 +27,7 @@
 #include "settings.h"
 
 #include "chat-protocols.h"
+#include "servers.h"
 #include "queries.h"
 
 #include "fe-windows.h"
diff --git a/src/fe-common/core/fe-windows.h b/src/fe-common/core/fe-windows.h
index d1c6fbc7..909cd1bc 100644
--- a/src/fe-common/core/fe-windows.h
+++ b/src/fe-common/core/fe-windows.h
@@ -1,7 +1,6 @@
 #ifndef __WINDOWS_H
 #define __WINDOWS_H
 
-#include "servers.h"
 #include "window-item-def.h"
 
 enum {
@@ -17,7 +16,7 @@ typedef struct {
 	unsigned int sticky:1;
 } WINDOW_BIND_REC;
 
-typedef struct {
+struct _WINDOW_REC {
 	int refnum;
 	char *name;
 
@@ -48,7 +47,7 @@ typedef struct {
 	void *theme; /* THEME_REC */
 
 	void *gui_data;
-} WINDOW_REC;
+};
 
 extern GSList *windows;
 extern WINDOW_REC *active_win;
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c
index de263057..78457fa4 100644
--- a/src/fe-common/core/formats.c
+++ b/src/fe-common/core/formats.c
@@ -25,6 +25,7 @@
 #include "settings.h"
 
 #include "levels.h"
+#include "servers.h"
 
 #include "fe-windows.h"
 #include "window-items.h"
diff --git a/src/fe-common/irc/dcc/fe-dcc-chat.c b/src/fe-common/irc/dcc/fe-dcc-chat.c
index 03bc5778..b1bad934 100644
--- a/src/fe-common/irc/dcc/fe-dcc-chat.c
+++ b/src/fe-common/irc/dcc/fe-dcc-chat.c
@@ -25,6 +25,7 @@
 #include "settings.h"
 
 #include "irc.h"
+#include "irc-servers.h"
 #include "irc-queries.h"
 #include "dcc-chat.h"
 
diff --git a/src/fe-common/irc/fe-irc-channels.c b/src/fe-common/irc/fe-irc-channels.c
index 67277191..0fd58343 100644
--- a/src/fe-common/irc/fe-irc-channels.c
+++ b/src/fe-common/irc/fe-irc-channels.c
@@ -23,6 +23,7 @@
 #include "signals.h"
 #include "levels.h"
 
+#include "irc-servers.h"
 #include "irc-channels.h"
 #include "channel-rejoin.h"