diff --git a/src/common/outbound.c b/src/common/outbound.c
index 7c6e5e6..fa05ff5 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -54,6 +54,7 @@
 #include "server.h"
 #include "tree.h"
 #include "outbound.h"
+#include "chanopt.h"
 
 
 #ifdef USE_DEBUG
diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c
index 2f65b51..714bfb7 100644
--- a/src/fe-gtk/chanlist.c
+++ b/src/fe-gtk/chanlist.c
@@ -51,7 +51,7 @@
 #include "../common/server.h"
 #include "gtkutil.h"
 #include "maingui.h"
-
+#include "menu.h"
 
 #include "custom-list.h"
 
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index 994e8cd..ba81c18 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -53,6 +53,7 @@
 #include "../common/plugin.h"
 #include "../common/modes.h"
 #include "../common/url.h"
+#include "../common/text.h"
 #include "fe-gtk.h"
 #include "banlist.h"
 #include "gtkutil.h"
diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c
index d04be22..e781ac2 100644
--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@@ -70,6 +70,7 @@
 #include "textgui.h"
 #include "urlgrab.h"
 #include "userlistgui.h"
+#include "servlistgui.h"
 #include "menu.h"
 
 static GSList *submenu_list;
diff --git a/src/fe-gtk/notifygui.c b/src/fe-gtk/notifygui.c
index 5acb683..83a9b57 100644
--- a/src/fe-gtk/notifygui.c
+++ b/src/fe-gtk/notifygui.c
@@ -45,6 +45,7 @@
 #include "../common/server.h"
 #include "../common/util.h"
 #include "../common/userlist.h"
+#include "../common/outbound.h"
 #include "gtkutil.h"
 #include "maingui.h"
 #include "palette.h"
diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c
index 923a2dd..3be9fb0 100644
--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -6,6 +6,7 @@
 #include "../common/xchat.h"
 #include "../common/xchatc.h"
 #include "../common/inbound.h"
+#include "../common/outbound.h"
 #include "../common/server.h"
 #include "../common/fe.h"
 #include "../common/util.h"
diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c
index b30d737..4a25621 100644
--- a/src/fe-gtk/servlistgui.c
+++ b/src/fe-gtk/servlistgui.c
@@ -37,6 +37,7 @@
 #include "../common/servlist.h"
 #include "../common/cfgfiles.h"
 #include "../common/fe.h"
+#include "../common/util.h"
 
 #include "fe-gtk.h"
 #include "gtkutil.h"
diff --git a/src/fe-gtk/servlistgui.h b/src/fe-gtk/servlistgui.h
new file mode 100644
index 0000000..f2c2d14
--- /dev/null
+++ xchat-2.8.8/src/fe-gtk/servlistgui.h
@@ -0,0 +1 @@
+void servlist_autojoinedit (ircnet *net, char *channel, gboolean add);
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index f271d6e..b7bfa9d 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -21,6 +21,7 @@
 #include "palette.h"
 #include "pixmaps.h"
 #include "menu.h"
+#include "plugin-tray.h"
 
 #include <gtk/gtkcolorseldialog.h>
 #include <gtk/gtktable.h>
diff --git a/src/fe-gtk/userlistgui.c b/src/fe-gtk/userlistgui.c
index f040a6a..5edee73 100644
--- a/src/fe-gtk/userlistgui.c
+++ b/src/fe-gtk/userlistgui.c
@@ -40,6 +40,7 @@
 #include "../common/modes.h"
 #include "../common/notify.h"
 #include "../common/xchatc.h"
+#include "../common/fe.h"
 #include "gtkutil.h"
 #include "palette.h"
 #include "maingui.h"
-- 
1.7.3.4