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 15b7a89c6ad1454476ac01ac256b50fde89d85c5..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>
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 406a9f83b3db4b0d8099936a23eb595d5ecfb293..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;