From f106608576f419c38d3a88986874f3daeca22e5f Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 4 May 2012 13:56:28 +0100
Subject: [PATCH 7/7] Documentation: recommend including meta-headers

---
 docs/reference/telepathy-glib-sections.txt |  241 ++++++++++++++--------------
 1 file changed, 120 insertions(+), 121 deletions(-)

diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index ca2a4ec..1b099be 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -1,5 +1,5 @@
 <SECTION>
-<INCLUDE>telepathy-glib/channel-iface.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>channel-iface</FILE>
 TpChannelFunc
 <TITLE>TpChannelIface</TITLE>
@@ -15,7 +15,7 @@ TpChannelPrivate
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/defs.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>defs</FILE>
 <TITLE>defs</TITLE>
 TP_CM_BUS_NAME_BASE
@@ -148,7 +148,7 @@ TP_CHANNEL_FACTORY_IFACE_GET_CLASS
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/channel-manager.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>channel-manager</FILE>
 TpChannelManagerChannelClassFunc
 TpChannelManagerForeachChannelClassFunc
@@ -182,7 +182,7 @@ TP_CHANNEL_MANAGER_GET_INTERFACE
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/exportable-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>exportable-channel</FILE>
 TpExportableChannelFunc
 <TITLE>TpExportableChannel</TITLE>
@@ -232,7 +232,7 @@ TpBaseChannelPrivate
 
 <SECTION>
 <FILE>handle-repo</FILE>
-<INCLUDE>telepathy-glib/handle-repo.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>handle-repo</TITLE>
 TpHandleRepoIface
 TpHandleRepoIfaceClass
@@ -285,7 +285,7 @@ tp_handle_set_dump
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/handle-repo-dynamic.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>handle-repo-dynamic</FILE>
 <TITLE>TpDynamicHandleRepo</TITLE>
 TpDynamicHandleRepo
@@ -305,7 +305,7 @@ TP_DYNAMIC_HANDLE_REPO_GET_CLASS
 
 <SECTION>
 <FILE>handle-repo-static</FILE>
-<INCLUDE>telepathy-glib/handle-repo-static.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>TpStaticHandleRepo</TITLE>
 tp_static_handle_repo_new
 TpStaticHandleRepo
@@ -322,7 +322,7 @@ TP_STATIC_HANDLE_REPO_GET_CLASS
 
 <SECTION>
 <FILE>svc-generic</FILE>
-<INCLUDE>telepathy-glib/svc-generic.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-generic</TITLE>
 TpSvcDBusIntrospectable
 TpSvcDBusIntrospectableClass
@@ -373,7 +373,7 @@ TP_TYPE_SVC_DBUS_PROPERTIES
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-channel</TITLE>
 <FILE>svc-channel</FILE>
 TpSvcChannel
@@ -411,7 +411,7 @@ TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-channel-text</TITLE>
 <FILE>svc-channel-text</FILE>
 TpSvcChannelTypeText
@@ -501,7 +501,7 @@ TP_IS_SVC_CHANNEL_INTERFACE_SMS
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-channel-room</TITLE>
 <FILE>svc-channel-room</FILE>
 <SUBSECTION>
@@ -540,7 +540,7 @@ TP_IS_SVC_CHANNEL_INTERFACE_SUBJECT
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-channel-file-transfer</TITLE>
 <FILE>svc-channel-file-transfer</FILE>
 TpSvcChannelTypeFileTransfer
@@ -564,7 +564,7 @@ TP_SVC_CHANNEL_TYPE_FILE_TRANSFER_GET_CLASS
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-channel-tubes</TITLE>
 <FILE>svc-channel-tubes</FILE>
 <SUBSECTION>
@@ -617,7 +617,7 @@ TP_TYPE_SVC_CHANNEL_TYPE_TUBES
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-channel-tube</TITLE>
 <FILE>svc-channel-tube</FILE>
 TpSvcChannelInterfaceTube
@@ -664,7 +664,7 @@ TP_SVC_CHANNEL_TYPE_DBUS_TUBE_GET_CLASS
 <SECTION>
 <FILE>svc-channel-roomlist</FILE>
 <TITLE>svc-channel-roomlist</TITLE>
-<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 TpSvcChannelTypeRoomList
 TpSvcChannelTypeRoomListClass
 tp_svc_channel_type_room_list_get_listing_rooms_impl
@@ -689,7 +689,7 @@ TP_SVC_CHANNEL_TYPE_ROOM_LIST_GET_CLASS
 <SECTION>
 <FILE>svc-channel-contactlist</FILE>
 <TITLE>svc-channel-contactlist</TITLE>
-<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 TpSvcChannelTypeContactList
 TpSvcChannelTypeContactListClass
 <SUBSECTION Standard>
@@ -703,7 +703,7 @@ TP_SVC_CHANNEL_TYPE_CONTACT_LIST_GET_CLASS
 <SECTION>
 <FILE>svc-channel-group</FILE>
 <TITLE>svc-channel-group</TITLE>
-<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 TpSvcChannelInterfaceGroup
 TpSvcChannelInterfaceGroupClass
 tp_svc_channel_interface_group_add_members_impl
@@ -766,7 +766,7 @@ tp_svc_channel_interface_conference_get_type
 <SECTION>
 <FILE>svc-channel-media</FILE>
 <TITLE>svc-channel-media</TITLE>
-<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 TpSvcChannelTypeStreamedMedia
 TpSvcChannelTypeStreamedMediaClass
 tp_svc_channel_type_streamed_media_list_streams_impl
@@ -860,7 +860,7 @@ TP_SVC_CHANNEL_INTERFACE_MEDIA_SIGNALLING_GET_CLASS
 <SECTION>
 <FILE>svc-channel-call</FILE>
 <TITLE>svc-channel-call</TITLE>
-<INCLUDE>telepathy-glib/svc-call.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 TpSvcChannelTypeCall
 TpSvcChannelTypeCallClass
 tp_svc_channel_type_call_accept_impl
@@ -1111,7 +1111,7 @@ TP_TYPE_SVC_CALL_STREAM_ENDPOINT
 <SECTION>
 <FILE>svc-anonymity</FILE>
 <TITLE>svc-anonymity</TITLE>
-<INCLUDE>telepathy-glib/svc-channel.h,telepathy-glib/svc-connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 TpSvcConnectionInterfaceAnonymity
 TpSvcConnectionInterfaceAnonymityClass
 tp_svc_connection_interface_anonymity_emit_anonymity_modes_changed
@@ -1134,7 +1134,7 @@ tp_svc_connection_interface_anonymity_get_type
 <SECTION>
 <FILE>svc-service-point</FILE>
 <TITLE>svc-service-point</TITLE>
-<INCLUDE>telepathy-glib/svc-channel.h,telepathy-glib/svc-connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 TpSvcConnectionInterfaceServicePoint
 TpSvcConnectionInterfaceServicePointClass
 tp_svc_connection_interface_service_point_emit_service_points_changed
@@ -1157,7 +1157,7 @@ tp_svc_connection_interface_service_point_get_type
 
 <SECTION>
 <FILE>svc-connection</FILE>
-<INCLUDE>telepathy-glib/svc-connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-connection</TITLE>
 TpSvcConnection
 TpSvcConnectionClass
@@ -1583,7 +1583,7 @@ tp_svc_connection_interface_addressing_get_type
 
 <SECTION>
 <FILE>svc-media-interfaces</FILE>
-<INCLUDE>telepathy-glib/svc-media-interfaces.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-media-interfaces</TITLE>
 <SUBSECTION>
 TpSvcMediaSessionHandler
@@ -1674,7 +1674,7 @@ TP_SVC_MEDIA_STREAM_HANDLER_GET_CLASS
 
 <SECTION>
 <FILE>svc-connection-manager</FILE>
-<INCLUDE>telepathy-glib/svc-connection-manager.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-connection-manager</TITLE>
 TpSvcConnectionManager
 TpSvcConnectionManagerClass
@@ -1699,7 +1699,7 @@ TP_SVC_CONNECTION_MANAGER_GET_CLASS
 <SECTION>
 <FILE>util</FILE>
 <TITLE>util</TITLE>
-<INCLUDE>telepathy-glib/util.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 tp_verify
 tp_verify_true
 tp_verify_statement
@@ -1751,7 +1751,7 @@ tp_utf8_make_valid
 <SECTION>
 <FILE>gnio-util</FILE>
 <TITLE>gnio-util</TITLE>
-<INCLUDE>telepathy-glib/gnio-util.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 tp_g_socket_address_from_variant
 tp_address_variant_from_g_socket_address
 tp_unix_connection_receive_credentials_with_byte
@@ -1765,7 +1765,7 @@ tp_unix_connection_send_credentials_with_byte_finish
 <SECTION>
 <FILE>gtypes</FILE>
 <TITLE>gtypes</TITLE>
-<INCLUDE>telepathy-glib/gtypes.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <SUBSECTION>
 # Generic
 tp_dbus_specialized_value_slice_new
@@ -2105,7 +2105,7 @@ tp_type_dbus_struct_ussuas
 
 <SECTION>
 <TITLE>run</TITLE>
-<INCLUDE>telepathy-glib/run.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>run</FILE>
 tp_run_connection_manager
 </SECTION>
@@ -2188,7 +2188,7 @@ TP_PROPERTIES_MIXIN
 
 <SECTION>
 <FILE>base-room-config</FILE>
-<INCLUDE>telepathy-glib/base-room-config.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>TpBaseRoomConfig</TITLE>
 TpBaseRoomConfig
 TpBaseRoomConfigClass
@@ -2219,7 +2219,7 @@ TpBaseRoomConfigPrivate
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/contacts-mixin.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>contacts-mixin</FILE>
 
 <TITLE>TpContactsMixin</TITLE>
@@ -2248,7 +2248,7 @@ TP_CONTACTS_MIXIN
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/presence-mixin.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>presence-mixin</FILE>
 TpPresenceStatusOptionalArgumentSpec
 TpPresenceStatusSpec
@@ -2288,7 +2288,7 @@ TP_PRESENCE_MIXIN
 <SECTION>
 <FILE>debug</FILE>
 <TITLE>debug</TITLE>
-<INCLUDE>telepathy-glib/debug.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 tp_debug_set_flags
 tp_debug_set_persistent
 tp_debug_divert_messages
@@ -2301,7 +2301,7 @@ tp_debug_set_all_flags
 
 <SECTION>
 <FILE>handle</FILE>
-<INCLUDE>telepathy-glib/handle.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>handle</TITLE>
 TpHandle
 TP_TYPE_HANDLE
@@ -2312,7 +2312,7 @@ tp_handle_type_to_string
 
 <SECTION>
 <FILE>group-mixin</FILE>
-<INCLUDE>telepathy-glib/group-mixin.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>TpGroupMixin</TITLE>
 TP_HAS_GROUP_MIXIN
 TP_HAS_GROUP_MIXIN_CLASS
@@ -2367,7 +2367,7 @@ TP_GROUP_MIXIN
 
 <SECTION>
 <FILE>intset</FILE>
-<INCLUDE>telepathy-glib/intset.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>TpIntset</TITLE>
 TpIntset
 TP_TYPE_INTSET
@@ -2413,7 +2413,7 @@ TpIntSetFastIter
 <SECTION>
 <FILE>asv</FILE>
 <TITLE>asv</TITLE>
-<INCLUDE>telepathy-glib/dbus.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 tp_asv_size
 tp_asv_new
 tp_asv_get_boolean
@@ -2452,7 +2452,7 @@ tp_asv_dump
 <SECTION>
 <FILE>dbus</FILE>
 <TITLE>dbus</TITLE>
-<INCLUDE>telepathy-glib/dbus.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 tp_dbus_g_method_return_not_implemented
 tp_get_bus
 tp_get_bus_proxy
@@ -2552,7 +2552,7 @@ TpDBusDaemonPrivate
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/dbus-properties-mixin.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>dbus-properties-mixin</FILE>
 <TITLE>dbus-properties-mixin</TITLE>
 TpDBusPropertiesMixinFlags
@@ -2584,7 +2584,7 @@ tp_dbus_properties_mixin_flags_get_type
 
 <SECTION>
 <TITLE>errors</TITLE>
-<INCLUDE>telepathy-glib/errors.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>errors</FILE>
 TP_ERROR_PREFIX
 TP_ERROR
@@ -2657,7 +2657,7 @@ TP_ERRORS
 
 <SECTION>
 <TITLE>TpHeap</TITLE>
-<INCLUDE>telepathy-glib/heap.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>heap</FILE>
 TpHeap
 tp_heap_new
@@ -2672,7 +2672,7 @@ tp_heap_size
 
 <SECTION>
 <FILE>message-mixin</FILE>
-<INCLUDE>telepathy-glib/message-mixin.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>TpMessageMixin</TITLE>
 TpMessageMixin
 TpMessageMixinSendImpl
@@ -2694,7 +2694,7 @@ TpMessageMixinPrivate
 
 <SECTION>
 <FILE>message</FILE>
-<INCLUDE>telepathy-glib/message.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>TpMessage</TITLE>
 TpMessage
 tp_message_count_parts
@@ -2744,7 +2744,7 @@ tp_message_get_type
 
 <SECTION>
 <FILE>cm-message</FILE>
-<INCLUDE>telepathy-glib/cm-message.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>TpCMMessage</TITLE>
 TpCMMessage
 tp_cm_message_new
@@ -2983,7 +2983,7 @@ TpRTCPXRStatisticsFlags
 <SECTION>
 <FILE>interfaces</FILE>
 <TITLE>interfaces</TITLE>
-<INCLUDE>telepathy-glib/interfaces.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 TP_IFACE_ACCOUNT
 TP_IFACE_QUARK_ACCOUNT
 TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING
@@ -3619,7 +3619,7 @@ tp_iface_quark_channel_type_call
 <SECTION>
 <FILE>proxy</FILE>
 <TITLE>proxy</TITLE>
-<INCLUDE>telepathy-glib/proxy.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 TpProxy
 TpProxyPrepareAsync
 TpProxyFeature
@@ -3663,7 +3663,7 @@ TpProxyFeaturePrivate
 <SECTION>
 <FILE>proxy-tp-properties</FILE>
 <TITLE>proxy-tp-properties</TITLE>
-<INCLUDE>telepathy-glib/proxy.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_properties_interface_callback_for_get_properties
 tp_cli_properties_interface_call_get_properties
 tp_cli_properties_interface_run_get_properties
@@ -3682,7 +3682,7 @@ tp_cli_properties_interface_connect_to_property_flags_changed
 <SECTION>
 <FILE>proxy-dbus-core</FILE>
 <TITLE>proxy-dbus-core</TITLE>
-<INCLUDE>telepathy-glib/proxy.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <SUBSECTION>
 tp_cli_dbus_introspectable_call_introspect
 tp_cli_dbus_introspectable_callback_for_introspect
@@ -3827,7 +3827,7 @@ tp_cli_channel_interface_destroyable_run_destroy
 <SECTION>
 <FILE>channel-group</FILE>
 <TITLE>channel-group</TITLE>
-<INCLUDE>telepathy-glib/channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_channel_interface_group_run_add_members
 tp_cli_channel_interface_group_run_get_all_members
 tp_cli_channel_interface_group_run_get_group_flags
@@ -3888,7 +3888,7 @@ tp_cli_channel_interface_conference_signal_callback_channel_removed
 <SECTION>
 <FILE>channel-text</FILE>
 <TITLE>channel-text</TITLE>
-<INCLUDE>telepathy-glib/channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_channel_type_text_run_acknowledge_pending_messages
 tp_cli_channel_type_text_run_get_message_types
 tp_cli_channel_type_text_run_list_pending_messages
@@ -3948,7 +3948,7 @@ tp_cli_channel_interface_sms_run_get_sms_length
 <SECTION>
 <FILE>channel-room</FILE>
 <TITLE>channel-room</TITLE>
-<INCLUDE>telepathy-glib/channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <SUBSECTION>
 tp_cli_channel_interface_room_config_call_update_configuration
 tp_cli_channel_interface_room_config_callback_for_update_configuration
@@ -3960,7 +3960,7 @@ tp_cli_channel_interface_subject_callback_for_set_subject
 <SECTION>
 <FILE>channel-file-transfer</FILE>
 <TITLE>channel-file-transfer</TITLE>
-<INCLUDE>telepathy-glib/channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_channel_type_file_transfer_call_accept_file
 tp_cli_channel_type_file_transfer_call_provide_file
 tp_cli_channel_type_file_transfer_callback_for_accept_file
@@ -3980,7 +3980,7 @@ tp_cli_channel_type_file_transfer_signal_callback_uri_defined
 <SECTION>
 <FILE>channel-media</FILE>
 <TITLE>channel-media</TITLE>
-<INCLUDE>telepathy-glib/channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_channel_type_streamed_media_call_list_streams
 tp_cli_channel_type_streamed_media_call_remove_streams
 tp_cli_channel_type_streamed_media_call_request_stream_direction
@@ -4046,7 +4046,7 @@ tp_cli_channel_interface_dtmf_run_multiple_tones
 <SECTION>
 <FILE>channel-tubes</FILE>
 <TITLE>channel-tubes</TITLE>
-<INCLUDE>telepathy-glib/channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_channel_type_tubes_run_accept_d_bus_tube
 tp_cli_channel_type_tubes_run_accept_stream_tube
 tp_cli_channel_type_tubes_run_close_tube
@@ -4095,7 +4095,7 @@ tp_cli_channel_type_tubes_signal_callback_tube_state_changed
 <SECTION>
 <FILE>channel-tube</FILE>
 <TITLE>channel-tube</TITLE>
-<INCLUDE>telepathy-glib/channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_channel_interface_tube_connect_to_tube_channel_state_changed
 tp_cli_channel_interface_tube_signal_callback_tube_channel_state_changed
 tp_cli_channel_type_stream_tube_run_offer
@@ -4123,7 +4123,7 @@ tp_cli_channel_type_dbus_tube_signal_callback_dbus_names_changed
 <SECTION>
 <FILE>channel-roomlist</FILE>
 <TITLE>channel-roomlist</TITLE>
-<INCLUDE>telepathy-glib/channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_channel_type_room_list_call_get_listing_rooms
 tp_cli_channel_type_room_list_call_list_rooms
 tp_cli_channel_type_room_list_call_stop_listing
@@ -4142,7 +4142,7 @@ tp_cli_channel_type_room_list_signal_callback_listing_rooms
 <SECTION>
 <FILE>cli-anonymity</FILE>
 <TITLE>cli-anonymity</TITLE>
-<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_anonymity_connect_to_anonymity_modes_changed
 tp_cli_connection_interface_anonymity_signal_callback_anonymity_modes_changed
 </SECTION>
@@ -4150,7 +4150,7 @@ tp_cli_connection_interface_anonymity_signal_callback_anonymity_modes_changed
 <SECTION>
 <FILE>cli-service-point</FILE>
 <TITLE>cli-service-point</TITLE>
-<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_channel_interface_service_point_connect_to_service_point_changed
 tp_cli_channel_interface_service_point_signal_callback_service_point_changed
 tp_cli_connection_interface_service_point_connect_to_service_points_changed
@@ -4362,7 +4362,7 @@ tp_cli_connection_run_remove_client_interest
 <SECTION>
 <FILE>connection-aliasing</FILE>
 <TITLE>connection-aliasing</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_aliasing_run_get_alias_flags
 tp_cli_connection_interface_aliasing_run_request_aliases
 tp_cli_connection_interface_aliasing_run_get_aliases
@@ -4382,7 +4382,7 @@ tp_cli_connection_interface_aliasing_signal_callback_aliases_changed
 <SECTION>
 <FILE>connection-avatars</FILE>
 <TITLE>connection-avatars</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_avatars_run_clear_avatar
 tp_cli_connection_interface_avatars_run_get_avatar_requirements
 tp_cli_connection_interface_avatars_run_get_avatar_tokens
@@ -4413,7 +4413,7 @@ tp_cli_connection_interface_avatars_signal_callback_avatar_updated
 <SECTION>
 <FILE>connection-balance</FILE>
 <TITLE>connection-balance</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_balance_connect_to_balance_changed
 tp_cli_connection_interface_balance_signal_callback_balance_changed
 </SECTION>
@@ -4421,7 +4421,7 @@ tp_cli_connection_interface_balance_signal_callback_balance_changed
 <SECTION>
 <FILE>connection-caps</FILE>
 <TITLE>connection-caps</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_contact_capabilities_callback_for_get_contact_capabilities
 tp_cli_connection_interface_contact_capabilities_call_get_contact_capabilities
 tp_cli_connection_interface_contact_capabilities_callback_for_update_capabilities
@@ -4445,7 +4445,7 @@ tp_cli_connection_interface_capabilities_signal_callback_capabilities_changed
 <SECTION>
 <FILE>connection-contact-list</FILE>
 <TITLE>connection-contact-list</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_contact_blocking_call_block_contacts
 tp_cli_connection_interface_contact_blocking_call_request_blocked_contacts
 tp_cli_connection_interface_contact_blocking_call_unblock_contacts
@@ -4518,7 +4518,7 @@ tp_cli_connection_interface_contact_groups_run_set_group_members
 <SECTION>
 <FILE>connection-cellular</FILE>
 <TITLE>connection-cellular</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_cellular_connect_to_imsi_changed
 tp_cli_connection_interface_cellular_signal_callback_imsi_changed
 </SECTION>
@@ -4526,7 +4526,7 @@ tp_cli_connection_interface_cellular_signal_callback_imsi_changed
 <SECTION>
 <FILE>connection-contacts</FILE>
 <TITLE>connection-contacts</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_contacts_call_get_contact_attributes
 tp_cli_connection_interface_contacts_callback_for_get_contact_attributes
 tp_cli_connection_interface_contacts_run_get_contact_attributes
@@ -4535,7 +4535,7 @@ tp_cli_connection_interface_contacts_run_get_contact_attributes
 <SECTION>
 <FILE>connection-contact-info</FILE>
 <TITLE>connection-contact-info</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_contact_info_call_get_contact_info
 tp_cli_connection_interface_contact_info_call_refresh_contact_info
 tp_cli_connection_interface_contact_info_call_request_contact_info
@@ -4555,7 +4555,7 @@ tp_cli_connection_interface_contact_info_signal_callback_contact_info_changed
 <SECTION>
 <FILE>connection-requests</FILE>
 <TITLE>connection-requests</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_requests_call_create_channel
 tp_cli_connection_interface_requests_call_ensure_channel
 tp_cli_connection_interface_requests_callback_for_create_channel
@@ -4571,7 +4571,7 @@ tp_cli_connection_interface_requests_signal_callback_new_channels
 <SECTION>
 <FILE>connection-simple-presence</FILE>
 <TITLE>connection-simple-presence</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_simple_presence_run_get_presences
 tp_cli_connection_interface_simple_presence_run_set_presence
 tp_cli_connection_interface_simple_presence_call_get_presences
@@ -4585,7 +4585,7 @@ tp_cli_connection_interface_simple_presence_signal_callback_presences_changed
 <SECTION>
 <FILE>connection-location</FILE>
 <TITLE>connection-location</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_location_connect_to_location_updated
 tp_cli_connection_interface_location_signal_callback_location_updated
 tp_cli_connection_interface_location_call_get_locations
@@ -4604,7 +4604,7 @@ tp_cli_connection_interface_location_run_set_location
 <SECTION>
 <FILE>connection-presence</FILE>
 <TITLE>connection-presence</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_presence_run_add_status
 tp_cli_connection_interface_presence_run_clear_status
 tp_cli_connection_interface_presence_run_get_presence
@@ -4636,7 +4636,7 @@ tp_cli_connection_interface_presence_signal_callback_presence_update
 <SECTION>
 <FILE>connection-powersaving</FILE>
 <TITLE>connection-powersaving</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_power_saving_call_set_power_saving
 tp_cli_connection_interface_power_saving_callback_for_set_power_saving
 tp_cli_connection_interface_power_saving_connect_to_power_saving_changed
@@ -4648,7 +4648,7 @@ tp_cli_connection_interface_power_saving_run_set_power_saving
 <SECTION>
 <FILE>connection-client-types</FILE>
 <TITLE>connection-client-types</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_client_types_call_get_client_types
 tp_cli_connection_interface_client_types_call_request_client_types
 tp_cli_connection_interface_client_types_callback_for_get_client_types
@@ -4663,7 +4663,7 @@ tp_cli_connection_interface_client_types_run_request_client_types
 <SECTION>
 <FILE>connection-mail</FILE>
 <TITLE>connection-mail</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_mail_notification_call_request_inbox_url
 tp_cli_connection_interface_mail_notification_call_request_mail_url
 tp_cli_connection_interface_mail_notification_callback_for_request_inbox_url
@@ -4680,7 +4680,7 @@ tp_cli_connection_interface_mail_notification_run_request_mail_url
 <SECTION>
 <FILE>connection-addressing</FILE>
 <TITLE>connection-addressing</TITLE>
-<INCLUDE>telepathy-glib/connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_connection_interface_addressing_call_get_contacts_by_uri
 tp_cli_connection_interface_addressing_call_get_contacts_by_vcard_field
 tp_cli_connection_interface_addressing_callback_for_get_contacts_by_uri
@@ -4690,7 +4690,7 @@ tp_cli_connection_interface_addressing_callback_for_get_contacts_by_vcard_field
 <SECTION>
 <FILE>connection-manager</FILE>
 <TITLE>connection-manager</TITLE>
-<INCLUDE>telepathy-glib/connection-manager.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 TpConnectionManagerListCb
 tp_list_connection_managers_async
 tp_list_connection_managers_finish
@@ -4812,7 +4812,7 @@ TpContactSearchResultPrivate
 <SECTION>
 <FILE>media-interfaces</FILE>
 <TITLE>media-interfaces</TITLE>
-<INCLUDE>telepathy-glib/media-interfaces.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <SUBSECTION Standard>
 TP_IS_MEDIA_SESSION_HANDLER
 TP_IS_MEDIA_SESSION_HANDLER_CLASS
@@ -5003,7 +5003,7 @@ TpContactPrivate
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/capabilities.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>capabilities</FILE>
 <TITLE>capabilities</TITLE>
 TpCapabilities
@@ -5038,7 +5038,7 @@ TpCapabilitiesPrivate
 
 <SECTION>
 <FILE>svc-account</FILE>
-<INCLUDE>telepathy-glib/svc-account.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-account</TITLE>
 TpSvcAccount
 TpSvcAccountClass
@@ -5094,7 +5094,7 @@ tp_svc_account_interface_addressing_get_type
 
 <SECTION>
 <FILE>svc-account-manager</FILE>
-<INCLUDE>telepathy-glib/svc-account-manager.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-account-manager</TITLE>
 TpSvcAccountManager
 TpSvcAccountManagerClass
@@ -5113,7 +5113,7 @@ TP_SVC_ACCOUNT_MANAGER_GET_CLASS
 
 <SECTION>
 <FILE>account</FILE>
-<INCLUDE>telepathy-glib/account.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>account</TITLE>
 TpAccount
 TpAccountClass
@@ -5231,7 +5231,7 @@ TpAccountClassPrivate
 
 <SECTION>
 <FILE>account-manager</FILE>
-<INCLUDE>telepathy-glib/account-manager.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>account-manager</TITLE>
 TpAccountManager
 TpAccountManagerClass
@@ -5275,7 +5275,7 @@ TpAccountManagerClassPrivate
 
 <SECTION>
 <FILE>channel-dispatcher</FILE>
-<INCLUDE>telepathy-glib/channel-dispatcher.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>channel-dispatcher</TITLE>
 TpChannelDispatcher
 TpChannelDispatcherClass
@@ -5313,7 +5313,7 @@ TpChannelDispatcherClassPrivate
 
 <SECTION>
 <FILE>svc-channel-dispatcher</FILE>
-<INCLUDE>telepathy-glib/svc-channel-dispatcher.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-channel-dispatcher</TITLE>
 TpSvcChannelDispatcher
 TpSvcChannelDispatcherClass
@@ -5355,7 +5355,7 @@ TP_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST_GET_CLASS
 
 <SECTION>
 <FILE>channel-dispatch-operation</FILE>
-<INCLUDE>telepathy-glib/channel-dispatch-operation.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>channel-dispatch-operation</TITLE>
 TpChannelDispatchOperation
 TpChannelDispatchOperationClass
@@ -5406,7 +5406,7 @@ tp_channel_dispatch_operation_get_feature_quark_core
 
 <SECTION>
 <FILE>channel-request</FILE>
-<INCLUDE>telepathy-glib/channel-request.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>channel-request</TITLE>
 TpChannelRequest
 TpChannelRequestClass
@@ -5443,7 +5443,7 @@ tp_channel_request_get_type
 
 <SECTION>
 <FILE>svc-channel-dispatch-operation</FILE>
-<INCLUDE>telepathy-glib/svc-channel-dispatch-operation.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-channel-dispatch-operation</TITLE>
 TpSvcChannelDispatchOperation
 TpSvcChannelDispatchOperationClass
@@ -5468,7 +5468,7 @@ TP_TYPE_SVC_CHANNEL_DISPATCH_OPERATION
 
 <SECTION>
 <FILE>svc-channel-request</FILE>
-<INCLUDE>telepathy-glib/svc-channel-request.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-channel-request</TITLE>
 TpSvcChannelRequest
 TpSvcChannelRequestClass
@@ -5491,7 +5491,7 @@ TP_TYPE_SVC_CHANNEL_REQUEST
 
 <SECTION>
 <FILE>client</FILE>
-<INCLUDE>telepathy-glib/client.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>client</TITLE>
 TpClient
 TpClientClass
@@ -5523,7 +5523,7 @@ TpClientPrivate
 
 <SECTION>
 <FILE>svc-client</FILE>
-<INCLUDE>telepathy-glib/svc-client.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-client</TITLE>
 TpSvcClient
 TpSvcClientClass
@@ -5582,7 +5582,7 @@ TP_TYPE_SVC_CLIENT_OBSERVER
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/svc-debug.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <TITLE>svc-debug</TITLE>
 <FILE>svc-debug</FILE>
 TpSvcDebug
@@ -5600,8 +5600,7 @@ tp_svc_debug_get_type
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/debug-sender.h</INCLUDE>
-<INCLUDE>telepathy-glib/debug-sender.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>debug-sender</FILE>
 <TITLE>debug-sender</TITLE>
 TpDebugSender
@@ -5688,7 +5687,7 @@ TpBaseClientClassPrivate
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/observe-channels-context.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>observe-channels-context</FILE>
 <TITLE>observe-channels-context</TITLE>
 TpObserveChannelsContext
@@ -5709,7 +5708,7 @@ TpObserveChannelsContextPrivate
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/simple-observer.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>simple-observer</FILE>
 <TITLE>simple-observer</TITLE>
 TpSimpleObserver
@@ -5730,7 +5729,7 @@ TpSimpleObserverPrivate
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/add-dispatch-operation-context.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>add-dispatch-operation-context</FILE>
 <TITLE>add-dispatch-operation-context</TITLE>
 TpAddDispatchOperationContext
@@ -5750,7 +5749,7 @@ TP_TYPE_ADD_DISPATCH_OPERATION_CONTEXT
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/simple-approver.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>simple-approver</FILE>
 <TITLE>simple-approver</TITLE>
 TpSimpleApprover
@@ -5771,7 +5770,7 @@ TpSimpleApproverPrivate
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/handle-channels-context.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>handle-channels-context</FILE>
 <TITLE>handle-channels-context</TITLE>
 TpHandleChannelsContext
@@ -5793,7 +5792,7 @@ TP_TYPE_HANDLE_CHANNELS_CONTEXT
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/simple-handler.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>simple-handler</FILE>
 <TITLE>simple-handler</TITLE>
 TpSimpleHandler
@@ -5814,7 +5813,7 @@ TpSimpleHandlerPrivate
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/simple-password-manager.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>simple-password-manager</FILE>
 <TITLE>simple-password-manager</TITLE>
 TpSimplePasswordManager
@@ -5838,7 +5837,7 @@ TpSimplePasswordManagerPrivate
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/base-password-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>base-password-channel</FILE>
 <TITLE>base-password-channel</TITLE>
 TpBasePasswordChannel
@@ -5898,7 +5897,7 @@ TpBaseProtocolClassPrivate
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/svc-protocol.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <FILE>svc-protocol</FILE>
 <TITLE>svc-protocol</TITLE>
 TpSvcProtocol
@@ -5952,7 +5951,7 @@ TP_TYPE_SVC_PROTOCOL_INTERFACE_AVATARS
 </SECTION>
 
 <SECTION>
-<INCLUDE>telepathy-glib/protocol.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <FILE>protocol</FILE>
 <TITLE>protocol</TITLE>
 TpProtocol
@@ -6004,7 +6003,7 @@ TpProtocolClassPrivate
 <SECTION>
 <FILE>channel-contactsearch</FILE>
 <TITLE>channel-contactsearch</TITLE>
-<INCLUDE>telepathy-glib/channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_channel_type_contact_search_call_more
 tp_cli_channel_type_contact_search_call_search
 tp_cli_channel_type_contact_search_call_stop
@@ -6023,7 +6022,7 @@ tp_cli_channel_type_contact_search_signal_callback_search_state_changed
 <SECTION>
 <FILE>svc-channel-contactsearch</FILE>
 <TITLE>svc-channel-contactsearch</TITLE>
-<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 TpSvcChannelTypeContactSearch
 TpSvcChannelTypeContactSearchClass
 tp_svc_channel_type_contact_search_emit_search_result_received
@@ -6048,7 +6047,7 @@ tp_svc_channel_type_contact_search_get_type
 <SECTION>
 <FILE>account-channel-request</FILE>
 <TITLE>account-channel-request</TITLE>
-<INCLUDE>telepathy-glib/account-channel-request.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 TpAccountChannelRequest
 tp_account_channel_request_new
 tp_account_channel_request_get_request
@@ -6096,7 +6095,7 @@ TP_TYPE_ACCOUNT_CHANNEL_REQUEST
 <SECTION>
 <FILE>svc-tls</FILE>
 <TITLE>svc-tls</TITLE>
-<INCLUDE>telepathy-glib/svc-channel.h,telepathy-glib/svc-tls.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <SUBSECTION>
 TpSvcChannelTypeServerTLSConnection
 TpSvcChannelTypeServerTLSConnectionClass
@@ -6253,7 +6252,7 @@ tp_mutable_contact_group_list_get_type
 <SECTION>
 <FILE>stream-tube-channel</FILE>
 <TITLE>stream-tube-channel</TITLE>
-<INCLUDE>telepathy-glib/stream-tube-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <SUBSECTION>
 TpStreamTubeChannel
 TpStreamTubeChannelClass
@@ -6278,7 +6277,7 @@ TpStreamTubeChannelPrivate
 <SECTION>
 <FILE>stream-tube-connection</FILE>
 <TITLE>stream-tube-connection</TITLE>
-<INCLUDE>telepathy-glib/stream-tube-connection.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <SUBSECTION>
 TpStreamTubeConnection
 TpStreamTubeConnectionClass
@@ -6299,7 +6298,7 @@ TpStreamTubeConnectionPrivate
 <SECTION>
 <FILE>dbus-tube-channel</FILE>
 <TITLE>dbus-tube-channel</TITLE>
-<INCLUDE>telepathy-glib/dbus-tube-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <SUBSECTION>
 TpDBusTubeChannel
 TpDBusTubeChannelClass
@@ -6325,7 +6324,7 @@ tp_dbus_tube_channel_feature_quark_core
 <SECTION>
 <FILE>client-channel-factory</FILE>
 <TITLE>client-channel-factory</TITLE>
-<INCLUDE>telepathy-glib/client-channel-factory.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 TpClientChannelFactory
 TpClientChannelFactoryInterface
 tp_client_channel_factory_create_channel
@@ -6341,7 +6340,7 @@ tp_client_channel_factory_get_type
 <SECTION>
 <FILE>basic-proxy-factory</FILE>
 <TITLE>basic-proxy-factory</TITLE>
-<INCLUDE>telepathy-glib/basic-proxy-factory.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 TpBasicProxyFactory
 TpBasicProxyFactoryClass
 tp_basic_proxy_factory_new
@@ -6359,7 +6358,7 @@ tp_basic_proxy_factory_get_type
 <SECTION>
 <FILE>automatic-proxy-factory</FILE>
 <TITLE>automatic-proxy-factory</TITLE>
-<INCLUDE>telepathy-glib/automatic-proxy-factory.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 TpAutomaticProxyFactory
 TpAutomaticProxyFactoryClass
 tp_automatic_proxy_factory_new
@@ -6398,7 +6397,7 @@ tp_dtmf_player_get_type
 <SECTION>
 <FILE>svc-channel-securable</FILE>
 <TITLE>svc-channel-securable</TITLE>
-<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 TpSvcChannelInterfaceSecurable
 TpSvcChannelInterfaceSecurableClass
 <SUBSECTION Standard>
@@ -6412,7 +6411,7 @@ TP_SVC_CHANNEL_INTERFACE_SECURABLE_GET_CLASS
 <SECTION>
 <FILE>svc-channel-auth</FILE>
 <TITLE>svc-channel-auth</TITLE>
-<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 TpSvcChannelTypeServerAuthentication
 TpSvcChannelTypeServerAuthenticationClass
 <SUBSECTION>
@@ -6473,7 +6472,7 @@ tp_svc_channel_interface_captcha_authentication_return_from_get_captchas
 <SECTION>
 <FILE>channel-auth</FILE>
 <TITLE>channel-auth</TITLE>
-<INCLUDE>telepathy-glib/channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_channel_interface_sasl_authentication_call_abort_sasl
 tp_cli_channel_interface_sasl_authentication_call_accept_sasl
 tp_cli_channel_interface_sasl_authentication_call_respond
@@ -6507,7 +6506,7 @@ tp_cli_channel_interface_captcha_authentication_callback_for_get_captchas
 
 <SECTION>
 <FILE>client-message</FILE>
-<INCLUDE>telepathy-glib/client-message.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>TpClientMessage</TITLE>
 TpClientMessage
 tp_client_message_new
@@ -6524,7 +6523,7 @@ tp_client_message_get_type
 
 <SECTION>
 <FILE>signalled-message</FILE>
-<INCLUDE>telepathy-glib/signalled-message.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE>
 <TITLE>TpSignalledMessage</TITLE>
 TpSignalledMessage
 tp_signalled_message_get_sender
@@ -6621,7 +6620,7 @@ tp_file_transfer_channel_get_feature_quark_core
 <SECTION>
 <FILE>cli-call-channel</FILE>
 <TITLE>cli-call-channel</TITLE>
-<INCLUDE>telepathy-glib/channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <SUBSECTION>
 tp_cli_channel_type_call_call_accept
 tp_cli_channel_type_call_call_add_content
@@ -6696,7 +6695,7 @@ tp_call_channel_get_feature_quark_core
 <SECTION>
 <FILE>cli-call-content</FILE>
 <TITLE>cli-call-content</TITLE>
-<INCLUDE>telepathy-glib/call-content.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <SUBSECTION>
 tp_cli_call_content_call_remove
 tp_cli_call_content_callback_for_remove
@@ -6789,7 +6788,7 @@ tp_call_content_get_feature_quark_core
 <SECTION>
 <FILE>cli-call-stream</FILE>
 <TITLE>cli-call-stream</TITLE>
-<INCLUDE>telepathy-glib/call-stream.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 <SUBSECTION>
 tp_cli_call_stream_call_request_receiving
 tp_cli_call_stream_call_set_sending
@@ -6869,7 +6868,7 @@ tp_call_stream_get_feature_quark_core
 <SECTION>
 <FILE>cli-call-misc</FILE>
 <TITLE>cli-call-misc</TITLE>
-<INCLUDE>telepathy-glib/call-misc.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 tp_cli_call_content_media_description_call_accept
 tp_cli_call_content_media_description_call_reject
 tp_cli_call_content_media_description_callback_for_accept
@@ -6965,7 +6964,7 @@ tp_automatic_client_factory_get_type
 <SECTION>
 <FILE>svc-channel-ft-metadata</FILE>
 <TITLE>svc-channel-ft-metadata</TITLE>
-<INCLUDE>telepathy-glib/svc-channel.h</INCLUDE>
+<INCLUDE>telepathy-glib/telepathy-glib-dbus.h</INCLUDE>
 TpSvcChannelInterfaceFileTransferMetadata
 TpSvcChannelInterfaceFileTransferMetadataClass
 <SUBSECTION Standard>
-- 
1.7.10