diff --git a/NEWS b/NEWS
index 4ae94d6..79590ca 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+NEW in 0.6
+==========
+
+ - Depend on glib 2.28 to use g_io_stream_splice_async() instead of local copy.
+
 NEW in 0.5
 ==========
 
diff --git a/config.h.in b/config.h.in
index a33b61b..813ee7c 100644
--- a/config.h.in
+++ b/config.h.in
@@ -79,5 +79,8 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Define the tube service name */
+#undef TUBE_SERVICE
+
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
diff --git a/configure b/configure
index 9c3bacd..51c625c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for ssh-contact 0.5.
+# Generated by GNU Autoconf 2.67 for ssh-contact 0.6.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=ssh-contact>.
 #
@@ -706,8 +706,8 @@
 # Identity of this package.
 PACKAGE_NAME='ssh-contact'
 PACKAGE_TARNAME='ssh-contact'
-PACKAGE_VERSION='0.5'
-PACKAGE_STRING='ssh-contact 0.5'
+PACKAGE_VERSION='0.6'
+PACKAGE_STRING='ssh-contact 0.6'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=ssh-contact'
 PACKAGE_URL=''
 
@@ -1501,7 +1501,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ssh-contact 0.5 to adapt to many kinds of systems.
+\`configure' configures ssh-contact 0.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1575,7 +1575,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ssh-contact 0.5:";;
+     short | recursive ) echo "Configuration of ssh-contact 0.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1699,7 +1699,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ssh-contact configure 0.5
+ssh-contact configure 0.6
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2072,7 +2072,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ssh-contact $as_me 0.5, which was
+It was created by ssh-contact $as_me 0.6, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2919,7 +2919,7 @@
 
 # Define the identity of the package.
  PACKAGE='ssh-contact'
- VERSION='0.5'
+ VERSION='0.6'
 
 
 # Some tools Automake needs.
@@ -12904,12 +12904,12 @@
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
   telepathy-glib >= 0.13.9
-  glib-2.0 >= 2.24
+  glib-2.0 >= 2.28
   gio-2.0
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
   telepathy-glib >= 0.13.9
-  glib-2.0 >= 2.24
+  glib-2.0 >= 2.28
   gio-2.0
 ") 2>&5
   ac_status=$?
@@ -12917,7 +12917,7 @@
   test $ac_status = 0; }; then
   pkg_cv_SSH_CONTACT_CFLAGS=`$PKG_CONFIG --cflags "
   telepathy-glib >= 0.13.9
-  glib-2.0 >= 2.24
+  glib-2.0 >= 2.28
   gio-2.0
 " 2>/dev/null`
 else
@@ -12932,12 +12932,12 @@
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
   telepathy-glib >= 0.13.9
-  glib-2.0 >= 2.24
+  glib-2.0 >= 2.28
   gio-2.0
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
   telepathy-glib >= 0.13.9
-  glib-2.0 >= 2.24
+  glib-2.0 >= 2.28
   gio-2.0
 ") 2>&5
   ac_status=$?
@@ -12945,7 +12945,7 @@
   test $ac_status = 0; }; then
   pkg_cv_SSH_CONTACT_LIBS=`$PKG_CONFIG --libs "
   telepathy-glib >= 0.13.9
-  glib-2.0 >= 2.24
+  glib-2.0 >= 2.28
   gio-2.0
 " 2>/dev/null`
 else
@@ -12969,13 +12969,13 @@
         if test $_pkg_short_errors_supported = yes; then
 	        SSH_CONTACT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
   telepathy-glib >= 0.13.9
-  glib-2.0 >= 2.24
+  glib-2.0 >= 2.28
   gio-2.0
 " 2>&1`
         else
 	        SSH_CONTACT_PKG_ERRORS=`$PKG_CONFIG --print-errors "
   telepathy-glib >= 0.13.9
-  glib-2.0 >= 2.24
+  glib-2.0 >= 2.28
   gio-2.0
 " 2>&1`
         fi
@@ -12984,7 +12984,7 @@
 
 	as_fn_error $? "Package requirements (
   telepathy-glib >= 0.13.9
-  glib-2.0 >= 2.24
+  glib-2.0 >= 2.28
   gio-2.0
 ) were not met:
 
@@ -14208,6 +14208,10 @@
 
 
 # -----------------------------------------------------------
+
+
+$as_echo "#define TUBE_SERVICE \"x-ssh-contact\"" >>confdefs.h
+
 
 ac_config_files="$ac_config_files Makefile po/Makefile.in src/Makefile src/vinagre/Makefile"
 
@@ -14749,7 +14753,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ssh-contact $as_me 0.5, which was
+This file was extended by ssh-contact $as_me 0.6, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14815,7 +14819,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ssh-contact config.status 0.5
+ssh-contact config.status 0.6
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 13f66b8..ec12de9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 m4_define(released, 1)
-AC_INIT(ssh-contact, 0.5, https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=ssh-contact)
+AC_INIT(ssh-contact, 0.6, https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=ssh-contact)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2010 Collabora Ltd.
@@ -28,7 +28,7 @@
 PKG_CHECK_MODULES(SSH_CONTACT,
 [
   telepathy-glib >= 0.13.9
-  glib-2.0 >= 2.24
+  glib-2.0 >= 2.28
   gio-2.0
 ])
 
@@ -110,6 +110,8 @@
 
 # -----------------------------------------------------------
 
+AC_DEFINE(TUBE_SERVICE, "x-ssh-contact", [Define the tube service name])
+
 AC_OUTPUT([
 Makefile
 po/Makefile.in
diff --git a/ltmain.sh b/ltmain.sh
index 7ed280b..fa4b1e1 100755
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,7 +73,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
 TIMESTAMP=""
 package_revision=1.3017
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 3492352..8b83295 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,12 +15,10 @@
 libexec_PROGRAMS = ssh-contact-service
 
 ssh_contact_SOURCES = \
-	common.c common.h \
 	client-helpers.c client-helpers.h \
 	client.c
 
 ssh_contact_service_SOURCES = \
-	common.c common.h \
 	service.c
 
 servicefiledir = $(datadir)/dbus-1/services
diff --git a/src/Makefile.in b/src/Makefile.in
index 0f565c5..a863723 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -53,8 +53,7 @@
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(clientfiledir)" "$(DESTDIR)$(servicefiledir)"
 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
-am_ssh_contact_OBJECTS = common.$(OBJEXT) client-helpers.$(OBJEXT) \
-	client.$(OBJEXT)
+am_ssh_contact_OBJECTS = client-helpers.$(OBJEXT) client.$(OBJEXT)
 ssh_contact_OBJECTS = $(am_ssh_contact_OBJECTS)
 ssh_contact_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
@@ -62,7 +61,7 @@
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
-am_ssh_contact_service_OBJECTS = common.$(OBJEXT) service.$(OBJEXT)
+am_ssh_contact_service_OBJECTS = service.$(OBJEXT)
 ssh_contact_service_OBJECTS = $(am_ssh_contact_service_OBJECTS)
 ssh_contact_service_LDADD = $(LDADD)
 ssh_contact_service_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -322,12 +321,10 @@
 	$(NULL)
 
 ssh_contact_SOURCES = \
-	common.c common.h \
 	client-helpers.c client-helpers.h \
 	client.c
 
 ssh_contact_service_SOURCES = \
-	common.c common.h \
 	service.c
 
 servicefiledir = $(datadir)/dbus-1/services
@@ -483,7 +480,6 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client-helpers.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/service.Po@am__quote@
 
 .c.o:
diff --git a/src/client-helpers.c b/src/client-helpers.c
index 2442b0a..a6b060e 100644
--- a/src/client-helpers.c
+++ b/src/client-helpers.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include "client-helpers.h"
-#include "common.h"
 
 typedef struct
 {
diff --git a/src/client.c b/src/client.c
index 8627c28..0464b76 100644
--- a/src/client.c
+++ b/src/client.c
@@ -28,7 +28,6 @@
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "client-helpers.h"
-#include "common.h"
 
 typedef struct
 {
@@ -108,7 +107,7 @@
   ClientContext *context = user_data;
   GError *error = NULL;
 
-  if (!_g_io_stream_splice_finish (res, &error))
+  if (!g_io_stream_splice_finish (res, &error))
     throw_error (context, error);
   else
     leave (context);
@@ -135,8 +134,8 @@
     }
 
   /* Splice tube and ssh connections */
-  _g_io_stream_splice_async (G_IO_STREAM (context->tube_connection),
-      G_IO_STREAM (context->ssh_connection), _G_IO_STREAM_SPLICE_NONE,
+  g_io_stream_splice_async (G_IO_STREAM (context->tube_connection),
+      G_IO_STREAM (context->ssh_connection), G_IO_STREAM_SPLICE_NONE,
       G_PRIORITY_DEFAULT, NULL, splice_cb, context);
 }
 
diff --git a/src/common.c b/src/common.c
deleted file mode 100644
index 54f18b3..0000000
--- a/src/common.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (C) 2010 Xavier Claessens <xclaesse@gmail.com>
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include "config.h"
-
-#include "common.h"
-
-typedef struct
-{
-  GIOStream *stream1;
-  GIOStream *stream2;
-  _GIOStreamSpliceFlags flags;
-  gint io_priority;
-  GCancellable *cancellable;
-  gulong cancelled_id;
-  GCancellable *op1_cancellable;
-  GCancellable *op2_cancellable;
-  guint completed;
-  GError *error;
-} SpliceContext;
-
-static void
-splice_context_free (SpliceContext *ctx)
-{
-  g_object_unref (ctx->stream1);
-  g_object_unref (ctx->stream2);
-  if (ctx->cancellable != NULL)
-    g_object_unref (ctx->cancellable);
-  g_object_unref (ctx->op1_cancellable);
-  g_object_unref (ctx->op2_cancellable);
-  g_clear_error (&ctx->error);
-  g_slice_free (SpliceContext, ctx);
-}
-
-static void
-splice_complete (GSimpleAsyncResult *simple,
-                 SpliceContext      *ctx)
-{
-  if (ctx->cancelled_id != 0)
-    g_cancellable_disconnect (ctx->cancellable, ctx->cancelled_id);
-  ctx->cancelled_id = 0;
-
-  if (ctx->error != NULL)
-    g_simple_async_result_set_from_error (simple, ctx->error);
-  g_simple_async_result_complete (simple);
-}
-
-static void
-splice_close_cb (GObject      *iostream,
-                 GAsyncResult *res,
-                 gpointer      user_data)
-{
-  GSimpleAsyncResult *simple = user_data;
-  SpliceContext *ctx;
-  GError *error = NULL;
-
-  g_io_stream_close_finish (G_IO_STREAM (iostream), res, &error);
-
-  ctx = g_simple_async_result_get_op_res_gpointer (simple);
-  ctx->completed++;
-
-  /* Keep the first error that occured */
-  if (error != NULL && ctx->error == NULL)
-    ctx->error = error;
-  else
-    g_clear_error (&error);
-
-  /* If all operations are done, complete now */
-  if (ctx->completed == 4)
-    splice_complete (simple, ctx);
-
-  g_object_unref (simple);
-}
-
-static void
-splice_cb (GObject      *ostream,
-           GAsyncResult *res,
-           gpointer      user_data)
-{
-  GSimpleAsyncResult *simple = user_data;
-  SpliceContext *ctx;
-  GError *error = NULL;
-
-  g_output_stream_splice_finish (G_OUTPUT_STREAM (ostream), res, &error);
-
-  ctx = g_simple_async_result_get_op_res_gpointer (simple);
-  ctx->completed++;
-
-  /* ignore cancellation error if it was not requested by the user */
-  if (error != NULL &&
-      g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) &&
-      (ctx->cancellable == NULL ||
-       !g_cancellable_is_cancelled (ctx->cancellable)))
-    g_clear_error (&error);
-
-  /* Keep the first error that occured */
-  if (error != NULL && ctx->error == NULL)
-    ctx->error = error;
-  else
-    g_clear_error (&error);
-
-   if (ctx->completed == 1 &&
-       (ctx->flags & _G_IO_STREAM_SPLICE_WAIT_FOR_BOTH) == 0)
-    {
-      /* We don't want to wait for the 2nd operation to finish, cancel it */
-      g_cancellable_cancel (ctx->op1_cancellable);
-      g_cancellable_cancel (ctx->op2_cancellable);
-    }
-  else if (ctx->completed == 2)
-    {
-      if (ctx->cancellable == NULL ||
-          !g_cancellable_is_cancelled (ctx->cancellable))
-        {
-          g_cancellable_reset (ctx->op1_cancellable);
-          g_cancellable_reset (ctx->op2_cancellable);
-        }
-
-      /* Close the IO streams if needed */
-      if ((ctx->flags & _G_IO_STREAM_SPLICE_CLOSE_STREAM1) != 0)
-        g_io_stream_close_async (ctx->stream1, ctx->io_priority,
-            ctx->op1_cancellable, splice_close_cb, g_object_ref (simple));
-      else
-        ctx->completed++;
-
-      if ((ctx->flags & _G_IO_STREAM_SPLICE_CLOSE_STREAM2) != 0)
-        g_io_stream_close_async (ctx->stream2, ctx->io_priority,
-            ctx->op2_cancellable, splice_close_cb, g_object_ref (simple));
-      else
-        ctx->completed++;
-
-      /* If all operations are done, complete now */
-      if (ctx->completed == 4)
-        splice_complete (simple, ctx);
-    }
-
-  g_object_unref (simple);
-}
-
-static void
-splice_cancelled_cb (GCancellable       *cancellable,
-                     GSimpleAsyncResult *simple)
-{
-  SpliceContext *ctx;
-
-  ctx = g_simple_async_result_get_op_res_gpointer (simple);
-  g_cancellable_cancel (ctx->op1_cancellable);
-  g_cancellable_cancel (ctx->op2_cancellable);
-}
-
-void
-_g_io_stream_splice_async (GIOStream            *stream1,
-                          GIOStream            *stream2,
-                          _GIOStreamSpliceFlags  flags,
-                          gint                  io_priority,
-                          GCancellable         *cancellable,
-                          GAsyncReadyCallback   callback,
-                          gpointer              user_data)
-{
-  GSimpleAsyncResult *simple;
-  SpliceContext *ctx;
-  GInputStream *istream;
-  GOutputStream *ostream;
-
-  if (cancellable != NULL && g_cancellable_is_cancelled (cancellable))
-    {
-      g_simple_async_report_error_in_idle (NULL, callback,
-          user_data, G_IO_ERROR, G_IO_ERROR_CANCELLED,
-          "Operation has been cancelled");
-      return;
-    }
-
-  ctx = g_slice_new0 (SpliceContext);
-  ctx->stream1 = g_object_ref (stream1);
-  ctx->stream2 = g_object_ref (stream2);
-  ctx->flags = flags;
-  ctx->io_priority = io_priority;
-  ctx->op1_cancellable = g_cancellable_new ();
-  ctx->op2_cancellable = g_cancellable_new ();
-  ctx->completed = 0;
-
-  simple = g_simple_async_result_new (NULL, callback, user_data,
-      _g_io_stream_splice_finish);
-  g_simple_async_result_set_op_res_gpointer (simple, ctx,
-      (GDestroyNotify) splice_context_free);
-
-  if (cancellable != NULL)
-    {
-      ctx->cancellable = g_object_ref (cancellable);
-      ctx->cancelled_id = g_cancellable_connect (cancellable,
-          G_CALLBACK (splice_cancelled_cb), g_object_ref (simple),
-          g_object_unref);
-    }
-
-  istream = g_io_stream_get_input_stream (stream1);
-  ostream = g_io_stream_get_output_stream (stream2);
-  g_output_stream_splice_async (ostream, istream, G_OUTPUT_STREAM_SPLICE_NONE,
-      io_priority, ctx->op1_cancellable, splice_cb,
-      g_object_ref (simple));
-
-  istream = g_io_stream_get_input_stream (stream2);
-  ostream = g_io_stream_get_output_stream (stream1);
-  g_output_stream_splice_async (ostream, istream, G_OUTPUT_STREAM_SPLICE_NONE,
-      io_priority, ctx->op2_cancellable, splice_cb,
-      g_object_ref (simple));
-
-  g_object_unref (simple);
-}
-
-gboolean
-_g_io_stream_splice_finish (GAsyncResult  *result,
-                           GError       **error)
-{
-  GSimpleAsyncResult *simple;
-
-  g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), FALSE);
-
-  simple = G_SIMPLE_ASYNC_RESULT (result);
-
-  if (g_simple_async_result_propagate_error (simple, error))
-    return FALSE;
-
-  g_return_val_if_fail (g_simple_async_result_is_valid (result, NULL,
-      _g_io_stream_splice_finish), FALSE);
-
-  return TRUE;
-}
diff --git a/src/common.h b/src/common.h
deleted file mode 100644
index f05e3ab..0000000
--- a/src/common.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2010 Xavier Claessens <xclaesse@gmail.com>
- * Copyright (C) 2010 Collabora Ltd.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#ifndef __COMMON_H__
-#define __COMMON_H__
-
-#include <gio/gio.h>
-
-#define TUBE_SERVICE "x-ssh-contact"
-
-G_BEGIN_DECLS
-
-typedef enum {
-  _G_IO_STREAM_SPLICE_NONE          = 0,
-  _G_IO_STREAM_SPLICE_CLOSE_STREAM1 = (1 << 0),
-  _G_IO_STREAM_SPLICE_CLOSE_STREAM2 = (1 << 1),
-  _G_IO_STREAM_SPLICE_WAIT_FOR_BOTH = (1 << 2),
-} _GIOStreamSpliceFlags;
-
-void           _g_io_stream_splice_async      (GIOStream            *stream1,
-					       GIOStream            *stream2,
-					       _GIOStreamSpliceFlags flags,
-					       int                   io_priority,
-					       GCancellable         *cancellable,
-					       GAsyncReadyCallback   callback,
-					       gpointer              user_data);
-
-gboolean       _g_io_stream_splice_finish     (GAsyncResult         *result,
-                                               GError              **error);
-
-G_END_DECLS
-
-#endif /* #ifndef __COMMON_H__*/
diff --git a/src/service.c b/src/service.c
index 1ca5975..f440f2f 100644
--- a/src/service.c
+++ b/src/service.c
@@ -24,8 +24,6 @@
 
 #include <gio/gio.h>
 #include <telepathy-glib/telepathy-glib.h>
-
-#include "common.h"
 
 static GMainLoop *loop = NULL;
 static GList *channel_list = NULL;
@@ -63,7 +61,7 @@
 {
   GError *error = NULL;
 
-  _g_io_stream_splice_finish (res, &error);
+  g_io_stream_splice_finish (res, &error);
   session_complete (channel, error);
   g_clear_error (&error);
 }
@@ -101,8 +99,8 @@
   sshd_connection = g_socket_connection_factory_create_connection (socket);
 
   /* Splice tube and ssh connections */
-  _g_io_stream_splice_async (G_IO_STREAM (tube_connection),
-      G_IO_STREAM (sshd_connection), _G_IO_STREAM_SPLICE_NONE,
+  g_io_stream_splice_async (G_IO_STREAM (tube_connection),
+      G_IO_STREAM (sshd_connection), G_IO_STREAM_SPLICE_NONE,
       G_PRIORITY_DEFAULT, NULL, splice_cb, channel);
 
 OUT:
diff --git a/src/vinagre/Makefile.am b/src/vinagre/Makefile.am
index 5845572..7456724 100644
--- a/src/vinagre/Makefile.am
+++ b/src/vinagre/Makefile.am
@@ -20,7 +20,6 @@
 	tab.h tab.c				\
 	tree-view.h tree-view.c			\
 	../client-helpers.h ../client-helpers.c	\
-	../common.h ../common.c			\
 	$(NULL)
 
 plugin_in_files = ssh-contact.vinagre-plugin.desktop.in
diff --git a/src/vinagre/Makefile.in b/src/vinagre/Makefile.in
index 7201245..e26b577 100644
--- a/src/vinagre/Makefile.in
+++ b/src/vinagre/Makefile.in
@@ -75,7 +75,7 @@
 libssh_contact_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_libssh_contact_la_OBJECTS = plugin.lo connection.lo tab.lo \
-	tree-view.lo client-helpers.lo common.lo
+	tree-view.lo client-helpers.lo
 libssh_contact_la_OBJECTS = $(am_libssh_contact_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -287,7 +287,6 @@
 	tab.h tab.c				\
 	tree-view.h tree-view.c			\
 	../client-helpers.h ../client-helpers.c	\
-	../common.h ../common.c			\
 	$(NULL)
 
 plugin_in_files = ssh-contact.vinagre-plugin.desktop.in
@@ -370,7 +369,6 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client-helpers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tab.Plo@am__quote@
@@ -407,14 +405,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../client-helpers.c' object='client-helpers.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client-helpers.lo `test -f '../client-helpers.c' || echo '$(srcdir)/'`../client-helpers.c
-
-common.lo: ../common.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT common.lo -MD -MP -MF $(DEPDIR)/common.Tpo -c -o common.lo `test -f '../common.c' || echo '$(srcdir)/'`../common.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/common.Tpo $(DEPDIR)/common.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../common.c' object='common.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o common.lo `test -f '../common.c' || echo '$(srcdir)/'`../common.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/src/vinagre/tab.c b/src/vinagre/tab.c
index 0d9470b..0465f8a 100644
--- a/src/vinagre/tab.c
+++ b/src/vinagre/tab.c
@@ -30,7 +30,6 @@
 #include "tab.h"
 #include "connection.h"
 #include "../client-helpers.h"
-#include "../common.h"
 
 struct _SshContactTabPrivate
 {
@@ -144,7 +143,7 @@
   SshContactTab *self = user_data;
   GError *error = NULL;
 
-  if (!_g_io_stream_splice_finish (res, &error))
+  if (!g_io_stream_splice_finish (res, &error))
     throw_error (self, error);
   else
     leave (self);
@@ -174,8 +173,8 @@
   self->priv->connected = TRUE;
 
   /* Splice tube and ssh connections */
-  _g_io_stream_splice_async (G_IO_STREAM (self->priv->tube_connection),
-      G_IO_STREAM (self->priv->ssh_connection), _G_IO_STREAM_SPLICE_NONE,
+  g_io_stream_splice_async (G_IO_STREAM (self->priv->tube_connection),
+      G_IO_STREAM (self->priv->ssh_connection), G_IO_STREAM_SPLICE_NONE,
       G_PRIORITY_DEFAULT, NULL, splice_cb, self);
 }