--- a/src/common/outbound.c	
+++ a/src/common/outbound.c	
@@ -54,6 +54,7 @@ 
 #include "server.h"
 #include "tree.h"
 #include "outbound.h"
+#include "chanopt.h"
 
 
 #ifdef USE_DEBUG
--- a/src/fe-gtk/chanlist.c	
+++ a/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"
 
--- a/src/fe-gtk/maingui.c	
+++ a/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"
--- a/src/fe-gtk/menu.c	
+++ a/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;
--- a/src/fe-gtk/notifygui.c	
+++ a/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"
--- a/src/fe-gtk/plugin-tray.c	
+++ a/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"
--- a/src/fe-gtk/servlistgui.c	
+++ a/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"
--- a/src/fe-gtk/servlistgui.h	
+++ a/src/fe-gtk/servlistgui.h	
@@ -0,0 +1, @@ 
+void servlist_autojoinedit (ircnet *net, char *channel, gboolean add);
--- a/src/fe-gtk/setup.c	
+++ a/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>
--- a/src/fe-gtk/userlistgui.c	
+++ a/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"
--