diff --git a/sflphone-gtk/src/actions.c b/sflphone-gtk/src/actions.c
index 93c33138d574204e8f6fb9991d4b15da4d380906..c0e60f1544e535d07cfb61ccfb7f0e785e7dd883 100644
--- a/sflphone-gtk/src/actions.c
+++ b/sflphone-gtk/src/actions.c
@@ -194,7 +194,6 @@ sflphone_fill_account_list(gboolean toolbarInitialized)
 gboolean
 sflphone_init()
 {
-	int i;
 	current_calls = calltab_init();
 	history = calltab_init();	
 	if(SHOW_SEARCHBAR)  histfilter = create_filter(GTK_TREE_MODEL(history->store));
diff --git a/sflphone-gtk/src/assistant.c b/sflphone-gtk/src/assistant.c
index 27c066cc6e4c8fd888af2ea69fd8a8a6a8c22be3..20c48e189e9b90fb97f28b26428ab66a0abeef07 100644
--- a/sflphone-gtk/src/assistant.c
+++ b/sflphone-gtk/src/assistant.c
@@ -27,6 +27,16 @@ struct _wizard *wiz;
 static int account_type;
 account_t* current;
 
+/**
+ * Forward function
+ */
+static gint forward_page_func( gint current_page , gpointer data );
+
+/**
+ * Page template
+ */
+static GtkWidget* create_vbox(GtkAssistantPageType type, const gchar *title, const gchar *section);
+
   void
 set_account_type( GtkWidget* widget , gpointer data )
 {
@@ -38,18 +48,30 @@ set_account_type( GtkWidget* widget , gpointer data )
   }
 }
 
+/**
+ * Callback when the close button of the dialog is clicked
+ * Action : close the assistant widget and get back to sflphone main window
+ */
 static void close_callback( void )
 {
   gtk_widget_destroy(wiz->assistant);
   g_free(wiz); wiz = NULL;
 }
 
+/**
+ * Callback when the cancel button of the dialog is clicked
+ * Action : close the assistant widget and get back to sflphone main window
+ */
 static void cancel_callback( void )
 {
   gtk_widget_destroy(wiz->assistant);
   g_free(wiz); wiz = NULL;
 }
 
+/**
+ * Callback when the button apply is clicked
+ * Action : Set the account parameters with the entries values and called dbus_add_account
+ */
   static void
 sip_apply_callback( void )
 {
@@ -71,6 +93,11 @@ sip_apply_callback( void )
     g_print( "ACCOUNT ID = %s\n" , current->accountID );
   }
 }
+
+/**
+ * Callback when the button apply is clicked
+ * Action : Set the account parameters with the entries values and called dbus_add_account
+ */
   static void 
 iax_apply_callback( void ) 
 {
@@ -368,7 +395,6 @@ create_vbox(GtkAssistantPageType type, const gchar *title, const gchar *section)
 {
   GtkWidget *vbox;
   GtkWidget *label;
-  GdkPixbuf *pixbuf;
   gchar *str;
 
   vbox = gtk_vbox_new(FALSE, 6);
diff --git a/sflphone-gtk/src/assistant.h b/sflphone-gtk/src/assistant.h
index ec87c679b2d23aa0ea69b2b14a190e9de5ee366f..0616b9fb4276d747e84b989ef61b896b618c3110 100644
--- a/sflphone-gtk/src/assistant.h
+++ b/sflphone-gtk/src/assistant.h
@@ -78,24 +78,12 @@ struct _wizard
  */
 void set_account_type( GtkWidget* widget , gpointer data );
 
-/**
- * Callback when the cancel button of the dialog is clicked
- * Action : close the assistant widget and get back to sflphone main window
- */
-static void cancel_callback( void );
+//static void cancel_callback( void );
 
-/**
- * Callback when the close button of the dialog is clicked
- * Action : close the assistant widget and get back to sflphone main window
- */
-static void close_callback( void );
+//static void close_callback( void );
 
-/**
- * Callback when the button apply is clicked
- * Action : Set the account parameters with the entries values and called dbus_add_account
- */
-static void sip_apply_callback( void );
-static void iax_apply_callback( void );
+//static void sip_apply_callback( void );
+//static void iax_apply_callback( void );
 
 void enable_stun( GtkWidget *widget );
 
@@ -114,12 +102,12 @@ GtkWidget* build_registration_error( void );
 /**
  * Forward function
  */
-static gint forward_page_func( gint current_page , gpointer data );
+//static gint forward_page_func( gint current_page , gpointer data );
 
 /**
  * Page template
  */
-static GtkWidget* create_vbox(GtkAssistantPageType type, const gchar *title, const gchar *section);
+//static GtkWidget* create_vbox(GtkAssistantPageType type, const gchar *title, const gchar *section);
 
 #endif // GTK_CHECK_VERSION
 
diff --git a/sflphone-gtk/src/calllist.c b/sflphone-gtk/src/calllist.c
index 34c74276f1ad5ac6e10f447ed80032c26ee1efd0..d188d2d1941190b7a249ac07f3b0813c0af29707 100644
--- a/sflphone-gtk/src/calllist.c
+++ b/sflphone-gtk/src/calllist.c
@@ -18,6 +18,8 @@
  */
  
 #include <calllist.h>
+#include <calltree.h>
+#include <dbus.h>
 
 #include <string.h>
 
diff --git a/sflphone-gtk/src/calllist.h b/sflphone-gtk/src/calllist.h
index a59fadfb849ac4e84b4d6d652c2726834d54fa2c..c6d28c175104ce9afa4b1d4fdf62cc51fe76e41b 100644
--- a/sflphone-gtk/src/calllist.h
+++ b/sflphone-gtk/src/calllist.h
@@ -21,6 +21,7 @@
 #define __CALLLIST_H__
 
 #include <gtk/gtk.h>
+
 /** @file calllist.h
   * @brief A list to hold calls.
   */
diff --git a/sflphone-gtk/src/calltree.c b/sflphone-gtk/src/calltree.c
index a247f8127d3ca90c30288c528737e44b2b7d3558..357a07185cdcc6479934bdcaf6ed40f7ad6ddc49 100644
--- a/sflphone-gtk/src/calltree.c
+++ b/sflphone-gtk/src/calltree.c
@@ -19,6 +19,8 @@
  */
 
 #include <stdlib.h>
+#include <glib/gprintf.h>
+
 #include <gtk/gtk.h>
 #include <actions.h>
 #include <calltree.h>
@@ -586,7 +588,6 @@ update_call_tree_remove (calltab_t* tab, call_t * c)
   GValue val;
   call_t * iterCall;
   GtkListStore* store = tab->store;
-  GtkWidget* view = tab->view;
 
   int nbChild = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
   int i;
@@ -620,7 +621,6 @@ update_call_tree (calltab_t* tab, call_t * c)
   GValue val;
   call_t * iterCall;
   GtkListStore* store = tab->store;
-  GtkWidget* view = tab->view;
 
   int nbChild = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
   int i;
@@ -744,7 +744,6 @@ update_call_tree_add (calltab_t* tab, call_t * c)
   // New call in the list
   gchar * description;
   gchar * date="";
-  gchar * duration="";
   description = g_markup_printf_escaped("<b>%s</b> <i>%s</i>", 
       call_get_number(c),
       call_get_name(c)); 
diff --git a/sflphone-gtk/src/calltree.h b/sflphone-gtk/src/calltree.h
index 5b2f5ca079b368463be7dbcdb09b462adf7e0c78..f1148a749f0802e8215e56bb402eef5a8d3e46ab 100644
--- a/sflphone-gtk/src/calltree.h
+++ b/sflphone-gtk/src/calltree.h
@@ -44,7 +44,6 @@ void create_call_tree(calltab_t* tab);
  * Update the toolbar's buttons state, according to the call state
  */
 void toolbar_update_buttons();
-static void toggle_history(GtkToggleToolButton *toggle_tool_button, gpointer user_data);
 
 /**
  * Add a call in the calltree
diff --git a/sflphone-gtk/src/dbus.c b/sflphone-gtk/src/dbus.c
index 0d42a41e6b098ededc8468967898e1e103d69e08..ded6aba89d437d2d96d9a8b07cf6fea1c1a897fa 100644
--- a/sflphone-gtk/src/dbus.c
+++ b/sflphone-gtk/src/dbus.c
@@ -19,8 +19,6 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  
-#include <accountlist.h>
-#include <calllist.h>
 #include <calltab.h>
 #include <callmanager-glue.h>
 #include <configurationmanager-glue.h>
@@ -1268,7 +1266,7 @@ guint
 dbus_get_max_calls( void )
 {
 	GError* error = NULL;
-	guint calls;
+	gint calls;
 	org_sflphone_SFLphone_ConfigurationManager_get_max_calls(
 			configurationManagerProxy,
 			&calls,
@@ -1278,7 +1276,7 @@ dbus_get_max_calls( void )
 		g_error_free(error);
 	}
 	g_print("GET MAX CALLS = %i\n" , calls);
-	return calls;
+	return (guint)calls;
 }
 
 void
@@ -1367,7 +1365,7 @@ guint
 dbus_get_notify( void )
 {
   g_print("Before dbus_get_notif_level()\n");
-	guint level;
+	gint level;
 	GError* error = NULL;
 	org_sflphone_SFLphone_ConfigurationManager_get_notify(
 			configurationManagerProxy,
@@ -1381,7 +1379,7 @@ dbus_get_notify( void )
 	else
 	  g_print("Called dbus_get_notif_level\n");
 	
-	return level;
+	return (guint)level;
 }
 
 void
@@ -1403,7 +1401,7 @@ guint
 dbus_get_mail_notify( void )
 {
   g_print("Before dbus_get_mail_notif_level()\n");
-	guint level;
+	gint level;
 	GError* error = NULL;
 	org_sflphone_SFLphone_ConfigurationManager_get_mail_notify(
 			configurationManagerProxy,
@@ -1417,7 +1415,7 @@ dbus_get_mail_notify( void )
 	else
 	  g_print("Called dbus_get_mail_notif_level\n");
 	
-	return level;
+	return (guint)level;
 }
 
 void
diff --git a/sflphone-gtk/src/dbus.h b/sflphone-gtk/src/dbus.h
index 34e6b5f0008d6b1faa12abb6b2d2307bfc4e1a19..4714a0e4df133006fbbed5b5d89ef0cf2c18aecc 100644
--- a/sflphone-gtk/src/dbus.h
+++ b/sflphone-gtk/src/dbus.h
@@ -26,6 +26,7 @@
 #include <accountlist.h>
 #include <calllist.h>
 #include <sflnotify.h>
+#include <calltree.h>
 
 /** @file dbus.h
   * @brief General DBus functions wrappers.
diff --git a/sflphone-gtk/src/errors.h b/sflphone-gtk/src/errors.h
index 4f3a9c32ecdcf18a65f3d3510c392dbc3959301e..f1176bc191cd5e0358cb75bd68f3cb2f6bc99fca 100644
--- a/sflphone-gtk/src/errors.h
+++ b/sflphone-gtk/src/errors.h
@@ -24,7 +24,10 @@
   * @brief Implements internal errors notifications to the client.
   */
 
+#include <stdlib.h>
+
 #include <sflphone_const.h>
+#include <mainwindow.h>
 
 /**
  * Display an internal error.
diff --git a/sflphone-gtk/src/mainwindow.c b/sflphone-gtk/src/mainwindow.c
index ca71e53cc3e8d2477fdfb5ead57eb054cbd040d7..cbf69f6392a310e87911c43291e8b3e95dff6d30 100644
--- a/sflphone-gtk/src/mainwindow.c
+++ b/sflphone-gtk/src/mainwindow.c
@@ -21,7 +21,6 @@
 #include <config.h>
 #include <actions.h>
 #include <calltab.h>
-#include <calllist.h> 
 #include <calltree.h>
 #include <configwindow.h>
 #include <dialpad.h>
@@ -29,6 +28,7 @@
 #include <menus.h>
 #include <sliders.h>
 #include <historyfilter.h>
+#include <assistant.h>
 
 #include <gtk/gtk.h>
 
diff --git a/sflphone-gtk/src/mainwindow.h b/sflphone-gtk/src/mainwindow.h
index 2a3e23789331f2daba1143f5953b694bbfdaae31..b5e385168bca26cee516e05c9629538e8ccb338f 100644
--- a/sflphone-gtk/src/mainwindow.h
+++ b/sflphone-gtk/src/mainwindow.h
@@ -87,4 +87,5 @@ void statusbar_push_message( const gchar* message , guint id );
  */
 void statusbar_pop_message( guint id );
 
+void main_window_searchbar( gboolean *state );
 #endif 
diff --git a/sflphone-gtk/src/menus.c b/sflphone-gtk/src/menus.c
index 3340909b650ce0bfd2075dadf41bdbe77ae195cd..9cb2a2838d19967ced49572c311c418aa99ca447 100644
--- a/sflphone-gtk/src/menus.c
+++ b/sflphone-gtk/src/menus.c
@@ -27,8 +27,9 @@
 #include <dbus.h>
 #include <mainwindow.h>
 #include <calltab.h>
+#include <assistant.h>
 #include <gtk/gtk.h>
-
+#include <glib/gprintf.h>
 #include <string.h> // for strlen
 
 GtkWidget * pickUpMenu;
@@ -121,10 +122,6 @@ help_about ( void * foo)
     "Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>", 
     "Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>",
     NULL};
-  gchar *translators[] = {
-    "Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>",
-    "Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>",
-    NULL};
 
   gtk_show_about_dialog( GTK_WINDOW(get_main_window()),
       "artists", artists,
diff --git a/sflphone-gtk/src/timestamp.c b/sflphone-gtk/src/timestamp.c
index 77f552d32b294737bb7f37482f8f1f4be616f361..3a28badddca65fbcb9cf00cf5b3e1c60252e35c5 100644
--- a/sflphone-gtk/src/timestamp.c
+++ b/sflphone-gtk/src/timestamp.c
@@ -39,7 +39,7 @@ timestamp_get_call_date( void )
 process_call_duration( call_t* c )
 {
   gchar * res;
-  g_print("Start = %i - Stop = %i  - Call duration = %i\n", c->_start , c->_stop , (int)(c->_stop - c->_start));
+  g_print("Start = %i - Stop = %i  - Call duration = %i\n", (int)c->_start , (int)c->_stop , (int)(c->_stop - c->_start));
 
   if( c->history_state == MISSED && c->_stop == 0 )
     return g_markup_printf_escaped(_("<small>Missed call</small>"));