Index: telepathy-mission-control-5.5.4/test/account-store-default.c
===================================================================
--- telepathy-mission-control-5.5.4.orig/test/account-store-default.c
+++ telepathy-mission-control-5.5.4/test/account-store-default.c
@@ -23,6 +23,8 @@
 #include <glib.h>
 #include <string.h>
 
+#include "account-store-default.h"
+
 #if ENABLE_GNOME_KEYRING
 #include <gnome-keyring.h>
 
@@ -165,7 +167,6 @@ static GKeyFile * default_keyfile (void)
 {
   GError *error = NULL;
   static GKeyFile *keyfile = NULL;
-  const gchar *base;
   const gchar *path = NULL;
 
   if (keyfile != NULL)
@@ -180,7 +181,7 @@ static GKeyFile * default_keyfile (void)
       if (error != NULL)
         g_warning ("keyfile '%s' error: %s", path, error->message);
       else
-        g_warning ("keyfile '%s' error: unknown error");
+        g_warning ("keyfile '%s' error: unknown error", path);
 
       g_key_file_free (keyfile);
       g_error_free (error);
@@ -190,7 +191,7 @@ static GKeyFile * default_keyfile (void)
   return keyfile;
 }
 
-static gboolean commit_changes ()
+static gboolean commit_changes (void)
 {
   gsize n = 0;
   gchar *data = NULL;
Index: telepathy-mission-control-5.5.4/test/account-store.c
===================================================================
--- telepathy-mission-control-5.5.4.orig/test/account-store.c
+++ telepathy-mission-control-5.5.4/test/account-store.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <glib.h>
+#include <glib-object.h>
 
 #include "account-store-default.h"
 
@@ -121,7 +122,7 @@ int main (int argc, char **argv)
   const Backend *store = NULL;
   Operation op = OP_UNKNOWN;
   gchar *output = NULL;
-  gboolean success;
+  gboolean success = FALSE;
 
   g_type_init ();
   g_set_application_name (argv[0]);
@@ -240,7 +241,7 @@ usage (const gchar *name, const gchar *f
   for (i = 1; backends[i].name != NULL; i++)
     fprintf (stderr, " | %s", backends[i].name);
 
-  fprintf (stderr, DOCSTRING_B, name);
+  fprintf (stderr, DOCSTRING_B);
 
   va_start (ap, fmt);
   vfprintf (stderr, fmt, ap);
Index: telepathy-mission-control-5.5.4/test/keyring-command.c
===================================================================
--- telepathy-mission-control-5.5.4.orig/test/keyring-command.c
+++ telepathy-mission-control-5.5.4/test/keyring-command.c
@@ -23,6 +23,9 @@
  *
  */
 
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <glib-object.h>
 #include <gnome-keyring.h>
 
 
@@ -91,6 +94,7 @@ remove_keyring (gchar *keyring_name)
     {
       g_warning ("Failed to remove keyring %s: %s", keyring_name,
           gnome_keyring_result_to_message (result));
+      return FALSE;
     }
 }