diff --git a/sflphone-client-gnome/src/accountlist.c b/sflphone-client-gnome/src/accountlist.c
index d17fb0f699f250925b6110986254d796c1122b22..f54f7a9ade23cd5fd63a2f2edffed36849bd8d45 100644
--- a/sflphone-client-gnome/src/accountlist.c
+++ b/sflphone-client-gnome/src/accountlist.c
@@ -33,7 +33,7 @@
 #include <actions.h>
 #include <string.h>
 
-GQueue * accountQueue;
+static GQueue * accountQueue;
 
 /* GCompareFunc to compare a accountID (gchar* and a account_t) */
 gint is_accountID_struct (gconstpointer a, gconstpointer b)
diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index 6850ed911437aff65070e8947d07dcf384cd5897..f34f8eb294424b3c616f5183db35732362b9a8fc 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -55,7 +55,7 @@
 #include "widget/imwidget.h"
 
 
-GHashTable * ip2ip_profile=NULL;
+static GHashTable * ip2ip_profile=NULL;
 
 void
 sflphone_notify_voice_mail (const gchar* accountID , guint count)
diff --git a/sflphone-client-gnome/src/codeclist.c b/sflphone-client-gnome/src/codeclist.c
index 58e1b3ee619a471abbf13fd96d0690094a32e91a..7ff1390b9ab58fe4b0fa01f97f0f7726004a37a1 100644
--- a/sflphone-client-gnome/src/codeclist.c
+++ b/sflphone-client-gnome/src/codeclist.c
@@ -36,7 +36,7 @@
 
 #include "dbus.h"
 
-GQueue * codecsCapabilities = NULL;
+static GQueue * codecsCapabilities = NULL;
 
 gint
 is_name_codecstruct (gconstpointer a, gconstpointer b)
diff --git a/sflphone-client-gnome/src/imwindow.c b/sflphone-client-gnome/src/imwindow.c
index fb1fa42415010730e5b50d5ebda6b32db1985061..03b296c50bb45b7fb8598427d408a31f31363fc4 100644
--- a/sflphone-client-gnome/src/imwindow.c
+++ b/sflphone-client-gnome/src/imwindow.c
@@ -40,8 +40,8 @@
 #include <contacts/calltab.h>
 
 /** Local variables */
-GtkWidget *im_window = NULL;
-GtkWidget *im_notebook = NULL;
+static GtkWidget *im_window = NULL;
+static GtkWidget *im_notebook = NULL;
 
 static gboolean window_configure_cb (GtkWidget *wini UNUSED, GdkEventConfigure *event)
 {
diff --git a/sflphone-client-gnome/src/logger.c b/sflphone-client-gnome/src/logger.c
index 963f2d4ec55f2ceb53f8ec3bebc2d4074dc3087b..f8118edaa885940dc0a0cffcb517ab71e154815c 100644
--- a/sflphone-client-gnome/src/logger.c
+++ b/sflphone-client-gnome/src/logger.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <stdio.h>
 
-int log_level = LOG_INFO;
+static int log_level = LOG_INFO;
 
 void internal_log (const int level, const char* format, ...)
 {
diff --git a/sflphone-client-gnome/src/mainwindow.c b/sflphone-client-gnome/src/mainwindow.c
index 9637f715f1ff693368760e2701d9ad409ce27cd6..d8ae8e1d180d8ba6ddbb2886d9f9ead8d89ca417 100644
--- a/sflphone-client-gnome/src/mainwindow.c
+++ b/sflphone-client-gnome/src/mainwindow.c
@@ -48,21 +48,20 @@
 #include <eel-gconf-extensions.h>
 
 /** Local variables */
-GtkUIManager *ui_manager = NULL;
-GtkAccelGroup * accelGroup = NULL;
-GtkWidget * window = NULL;
-GtkWidget * subvbox = NULL;
-GtkWidget * vbox = NULL;
-GtkWidget * dialpad = NULL;
-GtkWidget * speaker_control = NULL;
-GtkWidget * mic_control = NULL;
-GtkWidget * statusBar = NULL;
-GtkWidget * filterEntry = NULL;
-PidginScrollBook *embedded_error_notebook;
-
-gchar *status_current_message = NULL;
-// pthread_mutex_t statusbar_message_mutex;
-GMutex *gmutex;
+static GtkUIManager *ui_manager = NULL;
+static GtkAccelGroup * accelGroup = NULL;
+static GtkWidget * window = NULL;
+static GtkWidget * subvbox = NULL;
+static GtkWidget * vbox = NULL;
+static GtkWidget * dialpad = NULL;
+static GtkWidget * speaker_control = NULL;
+static GtkWidget * mic_control = NULL;
+static GtkWidget * statusBar = NULL;
+static GtkWidget * filterEntry = NULL;
+static PidginScrollBook *embedded_error_notebook;
+
+static gchar *status_current_message = NULL;
+static GMutex *gmutex;
 
 /**
  * Handle main window resizing
diff --git a/sflphone-client-gnome/src/sflnotify.c b/sflphone-client-gnome/src/sflnotify.c
index 6813fd3d22d9c6599b4e610aadb60b126426b554..5821694cb81c8a390818d49c055a31eed0b61f13 100644
--- a/sflphone-client-gnome/src/sflnotify.c
+++ b/sflphone-client-gnome/src/sflnotify.c
@@ -32,7 +32,7 @@
 #include "config.h"
 #include "sflnotify.h"
 
-GnomeNotification *_gnome_notification;
+static GnomeNotification *_gnome_notification;
 
 void create_new_gnome_notification (gchar *title, gchar *body, NotifyUrgency urgency, gint timeout, GnomeNotification **notif)
 {
diff --git a/sflphone-client-gnome/src/sliders.c b/sflphone-client-gnome/src/sliders.c
index 284a50b221c7649d3e4770cfd50ebc4a59140a30..d083fb5d9b4f26532f9a7ee9d7d01b0627ad8eef 100644
--- a/sflphone-client-gnome/src/sliders.c
+++ b/sflphone-client-gnome/src/sliders.c
@@ -33,12 +33,12 @@
 #include <actions.h>
 #include <string.h>
 
-gdouble     value[2];
-GtkWidget * slider[2];
-GtkWidget * button[2];
+static gdouble     value[2];
+static GtkWidget * slider[2];
+static GtkWidget * button[2];
 
 // icons
-GtkWidget * images[2][4];
+static GtkWidget * images[2][4];
 enum device_t {
     SPEAKER = 0,
     MIKE,
@@ -52,8 +52,8 @@ enum volume_t {
     VOL75
 } ;
 
-guint toggledConnId[2]; // The button toggled signal connection ID
-guint movedConnId[2];   // The slider_moved signal connection ID
+static guint toggledConnId[2]; // The button toggled signal connection ID
+static guint movedConnId[2];   // The slider_moved signal connection ID
 
 void
 update_icons (int dev)
diff --git a/sflphone-client-gnome/src/statusicon.c b/sflphone-client-gnome/src/statusicon.c
index 2b40f79440f4bafaab81bcffa9223c0965adf4a5..3c657f794a4b66f892f22e2bb776001f061fc103 100644
--- a/sflphone-client-gnome/src/statusicon.c
+++ b/sflphone-client-gnome/src/statusicon.c
@@ -37,9 +37,9 @@
 #include <eel-gconf-extensions.h>
 
 #if GTK_CHECK_VERSION(2,10,0)
-GtkStatusIcon *status;
-GtkWidget *show_menu_item, *hangup_menu_item;
-gboolean __minimized = MINIMIZED;
+static GtkStatusIcon *status;
+static GtkWidget *show_menu_item, *hangup_menu_item;
+static gboolean __minimized = MINIMIZED;
 
 void
 popup_main_window (void)
diff --git a/sflphone-client-gnome/src/uimanager.c b/sflphone-client-gnome/src/uimanager.c
index 4570a34d2e43c6a5903c9499d0c92da8539e4c26..1fc4d03fbb130871bc7eac84a2197af721be7355 100644
--- a/sflphone-client-gnome/src/uimanager.c
+++ b/sflphone-client-gnome/src/uimanager.c
@@ -57,30 +57,30 @@ void show_edit_number (callable_obj_t *call);
 
 static GtkWidget *toolbar;
 
-guint transfertButtonConnId; //The button toggled signal connection ID
-guint recordButtonConnId; //The button toggled signal connection ID
-
-GtkAction * pickUpAction;
-GtkWidget * pickUpWidget;
-GtkAction * newCallAction;
-GtkWidget * newCallWidget;
-GtkAction * hangUpAction;
-GtkWidget * hangUpWidget;
-GtkWidget * holdMenu;
-GtkWidget * holdToolbar;
-GtkWidget * offHoldToolbar;
-GtkWidget * transferToolbar;
-GtkAction * copyAction;
-GtkAction * pasteAction;
-GtkAction * recordAction;
-GtkWidget * recordWidget;
-GtkAction * voicemailAction;
-GtkWidget * voicemailToolbar;
-GtkWidget * imToolbar;
-GtkAction * imAction;
-
-GtkWidget * editable_num;
-GtkDialog * edit_dialog;
+static guint transfertButtonConnId; //The button toggled signal connection ID
+static guint recordButtonConnId; //The button toggled signal connection ID
+
+static GtkAction * pickUpAction;
+static GtkWidget * pickUpWidget;
+static GtkAction * newCallAction;
+static GtkWidget * newCallWidget;
+static GtkAction * hangUpAction;
+static GtkWidget * hangUpWidget;
+static GtkWidget * holdMenu;
+static GtkWidget * holdToolbar;
+static GtkWidget * offHoldToolbar;
+static GtkWidget * transferToolbar;
+static GtkAction * copyAction;
+static GtkAction * pasteAction;
+static GtkAction * recordAction;
+static GtkWidget * recordWidget;
+static GtkAction * voicemailAction;
+static GtkWidget * voicemailToolbar;
+static GtkWidget * imToolbar;
+static GtkAction * imAction;
+
+static GtkWidget * editable_num;
+static GtkDialog * edit_dialog;
 
 enum {
     CALLTREE_CALLS, CALLTREE_HISTORY, CALLTREE_CONTACTS
diff --git a/sflphone-common/src/MimeParameters.h b/sflphone-common/src/MimeParameters.h
index 8aa682e78e828865336609f0e6305be40c3e9d1b..aa13cfa3aef0aa845b121e0ce26f1653522eb045 100644
--- a/sflphone-common/src/MimeParameters.h
+++ b/sflphone-common/src/MimeParameters.h
@@ -89,6 +89,9 @@
 
 #define MIME_PARAMETER_KEEP_REMOTE MimeParameters::addParameterRemote
 
+#include <cstddef>
+
+using std::ptrdiff_t;
 #include <ccrtp/rtp.h>
 #include <algorithm>
 #include <stdexcept>
diff --git a/tools/build-system/build-osc.sh b/tools/build-system/build-osc.sh
index 09d63d74e59eebd3b719632ac1913a0231415da7..398299b976b92cb9da21705d88911cc9945017b8 100755
--- a/tools/build-system/build-osc.sh
+++ b/tools/build-system/build-osc.sh
@@ -27,24 +27,33 @@ cd ${OSC_REPOSITORY}
 
 for LAUNCHPAD_PACKAGE in ${LAUNCHPAD_PACKAGES[*]}
 do
-	cd ${OSC_REPOSITORY}/${LAUNCHPAD_PACKAGE}
+	echo Change current directory to ${OSC_REPOSITORY}/${LAUNCHPAD_PACKAGE}
+        cd ${OSC_REPOSITORY}/${LAUNCHPAD_PACKAGE}
 
-	rm -rf ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}*
+        echo Clean directory ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}*
+        rm -rf ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}*
 
-	cp -r ${REFERENCE_REPOSITORY}/${LAUNCHPAD_PACKAGE} ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}
+        echo Copy sources from reference repository  ${REFERENCE_REPOSITORY}/${LAUNCHPAD_PACKAGE} ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}
+        cp -r ${REFERENCE_REPOSITORY}/${LAUNCHPAD_PACKAGE} ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}
 
-	cp ${OSC_DIR}/${LAUNCHPAD_PACKAGE}* .
+        echo Copy package in current directory ${OSC_DIR}/${LAUNCHPAD_PACKAGE}*
+        cp ${OSC_DIR}/${LAUNCHPAD_PACKAGE}* .
 
-	sed -i -e "s/VERSION_INDEX/${VERSION_INDEX}/g" -e "s/VERSION/${SOFTWARE_VERSION}/g" ${LAUNCHPAD_PACKAGE}.spec
+        echo 
+        sed -i -e "s/VERSION_INDEX/${VERSION_INDEX}/g" -e "s/VERSION/${SOFTWARE_VERSION}/g" ${LAUNCHPAD_PACKAGE}.spec
 
-	tar czf ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}.tar.gz ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}
+        echo Create tar ball ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}.tar.gz
+        tar czf ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}.tar.gz ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}
 
-	rm -rf ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION} 
-	
-	osc add ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}.tar.gz
-	osc add *.patch
+        echo Clean directory ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}
+        rm -rf ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}
 
-	yes | osc commit --force -m "Version ${SOFTWARE_VERSION}"
+        echo OSC Add ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}.tar.gz
+        osc add ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}.tar.gz
+        osc add *.patch
+
+        echo OSC Commit 
+        yes | osc commit --force -m "Version ${SOFTWARE_VERSION}"
 done
 
 exit 0
diff --git a/tools/build-system/osc/sflphone-client-gnome.spec b/tools/build-system/osc/sflphone-client-gnome.spec
index 4e57fb7f4c9db27826bd6bf5543ab2ce03819e23..3e55a6268fedb0b1a4f1fcc4a341421c70002041 100644
--- a/tools/build-system/osc/sflphone-client-gnome.spec
+++ b/tools/build-system/osc/sflphone-client-gnome.spec
@@ -67,6 +67,7 @@ Requires:	gtk2
 Requires:	glib2
 Requires:	libnotify
 Requires:	libsexy
+Requires:	notification-daemon
 
 %if %{defined suse_version}
 Requires:	librsvg