diff --git a/gnome/src/contacts/calltree.c b/gnome/src/contacts/calltree.c
index 3972a511b546f03ba7f9c854405547b2a004d327..306696dffcefaf6b71c7ed73fd4f7ec69d604184 100644
--- a/gnome/src/contacts/calltree.c
+++ b/gnome/src/contacts/calltree.c
@@ -1335,7 +1335,7 @@ void calltree_display (calltab_t *tab)
 gboolean calltree_update_clock(gpointer data UNUSED)
 {
     char timestr[20];
-    char *msg = "";
+    const gchar *msg = "";
     long duration;
     callable_obj_t *c = calltab_get_selected_call (current_calls);
 
@@ -1357,6 +1357,7 @@ gboolean calltree_update_clock(gpointer data UNUSED)
         }
 
     statusbar_update_clock (msg);
+    return TRUE;
 }
 
 
diff --git a/gnome/src/icons/icon_factory.c b/gnome/src/icons/icon_factory.c
index f0edd51d6632778514482ec83291e14459cd161e..fc833625b0779f67f08510a59d45a8025e8b2d08 100644
--- a/gnome/src/icons/icon_factory.c
+++ b/gnome/src/icons/icon_factory.c
@@ -32,6 +32,10 @@
 #include "icons/pixmap_data.h"
 
 
+#include <gtk/gtkiconfactory.h>
+#include "icons/pixmap_data.h"
+#include "sflphone_const.h"
+
 static GtkIconFactory *icon_factory = NULL;
 
 void add_icon (GtkIconFactory *factory, const gchar *stock_id, const guint8 *icon_data, GtkIconSize size)
@@ -60,12 +64,6 @@ void add_icon (GtkIconFactory *factory, const gchar *stock_id, const guint8 *ico
         DEBUG ("Icon %s already exists in factory\n", stock_id);
 }
 
-GtkIconSet* lookup_sflphone_factory (const gchar *stock_id)
-{
-
-    return gtk_icon_factory_lookup (icon_factory, stock_id);
-}
-
 void register_sflphone_stock_icons (GtkIconFactory *factory)
 {
     add_icon (factory, GTK_STOCK_PICKUP, gnome_stock_pickup, GTK_ICON_SIZE_SMALL_TOOLBAR);
@@ -85,13 +83,8 @@ void register_sflphone_stock_icons (GtkIconFactory *factory)
 
 void init_icon_factory (void)
 {
-    // Init the factory
     icon_factory = gtk_icon_factory_new ();
-
-    // Load icons
     register_sflphone_stock_icons (icon_factory);
-
-    // Specify a default icon set
     gtk_icon_factory_add_default (icon_factory);
 }
 
diff --git a/gnome/src/icons/icon_factory.h b/gnome/src/icons/icon_factory.h
index ae8a453cad93c1f35f09068a648519819c104bb6..2443cfca69ee57ba505199f21fde6d4c0a6348d2 100644
--- a/gnome/src/icons/icon_factory.h
+++ b/gnome/src/icons/icon_factory.h
@@ -31,21 +31,15 @@
 #ifndef ICON_FACTORY_H
 #define ICON_FACTORY_H
 
-#include <gtk/gtkiconfactory.h>
-#include "icons/pixmap_data.h"
-#include "sflphone_const.h"
-
-G_BEGIN_DECLS
-
 #define GTK_STOCK_PICKUP				"gnome-stock-pickup"
 #define GTK_STOCK_HANGUP				"gnome-stock-hangup"
 #define GTK_STOCK_ONHOLD				"gnome-stock-onhold"
 #define GTK_STOCK_OFFHOLD				"gnome-stock-offhold"
 #define GTK_STOCK_IM					"gnome-stock-im"
-#define GTK_STOCK_TRANSFER				"gnome-stock-transfer"
-#define GTK_STOCK_DIAL					"gnome-stock-dial"
-#define GTK_STOCK_CALL_CURRENT			"gnome-stock-call-current"
-#define GTK_STOCK_ADDRESSBOOK			"gnome-stock-addressbook"
+#define GTK_STOCK_TRANSFER                              "gnome-stock-transfer"
+#define GTK_STOCK_DIAL                                  "gnome-stock-dial"
+#define GTK_STOCK_CALL_CURRENT                          "gnome-stock-call-current"
+#define GTK_STOCK_ADDRESSBOOK                           "gnome-stock-addressbook"
 #define GTK_STOCK_CALLS					"gnome-stock-calls"
 #define GTK_STOCK_SFLPHONE				"gnome-stock-sflphone"
 #define GTK_STOCK_FAIL					"gnome-stock-fail"
@@ -53,8 +47,4 @@ G_BEGIN_DECLS
 
 void init_icon_factory (void);
 
-GtkIconSet* lookup_sflphone_factory (const gchar *stock_id);
-
-G_END_DECLS
-
 #endif
diff --git a/gnome/src/icons/pixmap_data.h b/gnome/src/icons/pixmap_data.h
index 248a226dc50057188133a427a1cf7361e46da505..e1b8dd51222365842c3ad722e23946a6b719191f 100644
--- a/gnome/src/icons/pixmap_data.h
+++ b/gnome/src/icons/pixmap_data.h
@@ -31,7 +31,7 @@
 #ifndef PIXMAP_DATA_H
 #define PIXMAP_DATA_H
 
-G_BEGIN_DECLS
+#include <glib.h>
 
 /* GdkPixbuf RGBA C-Source image dump */
 
@@ -2192,9 +2192,4 @@ static const guint8 gnome_stock_user[] =
     "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
 };
 
-
-
-
-G_END_DECLS
-
 #endif
diff --git a/gnome/src/mainwindow.c b/gnome/src/mainwindow.c
index 0e325472b02b68283115d38ae86ce8ed6e2cf9b6..66b201fd5f533968a125a0e0d64ea7b51d700e49 100644
--- a/gnome/src/mainwindow.c
+++ b/gnome/src/mainwindow.c
@@ -302,7 +302,7 @@ create_main_window ()
 
     gmutex = g_mutex_new();
 
-    g_timeout_add(1000, calltree_update_clock, NULL);
+    g_timeout_add_seconds(1, calltree_update_clock, NULL);
 
     // Configuration wizard
     if (account_list_get_size () == 1) {
diff --git a/gnome/src/widget/imwidget.c b/gnome/src/widget/imwidget.c
index 093ed87ed538f8991c81814354bc171282e9d734..c287e5ded6118a6af2309a8b5fe2980947d4d26e 100644
--- a/gnome/src/widget/imwidget.c
+++ b/gnome/src/widget/imwidget.c
@@ -34,6 +34,9 @@
 #include <contacts/conferencelist.h>
 #include <JavaScriptCore/JavaScript.h>
 #include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+#include "sflphone_const.h"
+
 
 #define WEBKIT_DIR "file://" DATA_DIR "/webkit/"