diff --git a/libnm-glib/nm-object-private.h b/libnm-glib/nm-object-private.h
index 1786f33d8..87141aab1 100644
--- a/libnm-glib/nm-object-private.h
+++ b/libnm-glib/nm-object-private.h
@@ -25,7 +25,10 @@
 
 void _nm_object_ensure_inited (NMObject *object);
 
-typedef gboolean (*PropertyMarshalFunc) (NMObject *, GParamSpec *, GValue *, gpointer);
+typedef gboolean (*PropertyMarshalFunc) (NMObject *object,
+                                         GParamSpec *pspec,
+                                         GValue *value,
+                                         gpointer field);
 
 typedef struct {
 	const char *name;
@@ -77,9 +80,12 @@ handle_ptr_array_return (GPtrArray *array)
 }
 
 /* object demarshalling support */
-typedef GType (*NMObjectTypeFunc) (DBusGConnection *, const char *);
-typedef void (*NMObjectTypeCallbackFunc) (GType, gpointer);
-typedef void (*NMObjectTypeAsyncFunc) (DBusGConnection *, const char *, NMObjectTypeCallbackFunc, gpointer);
+typedef GType (*NMObjectTypeFunc) (DBusGConnection *connection, const char *path);
+typedef void (*NMObjectTypeCallbackFunc) (GType type, gpointer user_data);
+typedef void (*NMObjectTypeAsyncFunc) (DBusGConnection *connection,
+                                       const char *path,
+                                       NMObjectTypeCallbackFunc callback,
+                                       gpointer user_data);
 
 void _nm_object_register_type_func (GType base_type, NMObjectTypeFunc type_func,
                                     NMObjectTypeAsyncFunc type_async_func);