Index: telepathy-glib/run.c
===================================================================
--- telepathy-glib/run.c	(revision 848)
+++ telepathy-glib/run.c	(revision 849)
@@ -40,7 +40,10 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #include "debug-internal.h"
 #include <telepathy-glib/base-connection-manager.h>
Index: telepathy-glib/debug.c
===================================================================
--- telepathy-glib/debug.c	(revision 848)
+++ telepathy-glib/debug.c	(revision 849)
@@ -54,7 +54,10 @@
 #include <fcntl.h>
 #include <stdarg.h>
 #include <sys/stat.h>
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #include <glib.h>
 #include <glib/gstdio.h>
Index: telepathy-glib/base-connection-manager.c
===================================================================
--- telepathy-glib/base-connection-manager.c	(revision 848)
+++ telepathy-glib/base-connection-manager.c	(revision 849)
@@ -425,7 +425,7 @@
     {
       case DBUS_TYPE_STRING:
         {
-          gchar **save_to = (gchar **) (params + paramspec->offset);
+          gchar **save_to = (gchar **) ((guint8 *)params + paramspec->offset);
           const gchar *str;
 
           g_assert (paramspec->gtype == G_TYPE_STRING);
@@ -451,7 +451,7 @@
       case DBUS_TYPE_INT16:
       case DBUS_TYPE_INT32:
         {
-          gint *save_to = (gint *) (params + paramspec->offset);
+          gint *save_to = (gint *) ((guint8 *)params + paramspec->offset);
           gint i = g_value_get_int (value);
 
           g_assert (paramspec->gtype == G_TYPE_INT);
@@ -462,7 +462,7 @@
       case DBUS_TYPE_UINT16:
       case DBUS_TYPE_UINT32:
         {
-          guint *save_to = (guint *) (params + paramspec->offset);
+          guint *save_to = (guint *) ((guint8 *)params + paramspec->offset);
           guint i = g_value_get_uint (value);
 
           g_assert (paramspec->gtype == G_TYPE_UINT);
@@ -472,7 +472,7 @@
         break;
       case DBUS_TYPE_BOOLEAN:
         {
-          gboolean *save_to = (gboolean *) (params + paramspec->offset);
+          gboolean *save_to = (gboolean *) ((guint8 *)params + paramspec->offset);
           gboolean b = g_value_get_boolean (value);
 
           g_assert (paramspec->gtype == G_TYPE_BOOLEAN);
@@ -486,7 +486,7 @@
           {
             case DBUS_TYPE_BYTE:
               {
-                GArray **save_to = (GArray **) (params + paramspec->offset);
+                GArray **save_to = (GArray **) ((guint8 *)params + paramspec->offset);
                 GArray *a = g_value_get_boxed (value);
 
                 if (*save_to != NULL)
Index: telepathy-glib/presence-mixin.c
===================================================================
--- telepathy-glib/presence-mixin.c	(revision 848)
+++ telepathy-glib/presence-mixin.c	(revision 849)
@@ -66,12 +66,6 @@
 #include "debug-internal.h"
 
 
-struct _TpPresenceMixinPrivate
-{
-  /* ... */
-};
-
-
 /**
  * deep_copy_hashtable
  *
@@ -244,8 +238,6 @@
 tp_presence_mixin_init (GObject *obj,
                         glong offset)
 {
-  TpPresenceMixin *mixin;
-
   DEBUG ("called.");
 
   g_assert (G_IS_OBJECT (obj));
@@ -253,10 +245,6 @@
   g_type_set_qdata (G_OBJECT_TYPE (obj),
                     TP_PRESENCE_MIXIN_OFFSET_QUARK,
                     GINT_TO_POINTER (offset));
-
-  mixin = TP_PRESENCE_MIXIN (obj);
-
-  mixin->priv = g_slice_new0 (TpPresenceMixinPrivate);
 }
 
 /**
@@ -268,13 +256,7 @@
 void
 tp_presence_mixin_finalize (GObject *obj)
 {
-  TpPresenceMixin *mixin = TP_PRESENCE_MIXIN (obj);
-
   DEBUG ("%p", obj);
-
-  /* free any data held directly by the object here */
-
-  g_slice_free (TpPresenceMixinPrivate, mixin->priv);
 }