diff --git a/gnome/src/config/accountlistconfigdialog.c b/gnome/src/config/accountlistconfigdialog.c
index 34301170997fea0b946fdc0bcc7c402b09fb271e..32c6967be9b0fe296918af4d0d21ab59af240961 100644
--- a/gnome/src/config/accountlistconfigdialog.c
+++ b/gnome/src/config/accountlistconfigdialog.c
@@ -30,28 +30,28 @@
  */
 
 
-#include <accountlistconfigdialog.h>
-#include <dbus/dbus.h>
-#include <accountconfigdialog.h>
-#include <actions.h>
-#include <utils.h>
+#include "accountlistconfigdialog.h"
+#include "dbus/dbus.h"
+#include "accountconfigdialog.h"
+#include "actions.h"
+#include "mainwindow.h"
+#include "utils.h"
 #include <string.h>
 #include <libgnome/gnome-help.h>
 
 #define CONTEXT_ID_REGISTRATION 0
 
-GtkWidget *addButton;
-GtkWidget *editButton;
-GtkWidget *deleteButton;
-GtkWidget *restoreButton;
-GtkWidget *accountMoveDownButton;
-GtkWidget *accountMoveUpButton;
-GtkWidget * status_bar;
-GtkListStore * accountStore;
+static GtkWidget *addButton;
+static GtkWidget *editButton;
+static GtkWidget *deleteButton;
+static GtkWidget *accountMoveDownButton;
+static GtkWidget *accountMoveUpButton;
+static GtkWidget * status_bar;
+static GtkListStore * accountStore;
 
-GtkDialog * accountListDialog = NULL;
+static GtkDialog * accountListDialog = NULL;
 
-account_t * selectedAccount = NULL;
+static account_t * selectedAccount = NULL;
 // Account properties
 enum {
     COLUMN_ACCOUNT_ALIAS,
@@ -67,8 +67,8 @@ enum {
  */
 static void delete_account_cb (void)
 {
-    if(selectedAccount == NULL) {
-	ERROR("Config: Error: No selected account in delete action");
+    if (selectedAccount == NULL) {
+        ERROR("Config: Error: No selected account in delete action");
         return;
     }
 
@@ -81,7 +81,7 @@ static void delete_account_cb (void)
  */
 static void edit_account_cb (void)
 {
-    if(selectedAccount == NULL) {
+    if (selectedAccount == NULL) {
         ERROR("Config: Error: No selected account in edit action");
         return;
     }
@@ -94,7 +94,6 @@ static void edit_account_cb (void)
  */
 static void add_account_cb (void)
 {
-
     show_account_window (NULL);
 }
 
@@ -103,10 +102,9 @@ static void add_account_cb (void)
  */
 void account_list_config_dialog_fill()
 {
-
     if (accountListDialog == NULL) {
         DEBUG("Config: No account dialog, returning");
-	return;
+        return;
     }
 
     GtkTreeIter iter;
@@ -115,7 +113,7 @@ void account_list_config_dialog_fill()
 
     // IP2IP account must be first
     account_t *a = account_list_get_by_id ("IP2IP");
-    if(a == NULL) {
+    if (a == NULL) {
         ERROR("Config: Error: Could not find IP2IP account");
         return;
     }
@@ -132,11 +130,10 @@ void account_list_config_dialog_fill()
                             COLUMN_ACCOUNT_DATA, a,   // Pointer
                             -1);
 
-    unsigned int i;
-    for (i = 0; i < account_list_get_size(); i++) {
+    for (size_t i = 0; i < account_list_get_size(); i++) {
         a = account_list_get_nth (i);
 
-        if(a==NULL) {
+        if (a == NULL) {
             ERROR("Config: Error: Account %d is NULL while parsing the list", i);
             return;
         }
diff --git a/gnome/src/config/preferencesdialog.c b/gnome/src/config/preferencesdialog.c
index 1d0ec38ee96ef9dd1801b22b9366d31ec633dddb..3e404004954a248c1084b18d83ff36b291ac5226 100644
--- a/gnome/src/config/preferencesdialog.c
+++ b/gnome/src/config/preferencesdialog.c
@@ -46,6 +46,7 @@
 #include "hooks-config.h"
 #include "audioconf.h"
 #include "uimanager.h"
+#include "mainwindow.h"
 
 /**
  * Local variables
diff --git a/gnome/src/contacts/addrbookfactory.c b/gnome/src/contacts/addrbookfactory.c
index dbf2ac9bd3210358d7d7b4093f53735ce16f0388..af213b1ce8e33f603242abbf70614fc85f1c1de4 100644
--- a/gnome/src/contacts/addrbookfactory.c
+++ b/gnome/src/contacts/addrbookfactory.c
@@ -32,6 +32,7 @@
 #include "addressbook-config.h"
 
 #include "calltab.h"
+#include "calltree.h"
 
 #include <glib.h>
 #include <dlfcn.h>
diff --git a/gnome/tests/Makefile.am b/gnome/tests/Makefile.am
index 9bfb21689f348f67e6882e20c17372bc0c8c292c..979769c57b2ee1aa0fc9e4bd806e0c73e705bade 100644
--- a/gnome/tests/Makefile.am
+++ b/gnome/tests/Makefile.am
@@ -27,7 +27,7 @@ check_config_LDADD =		$(SFLPHONE_LIBS) @CHECK_LIBS@ @LIBSEXY_LIBS@
 
 ###########################################################
 
-check_dbus_SOURCES =		check_dbus.c $(top_srcdir)/src/logger.c $(top_srcdir)/src/accountlist.c $(top_srcdir)/src/actions.c $(top_srcdir)/src/codeclist.c $(top_srcdir)/src/dialpad.c $(top_srcdir)/src/errors.c $(top_srcdir)/src/mainwindow.c $(top_srcdir)/src/reqaccount.c $(top_srcdir)/src/sflnotify.c $(top_srcdir)/src/sliders.c $(top_srcdir)/src/statusicon.c $(top_srcdir)/src/callable_obj.c $(top_srcdir)/src/eel-gconf-extensions.c $(top_srcdir)/src/uimanager.c $(top_srcdir)/src/conference_obj.c $(top_srcdir)/src/shortcuts.c $(top_srcdir)/src/imwindow.c
+check_dbus_SOURCES =		check_dbus.c $(top_srcdir)/src/logger.c $(top_srcdir)/src/accountlist.c $(top_srcdir)/src/actions.c $(top_srcdir)/src/codeclist.c $(top_srcdir)/src/dialpad.c $(top_srcdir)/src/mainwindow.c $(top_srcdir)/src/reqaccount.c $(top_srcdir)/src/sflnotify.c $(top_srcdir)/src/sliders.c $(top_srcdir)/src/statusicon.c $(top_srcdir)/src/callable_obj.c $(top_srcdir)/src/eel-gconf-extensions.c $(top_srcdir)/src/uimanager.c $(top_srcdir)/src/conference_obj.c $(top_srcdir)/src/shortcuts.c $(top_srcdir)/src/imwindow.c
 
 check_dbus_CFLAGS = 		@CHECK_CFLAGS@ @SFLGTK_CFLAGS@ @DBUSGLIB_CFLAGS@ @WEBKIT_CFLAGS@ @LIBGNOMEUI_CFLAGS@
 check_dbus_LDADD =			$(SFLPHONE_LIBS) @CHECK_LIBS@ @LIBSEXY_LIBS@ $(top_builddir)/src/widget/libwidget.la $(top_builddir)/src/icons/libicons.la