Remove TpProxy::interface-added, and dbus-glib marshaller registration

In the glorious GDBus future, we won't need marshaller and signal
registration.

This also means we can get rid of the init_known_interfaces() family
of functions, which were only there to support interface-added.

This commit is the first of many that will break bisection.
That's somewhat unavoidable if you want to go from libdbus to GDBus
without having a single mega-commit :-)

53 files changed, 5 insertions, 973 deletions

diff --git a/docs/reference/telepathy-glib/telepathy-glib-docs.sgml b/docs/reference/telepathy-glib/telepathy-glib-docs.sgml
index 3ad5b4761..b72135681 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-docs.sgml
+++ b/docs/reference/telepathy-glib/telepathy-glib-docs.sgml
@@ -59,7 +59,6 @@
     <xi:include href="xml/call-channel.xml"/>
     <xi:include href="xml/call-content.xml"/>
     <xi:include href="xml/call-stream.xml"/>
-    <xi:include href="xml/call-misc.xml"/>
     <xi:include href="xml/debug-client.xml"/>
     <xi:include href="xml/debug-message.xml"/>
     <xi:include href="xml/room-list.xml"/>
diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 252235768..5dc6d5ab9 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -1939,7 +1939,6 @@ tp_dbus_daemon_release_name
 tp_dbus_daemon_request_name
 tp_dbus_daemon_register_object
 tp_dbus_daemon_unregister_object
-tp_dbus_daemon_init_known_interfaces
 <SUBSECTION Standard>
 tp_dbus_name_type_get_type
 tp_dbus_daemon_get_type
@@ -3009,10 +3008,7 @@ tp_proxy_get_interface_by_id
 tp_proxy_check_interface_by_id
 tp_proxy_invalidate
 TpProxyInterfaceAddedCb
-tp_proxy_or_subclass_hook_on_interface_add
-tp_proxy_init_known_interfaces
 tp_proxy_subclass_add_error_mapping
-tp_proxy_dbus_g_proxy_claim_for_signal_adding
 <SUBSECTION>
 TpProxyInvokeFunc
 tp_proxy_pending_call_v0_new
@@ -3029,7 +3025,6 @@ tp_proxy_signal_connection_v0_take_results
 <INCLUDE>telepathy-glib/channel.h</INCLUDE>
 TpChannel
 TpChannelClass
-tp_channel_init_known_interfaces
 <SUBSECTION>
 TP_CHANNEL_FEATURE_CORE
 tp_channel_get_connection
@@ -3280,7 +3275,6 @@ tp_connection_get_status
 tp_connection_get_cm_name
 tp_connection_get_protocol_name
 tp_connection_get_self_contact
-tp_connection_init_known_interfaces
 tp_connection_presence_type_cmp_availability
 tp_connection_get_capabilities
 tp_connection_get_avatar_requirements
@@ -3676,7 +3670,6 @@ tp_connection_manager_param_get_default
 tp_connection_manager_param_dup_default_variant
 tp_connection_manager_check_valid_name
 tp_connection_manager_check_valid_protocol_name
-tp_connection_manager_init_known_interfaces
 tp_connection_manager_param_copy
 tp_connection_manager_param_free
 tp_connection_manager_param_dup_variant_type
@@ -3980,7 +3973,6 @@ TP_SVC_ACCOUNT_MANAGER_GET_CLASS
 <TITLE>account</TITLE>
 TpAccount
 TpAccountClass
-tp_account_init_known_interfaces
 tp_account_get_path_suffix
 tp_account_get_connection
 tp_account_get_display_name
@@ -4108,7 +4100,6 @@ TpAccountManager
 TpAccountManagerClass
 tp_account_manager_new
 tp_account_manager_new_with_factory
-tp_account_manager_init_known_interfaces
 tp_account_manager_set_default
 tp_account_manager_can_set_default
 tp_account_manager_dup
@@ -4171,7 +4162,6 @@ tp_cli_account_manager_add_signals
 TpChannelDispatcher
 TpChannelDispatcherClass
 tp_channel_dispatcher_new
-tp_channel_dispatcher_init_known_interfaces
 <SUBSECTION>
 tp_cli_channel_dispatcher_interface_messages1_call_send_message
 tp_cli_channel_dispatcher_interface_messages1_callback_for_send_message
@@ -4290,7 +4280,6 @@ TP_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST_GET_CLASS
 <TITLE>channel-dispatch-operation</TITLE>
 TpChannelDispatchOperation
 TpChannelDispatchOperationClass
-tp_channel_dispatch_operation_init_known_interfaces
 <SUBSECTION>
 TP_CHANNEL_DISPATCH_OPERATION_FEATURE_CORE
 tp_channel_dispatch_operation_get_account
@@ -4325,7 +4314,6 @@ tp_channel_dispatch_operation_get_feature_quark_core
 <TITLE>channel-request</TITLE>
 TpChannelRequest
 TpChannelRequestClass
-tp_channel_request_init_known_interfaces
 tp_channel_request_dup_immutable_properties
 tp_channel_request_get_account
 tp_channel_request_get_user_action_time
@@ -4392,7 +4380,6 @@ TP_TYPE_SVC_CHANNEL_REQUEST
 <TITLE>client</TITLE>
 TpClient
 TpClientClass
-tp_client_init_known_interfaces
 <SUBSECTION Standard>
 tp_client_get_type
 TP_CLIENT
@@ -4854,7 +4841,6 @@ TpProtocol
 TpProtocolClass
 tp_protocol_get_name
 tp_protocol_get_cm_name
-tp_protocol_init_known_interfaces
 <SUBSECTION>
 TP_PROTOCOL_FEATURE_PARAMETERS
 tp_protocol_get_params
@@ -5610,7 +5596,6 @@ tp_cli_call_content_add_signals
 <SUBSECTION>
 TpCallContent
 TpCallContentClass
-tp_call_content_init_known_interfaces
 TP_CALL_CONTENT_FEATURE_CORE
 <SUBSECTION>
 tp_call_content_get_disposition
@@ -5694,7 +5679,6 @@ tp_cli_call_stream_add_signals
 <SUBSECTION>
 TpCallStream
 TpCallStreamClass
-tp_call_stream_init_known_interfaces
 TP_CALL_STREAM_FEATURE_CORE
 <SUBSECTION>
 tp_call_stream_can_request_receiving
@@ -5752,15 +5736,6 @@ tp_cli_call_stream_endpoint_add_signals
 </SECTION>
 
 <SECTION>
-<FILE>call-misc</FILE>
-<TITLE>call-misc</TITLE>
-<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
-<SUBSECTION>
-tp_call_content_media_description_init_known_interfaces
-tp_call_stream_endpoint_init_known_interfaces
-</SECTION>
-
-<SECTION>
 <FILE>client-factory</FILE>
 <TITLE>client-factory</TITLE>
 <INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
@@ -6086,7 +6061,6 @@ TpBaseMediaCallChannelPrivate
 <SUBSECTION>
 TpDebugClient
 TpDebugClientClass
-tp_debug_client_init_known_interfaces
 tp_debug_client_new
 tp_debug_client_set_enabled_async
 tp_debug_client_set_enabled_finish
@@ -6231,7 +6205,6 @@ TP_TYPE_CHANNEL_FILTER
 <INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>TpTLSCertificate</TITLE>
 TpTLSCertificate
-tp_tls_certificate_init_known_interfaces
 TP_TLS_CERTIFICATE_FEATURE_CORE
 tp_tls_certificate_get_rejection
 tp_tls_certificate_get_nth_rejection
diff --git a/examples/client/extended-client.c b/examples/client/extended-client.c
index 8e1ae39a5..21eb738af 100644
--- a/examples/client/extended-client.c
+++ b/examples/client/extended-client.c
@@ -287,8 +287,6 @@ main (int argc,
 
   tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
 
-  example_cli_init ();
-
   dbus = tp_dbus_daemon_dup (&error);
 
   if (dbus == NULL)
diff --git a/examples/extensions/Makefile.am b/examples/extensions/Makefile.am
index d6ba4472b..ff92bc33b 100644
--- a/examples/extensions/Makefile.am
+++ b/examples/extensions/Makefile.am
@@ -44,7 +44,6 @@ libexample_extensions_la_SOURCES = \
     extensions.h
 
 nodist_libexample_extensions_la_SOURCES = \
-    _gen/register-dbus-glib-marshallers-body.h \
     _gen/enums.h \
     _gen/gtypes.h \
     _gen/gtypes-body.h \
@@ -88,11 +87,6 @@ _gen/gtypes-body.h: _gen/all.xml \
 	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/tools/glib-gtypes-generator.py \
 		$< _gen/gtypes Example
 
-_gen/register-dbus-glib-marshallers-body.h: _gen/all.xml \
-	$(tools_dir)/glib-client-marshaller-gen.py
-	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< \
-		_example_ext > $@
-
 _gen/enums.h: _gen/all.xml \
 	$(tools_dir)/c-constants-gen.py
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py \
diff --git a/examples/extensions/extensions-cli.c b/examples/extensions/extensions-cli.c
index aba168013..059c12e9d 100644
--- a/examples/extensions/extensions-cli.c
+++ b/examples/extensions/extensions-cli.c
@@ -7,29 +7,5 @@
 
 #include <telepathy-glib/proxy-subclass.h>
 
-static void _example_ext_register_dbus_glib_marshallers (void);
-
 /* include auto-generated stubs for client-specific code */
 #include "_gen/cli-connection-body.h"
-#include "_gen/register-dbus-glib-marshallers-body.h"
-
-static gpointer
-example_cli_once (gpointer data)
-{
-  _example_ext_register_dbus_glib_marshallers ();
-
-  tp_connection_init_known_interfaces ();
-
-  tp_proxy_or_subclass_hook_on_interface_add (TP_TYPE_CONNECTION,
-      example_cli_connection_add_signals);
-
-  return NULL;
-}
-
-void
-example_cli_init (void)
-{
-  static GOnce once = G_ONCE_INIT;
-
-  g_once (&once, example_cli_once, NULL);
-}
diff --git a/examples/extensions/extensions.h b/examples/extensions/extensions.h
index 40c1e7510..88cc8b610 100644
--- a/examples/extensions/extensions.h
+++ b/examples/extensions/extensions.h
@@ -14,8 +14,6 @@ G_BEGIN_DECLS
 #include "examples/extensions/_gen/gtypes.h"
 #include "examples/extensions/_gen/interfaces.h"
 
-void example_cli_init (void);
-
 G_END_DECLS
 
 #endif
diff --git a/telepathy-farstream/call-content.c b/telepathy-farstream/call-content.c
index 2eea57bc8..9fe7e809e 100644
--- a/telepathy-farstream/call-content.c
+++ b/telepathy-farstream/call-content.c
@@ -845,7 +845,6 @@ process_media_description (TfCallContent *self,
       return;
     }
 
-  tp_call_content_media_description_init_known_interfaces ();
   proxy = g_object_new (TP_TYPE_PROXY,
       "dbus-daemon", tp_proxy_get_dbus_daemon (self->proxy),
       "bus-name", tp_proxy_get_bus_name (self->proxy),
diff --git a/telepathy-farstream/call-stream.c b/telepathy-farstream/call-stream.c
index 222bdca32..318139bb6 100644
--- a/telepathy-farstream/call-stream.c
+++ b/telepathy-farstream/call-stream.c
@@ -911,7 +911,6 @@ tf_call_stream_add_endpoint (TfCallStream *self, const gchar *obj_path)
 
   self->endpoint_objpath = g_strdup (obj_path);
 
-  tp_call_stream_endpoint_init_known_interfaces ();
   self->endpoint = g_object_new (TP_TYPE_PROXY,
       "dbus-daemon", tp_proxy_get_dbus_daemon (self->proxy),
       "bus-name", tp_proxy_get_bus_name (self->proxy),
diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am
index f5537008c..418818ce2 100644
--- a/telepathy-glib/Makefile.am
+++ b/telepathy-glib/Makefile.am
@@ -62,7 +62,6 @@ tpginclude_HEADERS = \
     call-channel.h \
     call-content.h \
     call-content-media-description.h \
-    call-misc.h \
     call-stream.h \
     call-stream-endpoint.h \
     channel.h \
@@ -247,7 +246,6 @@ libtelepathy_glib_main_internal_la_SOURCES = \
     call-content.c \
     call-content-media-description.c \
     call-internal.h \
-    call-misc.c \
     call-stream.c \
     call-stream-endpoint.c \
     channel.c \
diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index 643d4303a..f0202bff7 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -566,7 +566,6 @@ tp_account_manager_class_init (TpAccountManagerClass *klass)
 
   proxy_class->interface = TP_IFACE_QUARK_ACCOUNT_MANAGER;
   proxy_class->list_features = _tp_account_manager_list_features;
-  tp_account_manager_init_known_interfaces ();
 
   /**
    * TpAccountManager::account-usability-changed:
@@ -672,37 +671,6 @@ tp_account_manager_class_init (TpAccountManagerClass *klass)
         G_TYPE_STRING); /* stauts message*/
 }
 
-/**
- * tp_account_manager_init_known_interfaces:
- *
- * Ensure that the known interfaces for TpAccountManager have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_ACCOUNT_MANAGER.
- *
- * Since: 0.7.32
- */
-void
-tp_account_manager_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType tp_type = TP_TYPE_ACCOUNT_MANAGER;
-
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (tp_type,
-          tp_cli_account_manager_add_signals);
-      tp_proxy_subclass_add_error_mapping (tp_type,
-          TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-      g_once_init_leave (&once, 1);
-    }
-}
-
 static TpAccountManager *
 _tp_account_manager_new_internal (TpClientFactory *factory,
     TpDBusDaemon *bus_daemon)
diff --git a/telepathy-glib/account-manager.h b/telepathy-glib/account-manager.h
index d5f330db7..f66a82fef 100644
--- a/telepathy-glib/account-manager.h
+++ b/telepathy-glib/account-manager.h
@@ -88,8 +88,6 @@ gboolean tp_account_manager_can_set_default (void);
 
 TpAccountManager *tp_account_manager_dup (void) G_GNUC_WARN_UNUSED_RESULT;
 
-void tp_account_manager_init_known_interfaces (void);
-
 _TP_AVAILABLE_IN_0_20
 GList *tp_account_manager_dup_usable_accounts (TpAccountManager *manager)
   G_GNUC_WARN_UNUSED_RESULT;
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index dc953dbd5..744153388 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -2122,38 +2122,6 @@ tp_account_class_init (TpAccountClass *klass)
 
   proxy_class->interface = TP_IFACE_QUARK_ACCOUNT;
   proxy_class->list_features = _tp_account_list_features;
-  tp_account_init_known_interfaces ();
-}
-
-/**
- * tp_account_init_known_interfaces:
- *
- * Ensure that the known interfaces for TpAccount have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_ACCOUNT.
- *
- * Since: 0.7.32
- */
-void
-tp_account_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType tp_type = TP_TYPE_ACCOUNT;
-
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (tp_type,
-          tp_cli_account_add_signals);
-      tp_proxy_subclass_add_error_mapping (tp_type,
-          TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-      g_once_init_leave (&once, 1);
-    }
 }
 
 TpAccount *
diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h
index ff36adf04..14215138a 100644
--- a/telepathy-glib/account.h
+++ b/telepathy-glib/account.h
@@ -88,8 +88,6 @@ GQuark tp_account_get_feature_quark_addressing (void) G_GNUC_CONST;
 
 const gchar *tp_account_get_path_suffix (TpAccount *account);
 
-void tp_account_init_known_interfaces (void);
-
 TpConnection *tp_account_get_connection (TpAccount *account);
 
 const gchar *tp_account_get_display_name (TpAccount *account);
diff --git a/telepathy-glib/call-channel.c b/telepathy-glib/call-channel.c
index e9a3ba0ce..273060b5f 100644
--- a/telepathy-glib/call-channel.c
+++ b/telepathy-glib/call-channel.c
@@ -50,7 +50,6 @@
 #include <config.h>
 
 #include <telepathy-glib/call-content.h>
-#include <telepathy-glib/call-misc.h>
 #include <telepathy-glib/call-stream.h>
 #include <telepathy-glib/cli-channel.h>
 #include <telepathy-glib/cli-misc.h>
diff --git a/telepathy-glib/call-content.c b/telepathy-glib/call-content.c
index 867249b28..4a71635a9 100644
--- a/telepathy-glib/call-content.c
+++ b/telepathy-glib/call-content.c
@@ -48,7 +48,6 @@
 #include "telepathy-glib/call-content.h"
 
 #include <telepathy-glib/call-channel.h>
-#include <telepathy-glib/call-misc.h>
 #include <telepathy-glib/call-stream.h>
 #include <telepathy-glib/cli-call.h>
 #include <telepathy-glib/cli-misc.h>
@@ -557,7 +556,6 @@ tp_call_content_class_init (TpCallContentClass *klass)
   proxy_class->interface = TP_IFACE_QUARK_CALL1_CONTENT;
 
   g_type_class_add_private (gobject_class, sizeof (TpCallContentPrivate));
-  tp_call_content_init_known_interfaces ();
 
   /**
    * TpCallContent:connection:
@@ -725,37 +723,6 @@ tp_call_content_init (TpCallContent *self)
 }
 
 /**
- * tp_call_content_init_known_interfaces:
- *
- * Ensure that the known interfaces for #TpCallContent have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_CALL_CONTENT.
- *
- * Since: 0.17.5
- */
-void
-tp_call_content_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType tp_type = TP_TYPE_CALL_CONTENT;
-
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (tp_type,
-          tp_cli_call_content_add_signals);
-      tp_proxy_subclass_add_error_mapping (tp_type,
-          TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-      g_once_init_leave (&once, 1);
-    }
-}
-
-/**
  * TP_CALL_CONTENT_FEATURE_CORE:
  *
  * Expands to a call to a function that returns a quark for the "core"
diff --git a/telepathy-glib/call-content.h b/telepathy-glib/call-content.h
index a43b9302a..dfac0f4f8 100644
--- a/telepathy-glib/call-content.h
+++ b/telepathy-glib/call-content.h
@@ -59,9 +59,6 @@ struct _TpCallContentClass
 _TP_AVAILABLE_IN_0_18
 GType tp_call_content_get_type (void);
 
-_TP_AVAILABLE_IN_0_18
-void tp_call_content_init_known_interfaces (void);
-
 #define TP_CALL_CONTENT_FEATURE_CORE \
   tp_call_content_get_feature_quark_core ()
 _TP_AVAILABLE_IN_0_18
diff --git a/telepathy-glib/call-misc.c b/telepathy-glib/call-misc.c
deleted file mode 100644
index aee48f1f8..000000000
--- a/telepathy-glib/call-misc.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * call.c - misc low level API for Call
- *
- * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/**
- * SECTION:call-misc
- * @title: Misc Call APIs
- * @short_description: Misc generated APISs for Call
- *
- * This contains generated APIs to be used by #TpCallChannel, #TpCallStream,
- * #TpCallContent or telepathy-farstream. Should not be needed for normal
- * clients.
- */
-
-#include "config.h"
-
-#include "telepathy-glib/call-misc.h"
-#include "telepathy-glib/cli-call.h"
-#include "telepathy-glib/errors.h"
-#include "telepathy-glib/interfaces.h"
-#include "telepathy-glib/proxy-subclass.h"
-
-/**
- * tp_call_stream_endpoint_init_known_interfaces:
- *
- * Ensure that the known interfaces for #TpProxy have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_PROXY.
- *
- * Since: 0.17.5
- */
-void
-tp_call_stream_endpoint_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType tp_type = TP_TYPE_PROXY;
-
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (tp_type,
-          tp_cli_call_stream_endpoint_add_signals);
-
-      g_once_init_leave (&once, 1);
-    }
-}
-
-/**
- * tp_call_content_media_description_init_known_interfaces:
- *
- * Ensure that the known interfaces for #TpProxy have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_PROXY.
- *
- * Since: 0.17.5
- */
-void
-tp_call_content_media_description_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType tp_type = TP_TYPE_PROXY;
-
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (tp_type,
-          tp_cli_call_content_media_description_add_signals);
-
-      g_once_init_leave (&once, 1);
-    }
-}
diff --git a/telepathy-glib/call-misc.h b/telepathy-glib/call-misc.h
deleted file mode 100644
index 5fbac6ead..000000000
--- a/telepathy-glib/call-misc.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * call.h - misc low level API for Call
- *
- * Copyright (C) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
-#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
-#endif
-
-#ifndef __TP_CALL_MISC_H__
-#define __TP_CALL_MISC_H__
-
-#include <telepathy-glib/defs.h>
-#include <telepathy-glib/proxy.h>
-
-G_BEGIN_DECLS
-
-_TP_AVAILABLE_IN_0_18
-void tp_call_stream_endpoint_init_known_interfaces (void);
-_TP_AVAILABLE_IN_0_18
-void tp_call_content_media_description_init_known_interfaces (void);
-
-G_END_DECLS
-
-#endif
diff --git a/telepathy-glib/call-stream.c b/telepathy-glib/call-stream.c
index 96c027270..b07247a75 100644
--- a/telepathy-glib/call-stream.c
+++ b/telepathy-glib/call-stream.c
@@ -48,7 +48,6 @@
 #include "telepathy-glib/call-stream.h"
 
 #include <telepathy-glib/call-content.h>
-#include <telepathy-glib/call-misc.h>
 #include <telepathy-glib/cli-call.h>
 #include <telepathy-glib/cli-misc.h>
 #include <telepathy-glib/dbus.h>
@@ -343,7 +342,6 @@ tp_call_stream_class_init (TpCallStreamClass *klass)
   proxy_class->interface = TP_IFACE_QUARK_CALL1_STREAM;
 
   g_type_class_add_private (gobject_class, sizeof (TpCallStreamPrivate));
-  tp_call_stream_init_known_interfaces ();
 
   /**
    * TpCallStream:connection:
@@ -458,37 +456,6 @@ tp_call_stream_init (TpCallStream *self)
 }
 
 /**
- * tp_call_stream_init_known_interfaces:
- *
- * Ensure that the known interfaces for #TpCallStream have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_CALL_STREAM.
- *
- * Since: 0.17.5
- */
-void
-tp_call_stream_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType tp_type = TP_TYPE_CALL_STREAM;
-
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (tp_type,
-          tp_cli_call_stream_add_signals);
-      tp_proxy_subclass_add_error_mapping (tp_type,
-          TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-      g_once_init_leave (&once, 1);
-    }
-}
-
-/**
  * TP_CALL_STREAM_FEATURE_CORE:
  *
  * Expands to a call to a function that returns a quark for the "core"
diff --git a/telepathy-glib/call-stream.h b/telepathy-glib/call-stream.h
index d55ec1d3a..ff93ead6b 100644
--- a/telepathy-glib/call-stream.h
+++ b/telepathy-glib/call-stream.h
@@ -59,9 +59,6 @@ struct _TpCallStreamClass
 _TP_AVAILABLE_IN_0_18
 GType tp_call_stream_get_type (void);
 
-_TP_AVAILABLE_IN_0_18
-void tp_call_stream_init_known_interfaces (void);
-
 #define TP_CALL_STREAM_FEATURE_CORE \
   tp_call_stream_get_feature_quark_core ()
 _TP_AVAILABLE_IN_0_18
diff --git a/telepathy-glib/channel-dispatch-operation.c b/telepathy-glib/channel-dispatch-operation.c
index 2d5a0789c..b56feb044 100644
--- a/telepathy-glib/channel-dispatch-operation.c
+++ b/telepathy-glib/channel-dispatch-operation.c
@@ -732,39 +732,6 @@ tp_channel_dispatch_operation_class_init (TpChannelDispatchOperationClass *klass
   proxy_class->interface = TP_IFACE_QUARK_CHANNEL_DISPATCH_OPERATION;
   proxy_class->must_have_unique_name = TRUE;
   proxy_class->list_features = tp_channel_dispatch_operation_list_features;
-
-  tp_channel_dispatch_operation_init_known_interfaces ();
-}
-
-/**
- * tp_channel_dispatch_operation_init_known_interfaces:
- *
- * Ensure that the known interfaces for TpChannelDispatchOperation have been
- * set up. This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_CHANNEL_DISPATCH_OPERATION.
- *
- * Since: 0.7.32
- */
-void
-tp_channel_dispatch_operation_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType tp_type = TP_TYPE_CHANNEL_DISPATCH_OPERATION;
-
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (tp_type,
-          tp_cli_channel_dispatch_operation_add_signals);
-      tp_proxy_subclass_add_error_mapping (tp_type,
-          TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-      g_once_init_leave (&once, 1);
-    }
 }
 
 TpChannelDispatchOperation *
diff --git a/telepathy-glib/channel-dispatch-operation.h b/telepathy-glib/channel-dispatch-operation.h
index 6c563336e..35b74d634 100644
--- a/telepathy-glib/channel-dispatch-operation.h
+++ b/telepathy-glib/channel-dispatch-operation.h
@@ -75,8 +75,6 @@ GType tp_channel_dispatch_operation_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CHANNEL_DISPATCH_OPERATION, \
                               TpChannelDispatchOperationClass))
 
-void tp_channel_dispatch_operation_init_known_interfaces (void);
-
 #define TP_CHANNEL_DISPATCH_OPERATION_FEATURE_CORE \
   tp_channel_dispatch_operation_get_feature_quark_core ()
 
diff --git a/telepathy-glib/channel-dispatcher.c b/telepathy-glib/channel-dispatcher.c
index e87374392..be71f8296 100644
--- a/telepathy-glib/channel-dispatcher.c
+++ b/telepathy-glib/channel-dispatcher.c
@@ -109,38 +109,6 @@ tp_channel_dispatcher_class_init (TpChannelDispatcherClass *klass)
   object_class->constructed = tp_channel_dispatcher_constructed;
 
   proxy_class->interface = TP_IFACE_QUARK_CHANNEL_DISPATCHER;
-  tp_channel_dispatcher_init_known_interfaces ();
-}
-
-/**
- * tp_channel_dispatcher_init_known_interfaces:
- *
- * Ensure that the known interfaces for TpChannelDispatcher have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_CHANNEL_DISPATCHER.
- *
- * Since: 0.7.32
- */
-void
-tp_channel_dispatcher_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType tp_type = TP_TYPE_CHANNEL_DISPATCHER;
-
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (tp_type,
-          tp_cli_channel_dispatcher_add_signals);
-      tp_proxy_subclass_add_error_mapping (tp_type,
-          TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-      g_once_init_leave (&once, 1);
-    }
 }
 
 /**
diff --git a/telepathy-glib/channel-dispatcher.h b/telepathy-glib/channel-dispatcher.h
index 931fea8e9..1946647f2 100644
--- a/telepathy-glib/channel-dispatcher.h
+++ b/telepathy-glib/channel-dispatcher.h
@@ -73,8 +73,6 @@ GType tp_channel_dispatcher_get_type (void);
 TpChannelDispatcher *tp_channel_dispatcher_new (TpDBusDaemon *bus_daemon)
     G_GNUC_WARN_UNUSED_RESULT;
 
-void tp_channel_dispatcher_init_known_interfaces (void);
-
 _TP_AVAILABLE_IN_0_16
 void tp_channel_dispatcher_present_channel_async (TpChannelDispatcher *self,
     TpChannel *channel,
diff --git a/telepathy-glib/channel-request.c b/telepathy-glib/channel-request.c
index ec1d1fc57..1953fcae2 100644
--- a/telepathy-glib/channel-request.c
+++ b/telepathy-glib/channel-request.c
@@ -308,7 +308,6 @@ tp_channel_request_class_init (TpChannelRequestClass *klass)
   object_class->dispose = tp_channel_request_dispose;
 
   proxy_class->interface = TP_IFACE_QUARK_CHANNEL_REQUEST;
-  tp_channel_request_init_known_interfaces ();
   proxy_class->must_have_unique_name = TRUE;
 
   /**
@@ -428,37 +427,6 @@ tp_channel_request_class_init (TpChannelRequestClass *klass)
       G_TYPE_NONE, 2, TP_TYPE_CONNECTION, TP_TYPE_CHANNEL);
 }
 
-/**
- * tp_channel_request_init_known_interfaces:
- *
- * Ensure that the known interfaces for TpChannelRequest have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_CHANNEL_REQUEST.
- *
- * Since: 0.7.32
- */
-void
-tp_channel_request_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType tp_type = TP_TYPE_CHANNEL_REQUEST;
-
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (tp_type,
-          tp_cli_channel_request_add_signals);
-      tp_proxy_subclass_add_error_mapping (tp_type,
-          TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-      g_once_init_leave (&once, 1);
-    }
-}
-
 TpChannelRequest *
 _tp_channel_request_new_with_factory (TpClientFactory *factory,
     TpDBusDaemon *bus_daemon,
diff --git a/telepathy-glib/channel-request.h b/telepathy-glib/channel-request.h
index 576764e01..81bd72ade 100644
--- a/telepathy-glib/channel-request.h
+++ b/telepathy-glib/channel-request.h
@@ -69,8 +69,6 @@ GType tp_channel_request_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CHANNEL_REQUEST, \
                               TpChannelRequestClass))
 
-void tp_channel_request_init_known_interfaces (void);
-
 _TP_AVAILABLE_IN_0_20
 GVariant *tp_channel_request_dup_immutable_properties (TpChannelRequest *self);
 
diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index 15e5f6b02..23f0f3921 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -1144,8 +1144,6 @@ tp_channel_class_init (TpChannelClass *klass)
   TpProxyClass *proxy_class = (TpProxyClass *) klass;
   GObjectClass *object_class = (GObjectClass *) klass;
 
-  tp_channel_init_known_interfaces ();
-
   g_type_class_add_private (klass, sizeof (TpChannelPrivate));
 
   object_class->constructor = tp_channel_constructor;
@@ -1457,41 +1455,6 @@ finally:
   return ret;
 }
 
-static gpointer
-tp_channel_once (gpointer data G_GNUC_UNUSED)
-{
-  GType type = TP_TYPE_CHANNEL;
-
-  tp_proxy_init_known_interfaces ();
-
-  tp_proxy_or_subclass_hook_on_interface_add (type,
-      tp_cli_channel_add_signals);
-  tp_proxy_subclass_add_error_mapping (type,
-      TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-  return NULL;
-}
-
-/**
- * tp_channel_init_known_interfaces:
- *
- * Ensure that the known interfaces for TpChannel have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_CHANNEL.
- *
- * Since: 0.7.6
- */
-void
-tp_channel_init_known_interfaces (void)
-{
-  static GOnce once = G_ONCE_INIT;
-
-  g_once (&once, tp_channel_once, NULL);
-}
-
 /**
  * tp_channel_get_requested:
  * @self: a #TpChannel
diff --git a/telepathy-glib/channel.h b/telepathy-glib/channel.h
index 0887ff23b..d8d6a88e2 100644
--- a/telepathy-glib/channel.h
+++ b/telepathy-glib/channel.h
@@ -77,8 +77,6 @@ GQuark tp_errors_removed_from_group_quark (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CHANNEL, \
                               TpChannelClass))
 
-void tp_channel_init_known_interfaces (void);
-
 _TP_AVAILABLE_IN_0_20
 TpConnection *tp_channel_get_connection (TpChannel *self);
 _TP_AVAILABLE_IN_0_20
diff --git a/telepathy-glib/cli-call.h b/telepathy-glib/cli-call.h
index d611564a0..aa6d2b5b6 100644
--- a/telepathy-glib/cli-call.h
+++ b/telepathy-glib/cli-call.h
@@ -23,7 +23,6 @@
 #define TELEPATHY_GLIB_CLI_CALL_H
 
 #include <telepathy-glib/call-content.h>
-#include <telepathy-glib/call-misc.h>
 #include <telepathy-glib/call-stream.h>
 
 #include <telepathy-glib/_gen/tp-cli-call-content.h>
diff --git a/telepathy-glib/client.c b/telepathy-glib/client.c
index a0f123135..483aeb775 100644
--- a/telepathy-glib/client.c
+++ b/telepathy-glib/client.c
@@ -106,36 +106,4 @@ tp_client_class_init (TpClientClass *klass)
   object_class->constructed = tp_client_constructed;
 
   proxy_class->interface = TP_IFACE_QUARK_CLIENT;
-  tp_client_init_known_interfaces ();
-}
-
-/**
- * tp_client_init_known_interfaces:
- *
- * Ensure that the known interfaces for TpClient have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_CLIENT.
- *
- * Since: 0.7.32
- */
-void
-tp_client_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType tp_type = TP_TYPE_CLIENT;
-
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (tp_type,
-          tp_cli_client_add_signals);
-      tp_proxy_subclass_add_error_mapping (tp_type,
-          TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-      g_once_init_leave (&once, 1);
-    }
 }
diff --git a/telepathy-glib/client.h b/telepathy-glib/client.h
index 893050d77..657d72d89 100644
--- a/telepathy-glib/client.h
+++ b/telepathy-glib/client.h
@@ -68,8 +68,6 @@ GType tp_client_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CLIENT, \
                               TpClientClass))
 
-void tp_client_init_known_interfaces (void);
-
 G_END_DECLS
 
 #endif
diff --git a/telepathy-glib/codegen.am b/telepathy-glib/codegen.am
index 5e2beaf80..00ccb9eb3 100644
--- a/telepathy-glib/codegen.am
+++ b/telepathy-glib/codegen.am
@@ -103,7 +103,6 @@ nodist_libtelepathy_glib_main_internal_la_SOURCES = \
     $(NULL)
 
 nodist_libtelepathy_glib_dbus_internal_la_SOURCES += \
-    _gen/register-dbus-glib-marshallers-body.h \
     _gen/tp-cli-account-body.h \
     _gen/tp-cli-account-manager-body.h \
     _gen/tp-cli-call-content-body.h \
@@ -213,10 +212,6 @@ _gen/telepathy-interfaces.h: _gen/stable-spec.xml \
 	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
 		Tp _gen/interfaces-body.h _gen/telepathy-interfaces.h $<
 
-_gen/register-dbus-glib-marshallers-body.h: _gen/stable-spec.xml \
-	$(tools_dir)/glib-client-marshaller-gen.py
-	$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-client-marshaller-gen.py $< _tp > $@
-
 _gen/genums.c: _gen/spec-stamp genums.c.template \
 		$(tpginclude_HEADERS) codegen.am
 	$(AM_V_GEN)( cd $(srcdir) && \
diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index 04613c1cc..593f84706 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -950,37 +950,6 @@ tp_connection_manager_set_property (GObject *object,
     }
 }
 
-/**
- * tp_connection_manager_init_known_interfaces:
- *
- * Ensure that the known interfaces for TpConnectionManager have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_CONNECTION_MANAGER.
- *
- * Since: 0.7.32
- */
-void
-tp_connection_manager_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType tp_type = TP_TYPE_CONNECTION_MANAGER;
-
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (tp_type,
-          tp_cli_connection_manager_add_signals);
-      tp_proxy_subclass_add_error_mapping (tp_type,
-          TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-      g_once_init_leave (&once, 1);
-    }
-}
-
 enum {
     FEAT_CORE,
     N_FEAT
@@ -1010,8 +979,6 @@ tp_connection_manager_class_init (TpConnectionManagerClass *klass)
   GObjectClass *object_class = (GObjectClass *) klass;
   GParamSpec *param_spec;
 
-  tp_connection_manager_init_known_interfaces ();
-
   g_type_class_add_private (klass, sizeof (TpConnectionManagerPrivate));
 
   object_class->constructor = tp_connection_manager_constructor;
diff --git a/telepathy-glib/connection-manager.h b/telepathy-glib/connection-manager.h
index cf042ee2f..e8a65f946 100644
--- a/telepathy-glib/connection-manager.h
+++ b/telepathy-glib/connection-manager.h
@@ -138,8 +138,6 @@ _TP_AVAILABLE_IN_0_24
 GVariantType *tp_connection_manager_param_dup_variant_type (
     const TpConnectionManagerParam *param);
 
-void tp_connection_manager_init_known_interfaces (void);
-
 #define TP_CONNECTION_MANAGER_FEATURE_CORE \
   (tp_connection_manager_get_feature_quark_core ())
 
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index 754c7ca78..8666f1d7d 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -1413,8 +1413,6 @@ tp_connection_class_init (TpConnectionClass *klass)
   TpProxyClass *proxy_class = (TpProxyClass *) klass;
   GObjectClass *object_class = (GObjectClass *) klass;
 
-  tp_connection_init_known_interfaces ();
-
   g_type_class_add_private (klass, sizeof (TpConnectionPrivate));
 
   object_class->constructed = tp_connection_constructed;
@@ -2355,41 +2353,6 @@ tp_list_connection_names (TpDBusDaemon *bus_daemon,
       list_context_free, weak_object);
 }
 
-static gpointer
-tp_connection_once (gpointer data G_GNUC_UNUSED)
-{
-  GType type = TP_TYPE_CONNECTION;
-
-  tp_proxy_init_known_interfaces ();
-
-  tp_proxy_or_subclass_hook_on_interface_add (type,
-      tp_cli_connection_add_signals);
-  tp_proxy_subclass_add_error_mapping (type,
-      TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-  return NULL;
-}
-
-/**
- * tp_connection_init_known_interfaces:
- *
- * Ensure that the known interfaces for TpConnection have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_CONNECTION.
- *
- * Since: 0.7.6
- */
-void
-tp_connection_init_known_interfaces (void)
-{
-  static GOnce once = G_ONCE_INIT;
-
-  g_once (&once, tp_connection_once, NULL);
-}
-
 static guint
 get_presence_type_availability (TpConnectionPresenceType type)
 {
diff --git a/telepathy-glib/connection.h b/telepathy-glib/connection.h
index 1959d5850..183f2d76e 100644
--- a/telepathy-glib/connection.h
+++ b/telepathy-glib/connection.h
@@ -177,8 +177,6 @@ void tp_list_connection_names (TpDBusDaemon *bus_daemon,
     gpointer user_data, GDestroyNotify destroy,
     GObject *weak_object);
 
-void tp_connection_init_known_interfaces (void);
-
 gint tp_connection_presence_type_cmp_availability (TpConnectionPresenceType p1,
   TpConnectionPresenceType p2);
 
diff --git a/telepathy-glib/core-proxy.c b/telepathy-glib/core-proxy.c
index 3b09aaf70..db38cd8cc 100644
--- a/telepathy-glib/core-proxy.c
+++ b/telepathy-glib/core-proxy.c
@@ -29,49 +29,6 @@
 #define DEBUG_FLAG TP_DEBUG_PROXY
 #include "debug-internal.h"
 
-/**
- * tp_proxy_dbus_g_proxy_claim_for_signal_adding:
- * @proxy: a #DBusGProxy
- *
- * Attempt to "claim" a #DBusGProxy for addition of signal signatures.
- * If this function has not been called on @proxy before, %TRUE is
- * returned, and the caller may safely call dbus_g_proxy_add_signal()
- * on @proxy. If this function has already been caled, %FALSE is
- * returned, and the caller may not safely call dbus_g_proxy_add_signal().
- *
- * This is intended for use by auto-generated signal-adding functions,
- * to allow interfaces provided as local extensions to override those in
- * telepathy-glib without causing assertion failures.
- *
- * Returns: %TRUE if it is safe to call dbus_g_proxy_add_signal()
- * Since: 0.7.6
- */
-gboolean
-tp_proxy_dbus_g_proxy_claim_for_signal_adding (DBusGProxy *proxy)
-{
-  static GQuark q = 0;
-
-  g_return_val_if_fail (proxy != NULL, FALSE);
-
-  if (G_UNLIKELY (q == 0))
-    {
-      q = g_quark_from_static_string (
-          "tp_proxy_dbus_g_proxy_claim_for_signal_adding@0.7.6");
-    }
-
-  if (g_object_get_qdata ((GObject *) proxy, q) != NULL)
-    {
-      /* Someone else has already added signal signatures for this interface.
-       * We can't do it again or it'll cause an assertion */
-      return FALSE;
-    }
-
-  /* the proxy is just used as qdata here because it's a convenient
-   * non-NULL pointer */
-  g_object_set_qdata ((GObject *) proxy, q, proxy);
-  return TRUE;
-}
-
 static TpProxyImplementation _tp_proxy_implementation = { NULL };
 
 DBusGProxy *
diff --git a/telepathy-glib/dbus-daemon.c b/telepathy-glib/dbus-daemon.c
index a51daba6e..8a54f7922 100644
--- a/telepathy-glib/dbus-daemon.c
+++ b/telepathy-glib/dbus-daemon.c
@@ -1371,41 +1371,12 @@ tp_dbus_daemon_finalize (GObject *object)
     chain_up (object);
 }
 
-/**
- * tp_dbus_daemon_init_known_interfaces:
- *
- * Ensure that the known interfaces for TpDBusDaemon have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_DBUS_DAEMON.
- *
- * Since: 0.7.32
- */
-void
-tp_dbus_daemon_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (TP_TYPE_DBUS_DAEMON,
-          tp_cli_dbus_daemon_add_signals);
-
-      g_once_init_leave (&once, 1);
-    }
-}
-
 static void
 tp_dbus_daemon_class_init (TpDBusDaemonClass *klass)
 {
   TpProxyClass *proxy_class = (TpProxyClass *) klass;
   GObjectClass *object_class = (GObjectClass *) klass;
 
-  tp_dbus_daemon_init_known_interfaces ();
-
   g_type_class_add_private (klass, sizeof (TpDBusDaemonPrivate));
 
   object_class->constructor = tp_dbus_daemon_constructor;
@@ -1420,6 +1391,3 @@ _tp_dbus_daemon_is_the_shared_one (TpDBusDaemon *self)
 {
   return (self != NULL && self == starter_bus_daemon);
 }
-
-/* Auto-generated implementation of _tp_register_dbus_glib_marshallers */
-#include "_gen/register-dbus-glib-marshallers-body.h"
diff --git a/telepathy-glib/dbus-daemon.h b/telepathy-glib/dbus-daemon.h
index 07aec712c..6171b4afd 100644
--- a/telepathy-glib/dbus-daemon.h
+++ b/telepathy-glib/dbus-daemon.h
@@ -57,8 +57,6 @@ TpDBusDaemon *tp_dbus_daemon_dup (GError **error) G_GNUC_WARN_UNUSED_RESULT;
 TpDBusDaemon *tp_dbus_daemon_new (DBusGConnection *connection)
   G_GNUC_WARN_UNUSED_RESULT;
 
-void tp_dbus_daemon_init_known_interfaces (void);
-
 typedef void (*TpDBusDaemonNameOwnerChangedCb) (TpDBusDaemon *bus_daemon,
     const gchar *name, const gchar *new_owner, gpointer user_data);
 
diff --git a/telepathy-glib/dbus-internal.h b/telepathy-glib/dbus-internal.h
index 728e6cd96..977ea6ad5 100644
--- a/telepathy-glib/dbus-internal.h
+++ b/telepathy-glib/dbus-internal.h
@@ -30,8 +30,6 @@ G_BEGIN_DECLS
 gboolean _tp_dbus_daemon_get_name_owner (TpDBusDaemon *self, gint timeout_ms,
     const gchar *well_known_name, gchar **unique_name, GError **error);
 
-void _tp_register_dbus_glib_marshallers (void);
-
 gboolean _tp_dbus_daemon_is_the_shared_one (TpDBusDaemon *self);
 
 G_END_DECLS
diff --git a/telepathy-glib/debug-client.c b/telepathy-glib/debug-client.c
index 986f63f2e..9dfd637da 100644
--- a/telepathy-glib/debug-client.c
+++ b/telepathy-glib/debug-client.c
@@ -229,7 +229,6 @@ tp_debug_client_class_init (TpDebugClientClass *klass)
       1, TP_TYPE_DEBUG_MESSAGE);
 
   g_type_class_add_private (klass, sizeof (TpDebugClientPrivate));
-  tp_debug_client_init_known_interfaces ();
 }
 
 GQuark
@@ -319,37 +318,6 @@ tp_debug_client_list_features (TpProxyClass *klass)
 }
 
 /**
- * tp_debug_client_init_known_interfaces:
- *
- * Ensure that the known interfaces for TpDebugClient have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_DEBUG_CLIENT.
- *
- * Since: 0.19.0
- */
-void
-tp_debug_client_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType tp_type = TP_TYPE_DEBUG_CLIENT;
-
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (tp_type,
-          tp_cli_debug_add_signals);
-      tp_proxy_subclass_add_error_mapping (tp_type,
-          TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-      g_once_init_leave (&once, 1);
-    }
-}
-
-/**
  * tp_debug_client_new:
  * @dbus: a D-Bus daemon; may not be %NULL
  * @unique_name: the unique name of the process to be debugged; may not be
diff --git a/telepathy-glib/debug-client.h b/telepathy-glib/debug-client.h
index de6825d21..40df631f0 100644
--- a/telepathy-glib/debug-client.h
+++ b/telepathy-glib/debug-client.h
@@ -84,9 +84,6 @@ GType tp_debug_client_get_type (void);
                               TpDebugClientClass))
 
 _TP_AVAILABLE_IN_0_20
-void tp_debug_client_init_known_interfaces (void);
-
-_TP_AVAILABLE_IN_0_20
 void tp_debug_client_get_messages_async (
     TpDebugClient *self,
     GAsyncReadyCallback callback,
diff --git a/telepathy-glib/logger.c b/telepathy-glib/logger.c
index 070a2148b..b53c72921 100644
--- a/telepathy-glib/logger.c
+++ b/telepathy-glib/logger.c
@@ -62,32 +62,12 @@ struct _TpLoggerPriv
 };
 
 static void
-tp_logger_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType tp_type = TP_TYPE_ACCOUNT_MANAGER;
-
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (tp_type,
-          tp_cli_logger_add_signals);
-      tp_proxy_subclass_add_error_mapping (tp_type,
-          TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-      g_once_init_leave (&once, 1);
-    }
-}
-
-static void
 tp_logger_class_init (
     TpLoggerClass *klass)
 {
   TpProxyClass *proxy_class = (TpProxyClass *) klass;
 
   proxy_class->interface = TP_IFACE_QUARK_LOGGER;
-  tp_logger_init_known_interfaces ();
 
   g_type_class_add_private (klass, sizeof (TpLoggerPriv));
 }
diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
index 8cd41cd18..222f52833 100644
--- a/telepathy-glib/protocol.c
+++ b/telepathy-glib/protocol.c
@@ -876,7 +876,6 @@ tp_protocol_class_init (TpProtocolClass *klass)
   proxy_class->list_features = tp_protocol_list_features;
   proxy_class->must_have_unique_name = FALSE;
   proxy_class->interface = TP_IFACE_QUARK_PROTOCOL;
-  tp_protocol_init_known_interfaces ();
 }
 
 static void
@@ -960,39 +959,6 @@ finally:
 }
 
 /**
- * tp_protocol_init_known_interfaces:
- *
- * Ensure that the known interfaces for TpProtocol have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_PROTOCOL.
- *
- * Since: 0.11.11
- */
-void
-tp_protocol_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType type = TP_TYPE_PROTOCOL;
-
-      tp_proxy_init_known_interfaces ();
-
-      tp_proxy_or_subclass_hook_on_interface_add (type,
-          tp_cli_protocol_add_signals);
-      tp_proxy_subclass_add_error_mapping (type,
-          TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-      g_once_init_leave (&once, 1);
-    }
-}
-
-
-/**
  * tp_protocol_get_name:
  * @self: a protocol object
  *
diff --git a/telepathy-glib/protocol.h b/telepathy-glib/protocol.h
index 32b0f2391..5fa8e75a9 100644
--- a/telepathy-glib/protocol.h
+++ b/telepathy-glib/protocol.h
@@ -65,8 +65,6 @@ struct _TpProtocol
   TpProtocolPrivate *priv;
 };
 
-void tp_protocol_init_known_interfaces (void);
-
 const gchar *tp_protocol_get_name (TpProtocol *self);
 
 _TP_AVAILABLE_IN_0_20
diff --git a/telepathy-glib/proxy-subclass.h b/telepathy-glib/proxy-subclass.h
index d931df776..1e3f0d1ab 100644
--- a/telepathy-glib/proxy-subclass.h
+++ b/telepathy-glib/proxy-subclass.h
@@ -57,12 +57,6 @@ TpProxySignalConnection *tp_proxy_signal_connection_v0_new (TpProxy *self,
 void tp_proxy_signal_connection_v0_take_results
     (TpProxySignalConnection *sc, GValueArray *args);
 
-typedef void (*TpProxyInterfaceAddedCb) (TpProxy *self,
-    guint quark, DBusGProxy *proxy, gpointer unused);
-
-void tp_proxy_or_subclass_hook_on_interface_add (GType proxy_or_subclass,
-    TpProxyInterfaceAddedCb callback);
-
 _TP_AVAILABLE_IN_0_20
 DBusGProxy *tp_proxy_get_interface_by_id (TpProxy *self, GQuark iface,
     GError **error);
@@ -72,13 +66,6 @@ void tp_proxy_add_interfaces (TpProxy *self, const gchar * const *interfaces);
 
 void tp_proxy_invalidate (TpProxy *self, const GError *error);
 
-void tp_proxy_subclass_add_error_mapping (GType proxy_subclass,
-    const gchar *static_prefix, GQuark domain, GType code_enum_type);
-
-gboolean tp_proxy_dbus_g_proxy_claim_for_signal_adding (DBusGProxy *proxy);
-
-void tp_proxy_init_known_interfaces (void);
-
 G_END_DECLS
 
 #undef _TP_GLIB_H_INSIDE
diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c
index 02c14c882..954732e90 100644
--- a/telepathy-glib/proxy.c
+++ b/telepathy-glib/proxy.c
@@ -169,18 +169,6 @@ tp_dbus_errors_quark (void)
  */
 
 /**
- * TpProxyInterfaceAddedCb:
- * @self: the proxy
- * @quark: a quark whose string value is the interface being added
- * @proxy: the #DBusGProxy for the added interface
- * @unused: unused
- *
- * The signature of a #TpProxy::interface-added signal callback.
- *
- * Since: 0.7.1
- */
-
-/**
  * TpProxyClass:
  * @parent_class: The parent class structure
  * @interface: If set non-zero by a subclass, #TpProxy will
@@ -250,13 +238,6 @@ struct _TpProxyErrorMappingLink {
     TpProxyErrorMappingLink *next;
 };
 
-typedef struct _TpProxyInterfaceAddLink TpProxyInterfaceAddLink;
-
-struct _TpProxyInterfaceAddLink {
-    TpProxyInterfaceAddedCb callback;
-    TpProxyInterfaceAddLink *next;
-};
-
 struct _TpProxyFeaturePrivate
 {
   gpointer unused;
@@ -400,7 +381,6 @@ enum
 };
 
 enum {
-    SIGNAL_INTERFACE_ADDED,
     SIGNAL_INVALIDATED,
     N_SIGNALS
 };
@@ -987,19 +967,6 @@ tp_proxy_init (TpProxy *self)
   self->priv->prepare_requests = g_queue_new ();
 }
 
-static GQuark
-interface_added_cb_quark (void)
-{
-  static GQuark q = 0;
-
-  if (G_UNLIKELY (q == 0))
-    {
-      q = g_quark_from_static_string ("TpProxyInterfaceAddedCb_0.7.1");
-    }
-
-  return q;
-}
-
 static FeatureState
 tp_proxy_get_feature_state (TpProxy *self,
     GQuark feature)
@@ -1042,12 +1009,9 @@ tp_proxy_constructor (GType type,
   TpProxy *self = TP_PROXY (object_class->constructor (type,
         n_params, params));
   TpProxyClass *klass = TP_PROXY_GET_CLASS (self);
-  TpProxyInterfaceAddLink *iter;
   GType proxy_parent_type = G_TYPE_FROM_CLASS (tp_proxy_parent_class);
   GType ancestor_type;
 
-  _tp_register_dbus_glib_marshallers ();
-
   for (ancestor_type = type;
        ancestor_type != proxy_parent_type && ancestor_type != 0;
        ancestor_type = g_type_parent (ancestor_type))
@@ -1057,13 +1021,6 @@ tp_proxy_constructor (GType type,
       guint i;
       GArray *core_features;
 
-      for (iter = g_type_get_qdata (ancestor_type,
-              interface_added_cb_quark ());
-           iter != NULL;
-           iter = iter->next)
-        g_signal_connect (self, "interface-added", G_CALLBACK (iter->callback),
-            NULL);
-
       if (ancestor == NULL || ancestor->list_features == NULL)
         continue;
 
@@ -1175,42 +1132,6 @@ tp_proxy_finalize (GObject *object)
 }
 
 /**
- * tp_proxy_or_subclass_hook_on_interface_add:
- * @proxy_or_subclass: The #GType of #TpProxy or a subclass
- * @callback: A signal handler for #TpProxy::interface-added
- *
- * Arrange for @callback to be connected to #TpProxy::interface-added
- * during the #TpProxy constructor. This is done sufficiently early that
- * it will see the signal for the default interface (@interface member of
- * #TpProxyClass), if any, being added. The intended use is for the callback
- * to call dbus_g_proxy_add_signal() on the new #DBusGProxy.
- *
- * Since 0.7.6, to ensure correct overriding of interfaces that might be
- * added to telepathy-glib, before calling this function you should
- * call tp_proxy_init_known_interfaces, tp_connection_init_known_interfaces,
- * tp_channel_init_known_interfaces etc. as appropriate for the subclass.
- *
- * Since: 0.7.1
- */
-void
-tp_proxy_or_subclass_hook_on_interface_add (GType proxy_or_subclass,
-    TpProxyInterfaceAddedCb callback)
-{
-  GQuark q = interface_added_cb_quark ();
-  TpProxyInterfaceAddLink *old_link = g_type_get_qdata (proxy_or_subclass, q);
-  TpProxyInterfaceAddLink *new_link;
-
-  g_return_if_fail (g_type_is_a (proxy_or_subclass, TP_TYPE_PROXY));
-  g_return_if_fail (callback != NULL);
-
-  /* never freed, suppressed in telepathy-glib.supp */
-  new_link = g_slice_new0 (TpProxyInterfaceAddLink);
-  new_link->callback = callback;
-  new_link->next = old_link;    /* may be NULL */
-  g_type_set_qdata (proxy_or_subclass, q, new_link);
-}
-
-/**
  * tp_proxy_subclass_add_error_mapping:
  * @proxy_subclass: The #GType of a subclass of #TpProxy (which must not be
  *  #TpProxy itself)
@@ -1271,13 +1192,15 @@ tp_proxy_subclass_add_error_mapping (GType proxy_subclass,
   g_type_set_qdata (proxy_subclass, q, new_link);
 }
 
+static void tp_proxy_once (void);
+
 static void
 tp_proxy_class_init (TpProxyClass *klass)
 {
   GParamSpec *param_spec;
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  tp_proxy_init_known_interfaces ();
+  tp_proxy_once ();
 
   g_type_class_add_private (klass, sizeof (TpProxyPrivate));
 
@@ -1360,28 +1283,6 @@ tp_proxy_class_init (TpProxyClass *klass)
       param_spec);
 
   /**
-   * TpProxy::interface-added: (skip)
-   * @self: the proxy object
-   * @id: the GQuark representing the interface
-   * @proxy: the dbus-glib proxy representing the interface
-   *
-   * Emitted when this proxy has gained an interface. It is not guaranteed
-   * to be emitted immediately, but will be emitted before the interface is
-   * first used (at the latest: before it's returned from
-   * tp_proxy_get_interface_by_id(), any signal is connected, or any
-   * method is called).
-   *
-   * The intended use is to call dbus_g_proxy_add_signals(). This signal
-   * should only be used by TpProy implementations
-   */
-  signals[SIGNAL_INTERFACE_ADDED] = g_signal_new ("interface-added",
-      G_OBJECT_CLASS_TYPE (klass),
-      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-      0,
-      NULL, NULL, NULL,
-      G_TYPE_NONE, 2, G_TYPE_UINT, DBUS_TYPE_G_PROXY);
-
-  /**
    * TpProxy::invalidated:
    * @self: the proxy object
    * @domain: domain of a GError indicating why this proxy was invalidated
@@ -1547,8 +1448,8 @@ tp_proxy_get_invalidated (gpointer self)
   return proxy->priv->invalidated;
 }
 
-static gpointer
-tp_proxy_once (gpointer data G_GNUC_UNUSED)
+static void
+tp_proxy_once (void)
 {
   TpProxyImplementation impl = {
       VERSION,
@@ -1566,33 +1467,6 @@ tp_proxy_once (gpointer data G_GNUC_UNUSED)
   };
 
   tp_private_proxy_set_implementation (&impl);
-
-  tp_proxy_or_subclass_hook_on_interface_add (impl.type,
-      tp_cli_generic_add_signals);
-
-  return NULL;
-}
-
-/**
- * tp_proxy_init_known_interfaces:
- *
- * Ensure that the known interfaces for TpProxy have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add().
- *
- * Functions like tp_connection_init_known_interfaces and
- * tp_channel_init_known_interfaces do this automatically.
- *
- * Since: 0.7.6
- */
-void
-tp_proxy_init_known_interfaces (void)
-{
-  static GOnce once = G_ONCE_INIT;
-
-  g_once (&once, tp_proxy_once, NULL);
 }
 
 static const TpProxyFeature *
diff --git a/telepathy-glib/telepathy-glib.h b/telepathy-glib/telepathy-glib.h
index 6cfc7bbd1..4d099ba55 100644
--- a/telepathy-glib/telepathy-glib.h
+++ b/telepathy-glib/telepathy-glib.h
@@ -54,7 +54,6 @@
 #include <telepathy-glib/call-channel.h>
 #include <telepathy-glib/call-content-media-description.h>
 #include <telepathy-glib/call-content.h>
-#include <telepathy-glib/call-misc.h>
 #include <telepathy-glib/call-stream-endpoint.h>
 #include <telepathy-glib/call-stream.h>
 #include <telepathy-glib/capabilities.h>
diff --git a/telepathy-glib/tls-certificate.c b/telepathy-glib/tls-certificate.c
index 093033547..6c8aee511 100644
--- a/telepathy-glib/tls-certificate.c
+++ b/telepathy-glib/tls-certificate.c
@@ -444,8 +444,6 @@ tp_tls_certificate_class_init (TpTLSCertificateClass *klass)
   GObjectClass *oclass = G_OBJECT_CLASS (klass);
   TpProxyClass *pclass = TP_PROXY_CLASS (klass);
 
-  tp_tls_certificate_init_known_interfaces ();
-
   oclass->get_property = tp_tls_certificate_get_property;
   oclass->set_property = tp_tls_certificate_set_property;
   oclass->constructed = tp_tls_certificate_constructed;
@@ -813,37 +811,6 @@ tp_tls_certificate_reject_finish (TpTLSCertificate *self,
 #include <telepathy-glib/_gen/tp-cli-tls-cert-body.h>
 
 /**
- * tp_tls_certificate_init_known_interfaces:
- *
- * Ensure that the known interfaces for TpTLSCertificate have been set up.
- * This is done automatically when necessary, but for correct
- * overriding of library interfaces by local extensions, you should
- * call this function before calling
- * tp_proxy_or_subclass_hook_on_interface_add() with first argument
- * %TP_TYPE_TLS_CERTIFICATE.
- *
- * Since: 0.19.0
- */
-void
-tp_tls_certificate_init_known_interfaces (void)
-{
-  static gsize once = 0;
-
-  if (g_once_init_enter (&once))
-    {
-      GType tp_type = TP_TYPE_TLS_CERTIFICATE;
-
-      tp_proxy_init_known_interfaces ();
-      tp_proxy_or_subclass_hook_on_interface_add (tp_type,
-          tp_cli_tls_cert_add_signals);
-      tp_proxy_subclass_add_error_mapping (tp_type,
-          TP_ERROR_PREFIX, TP_ERROR, TP_TYPE_ERROR);
-
-      g_once_init_leave (&once, 1);
-    }
-}
-
-/**
  * tp_tls_certificate_get_rejection:
  * @self: a TLS certificate
  *
diff --git a/telepathy-glib/tls-certificate.h b/telepathy-glib/tls-certificate.h
index e2158d46c..09132959d 100644
--- a/telepathy-glib/tls-certificate.h
+++ b/telepathy-glib/tls-certificate.h
@@ -112,9 +112,6 @@ gboolean tp_tls_certificate_reject_finish (TpTLSCertificate *self,
     GError **error);
 
 _TP_AVAILABLE_IN_0_20
-void tp_tls_certificate_init_known_interfaces (void);
-
-_TP_AVAILABLE_IN_0_20
 const gchar * tp_tls_certificate_get_cert_type (TpTLSCertificate *self);
 _TP_AVAILABLE_IN_0_20
 GPtrArray * tp_tls_certificate_get_cert_data (TpTLSCertificate *self);
diff --git a/telepathy-logger/call-channel.c b/telepathy-logger/call-channel.c
index aa5e52cfa..a8d65e08c 100644
--- a/telepathy-logger/call-channel.c
+++ b/telepathy-logger/call-channel.c
@@ -390,16 +390,6 @@ _tpl_call_channel_class_init (TplCallChannelClass *klass)
   proxy_class->list_features = tpl_call_channel_list_features;
 
   g_type_class_add_private (object_class, sizeof (TplCallChannelPriv));
-
-  dbus_g_object_register_marshaller (tpl_marshal_VOID__UINT_UINT_BOXED_BOXED,
-      G_TYPE_NONE,
-      G_TYPE_UINT, G_TYPE_UINT, G_TYPE_BOXED, G_TYPE_BOXED,
-      G_TYPE_INVALID);
-
-  dbus_g_object_register_marshaller (tpl_marshal_VOID__BOXED_BOXED,
-      G_TYPE_NONE,
-      G_TYPE_BOXED, G_TYPE_BOXED,
-      G_TYPE_INVALID);
 }
 
 
diff --git a/tests/suppressions/tpl.supp b/tests/suppressions/tpl.supp
index a395e82e6..284da40a6 100644
--- a/tests/suppressions/tpl.supp
+++ b/tests/suppressions/tpl.supp
@@ -266,13 +266,6 @@
 }
 
 {
-   tp_proxy_or_subclass_hook_on_interface_add never frees its list
-   Memcheck:Leak
-   ...
-   fun:tp_proxy_or_subclass_hook_on_interface_add
-}
-
-{
    tp_dbus_daemon_constructor filter not freed til we fall off the bus
    Memcheck:Leak
    ...
diff --git a/tools/telepathy-glib.supp b/tools/telepathy-glib.supp
index b36437521..81d1c513a 100644
--- a/tools/telepathy-glib.supp
+++ b/tools/telepathy-glib.supp
@@ -317,13 +317,6 @@
 }
 
 {
-   tp_proxy_or_subclass_hook_on_interface_add never frees its list
-   Memcheck:Leak
-   ...
-   fun:tp_proxy_or_subclass_hook_on_interface_add
-}
-
-{
    tp_dbus_daemon_constructor filter not freed til we fall off the bus
    Memcheck:Leak
    ...