Version-annotate recent API

51 files changed, 411 insertions, 9 deletions

diff --git a/telepathy-glib/account-channel-request.h b/telepathy-glib/account-channel-request.h
index 451f6b34d..fd136ae00 100644
--- a/telepathy-glib/account-channel-request.h
+++ b/telepathy-glib/account-channel-request.h
@@ -85,27 +85,32 @@ TpChannelRequest * tp_account_channel_request_get_channel_request (
 void tp_account_channel_request_set_hints (TpAccountChannelRequest *self,
     GHashTable *hints);
 
+_TP_AVAILABLE_IN_0_16
 void tp_account_channel_request_set_delegate_to_preferred_handler (
     TpAccountChannelRequest *self,
     gboolean delegate);
 
 /* Text */
 
+_TP_AVAILABLE_IN_0_20
 TpAccountChannelRequest *tp_account_channel_request_new_text (
     TpAccount *account,
     gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;
 
 /* Calls */
 
+_TP_AVAILABLE_IN_0_20
 TpAccountChannelRequest *tp_account_channel_request_new_audio_call (
     TpAccount *account,
     gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;
+_TP_AVAILABLE_IN_0_20
 TpAccountChannelRequest *tp_account_channel_request_new_audio_video_call (
     TpAccount *account,
     gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;
 
 /* File transfer */
 
+_TP_AVAILABLE_IN_0_20
 TpAccountChannelRequest *tp_account_channel_request_new_file_transfer (
     TpAccount *account,
     const gchar *filename,
@@ -113,30 +118,37 @@ TpAccountChannelRequest *tp_account_channel_request_new_file_transfer (
     guint64 size,
     gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;
 
+_TP_AVAILABLE_IN_0_20
 void tp_account_channel_request_set_file_transfer_description (
     TpAccountChannelRequest *self,
     const gchar *description);
+_TP_AVAILABLE_IN_0_20
 void tp_account_channel_request_set_file_transfer_uri (
     TpAccountChannelRequest *self,
     const gchar *uri);
+_TP_AVAILABLE_IN_0_20
 void tp_account_channel_request_set_file_transfer_timestamp (
     TpAccountChannelRequest *self,
     guint64 timestamp);
+_TP_AVAILABLE_IN_0_20
 void tp_account_channel_request_set_file_transfer_initial_offset (
     TpAccountChannelRequest *self,
     guint64 offset);
 
 /* Channel target (shared between all channel types) */
 
+_TP_AVAILABLE_IN_0_20
 void tp_account_channel_request_set_target_contact (
     TpAccountChannelRequest *self,
     TpContact *contact);
+_TP_AVAILABLE_IN_0_20
 void tp_account_channel_request_set_target_id (TpAccountChannelRequest *self,
     TpHandleType handle_type,
     const gchar *identifier);
 
 /* Generic low-level */
 
+_TP_AVAILABLE_IN_0_20
 void tp_account_channel_request_set_request_property (
     TpAccountChannelRequest *self,
     const gchar *name,
@@ -173,6 +185,7 @@ typedef void (*TpAccountChannelRequestDelegatedChannelCb) (
     TpChannel *channel,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_16
 void tp_account_channel_request_set_delegated_channel_callback (
     TpAccountChannelRequest *self,
     TpAccountChannelRequestDelegatedChannelCb callback,
diff --git a/telepathy-glib/account-manager.h b/telepathy-glib/account-manager.h
index eead17ce0..d5692978e 100644
--- a/telepathy-glib/account-manager.h
+++ b/telepathy-glib/account-manager.h
@@ -76,6 +76,7 @@ TpAccountManager *tp_account_manager_new (TpDBusDaemon *bus_daemon)
 TpAccountManager *tp_account_manager_new_with_factory (
     TpSimpleClientFactory *factory) G_GNUC_WARN_UNUSED_RESULT;
 
+_TP_AVAILABLE_IN_0_16
 void tp_account_manager_set_default (TpAccountManager *manager);
 TpAccountManager *tp_account_manager_dup (void) G_GNUC_WARN_UNUSED_RESULT;
 
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 4664e4c8d..256fc1a8b 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -4008,7 +4008,7 @@ tp_account_get_storage_specific_information_finish (TpAccount *self,
  * Returns: (transfer full): a map from strings to variants,
  *  of type %G_VARIANT_TYPE_VARDICT
  *
- * Since: 0.13.2
+ * Since: 0.17.6
  */
 GVariant *
 tp_account_dup_storage_specific_information_vardict_finish (TpAccount *self,
diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h
index 10a2b6f92..ff787b3dd 100644
--- a/telepathy-glib/account.h
+++ b/telepathy-glib/account.h
@@ -77,6 +77,7 @@ GType tp_account_get_type (void);
   tp_account_get_feature_quark_addressing ()
 
 GQuark tp_account_get_feature_quark_core (void) G_GNUC_CONST;
+_TP_AVAILABLE_IN_0_16
 GQuark tp_account_get_feature_quark_connection (void) G_GNUC_CONST;
 GQuark tp_account_get_feature_quark_storage (void) G_GNUC_CONST;
 GQuark tp_account_get_feature_quark_addressing (void) G_GNUC_CONST;
@@ -127,9 +128,11 @@ void tp_account_update_parameters_async (TpAccount *account,
     GAsyncReadyCallback callback, gpointer user_data);
 gboolean tp_account_update_parameters_finish (TpAccount *account,
     GAsyncResult *result, gchar ***reconnect_required, GError **error);
+_TP_AVAILABLE_IN_0_18
 void tp_account_update_parameters_vardict_async (TpAccount *account,
     GVariant *parameters, const gchar **unset_parameters,
     GAsyncReadyCallback callback, gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_account_update_parameters_vardict_finish (TpAccount *account,
     GAsyncResult *result, gchar ***reconnect_required, GError **error);
 
@@ -190,6 +193,7 @@ TpConnectionStatus tp_account_get_connection_status (TpAccount *account,
 
 const gchar *tp_account_get_detailed_error (TpAccount *self,
     const GHashTable **details);
+_TP_AVAILABLE_IN_0_18
 gchar *tp_account_dup_detailed_error_vardict (TpAccount *self,
     GVariant **details);
 
@@ -203,6 +207,7 @@ TpConnectionPresenceType tp_account_get_automatic_presence (
     TpAccount *self, gchar **status, gchar **status_message);
 
 const GHashTable *tp_account_get_parameters (TpAccount *account);
+_TP_AVAILABLE_IN_0_18
 GVariant *tp_account_dup_parameters_vardict (TpAccount *account);
 
 const gchar *tp_account_get_nickname (TpAccount *account);
@@ -213,6 +218,7 @@ void tp_account_set_nickname_async (TpAccount *account,
 gboolean tp_account_set_nickname_finish (TpAccount *account,
     GAsyncResult *result, GError **error);
 
+_TP_AVAILABLE_IN_0_18
 const gchar * const *
 /* ugh, gtk-doc */
 tp_account_get_supersedes (TpAccount *self);
@@ -259,10 +265,12 @@ void tp_account_get_storage_specific_information_async (TpAccount *self,
     GAsyncReadyCallback callback, gpointer user_data);
 GHashTable *tp_account_get_storage_specific_information_finish (TpAccount *self,
     GAsyncResult *result, GError **error);
+_TP_AVAILABLE_IN_0_18
 void tp_account_dup_storage_specific_information_vardict_async (
     TpAccount *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 GVariant *tp_account_dup_storage_specific_information_vardict_finish (
     TpAccount *self,
     GAsyncResult *result,
diff --git a/telepathy-glib/automatic-client-factory.h b/telepathy-glib/automatic-client-factory.h
index 2f7c88083..02707727b 100644
--- a/telepathy-glib/automatic-client-factory.h
+++ b/telepathy-glib/automatic-client-factory.h
@@ -23,6 +23,7 @@
 
 #include <telepathy-glib/call-channel.h>
 #include <telepathy-glib/dbus-tube-channel.h>
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/file-transfer-channel.h>
 #include <telepathy-glib/simple-client-factory.h>
 #include <telepathy-glib/stream-tube-channel.h>
@@ -43,6 +44,7 @@ struct _TpAutomaticClientFactory {
     TpSimpleClientFactory parent;
 };
 
+_TP_AVAILABLE_IN_0_16
 GType tp_automatic_client_factory_get_type (void);
 
 #define TP_TYPE_AUTOMATIC_CLIENT_FACTORY \
@@ -61,6 +63,7 @@ GType tp_automatic_client_factory_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_AUTOMATIC_CLIENT_FACTORY, \
                               TpAutomaticClientFactoryClass))
 
+_TP_AVAILABLE_IN_0_16
 TpAutomaticClientFactory *tp_automatic_client_factory_new (TpDBusDaemon *dbus);
 
 G_END_DECLS
diff --git a/telepathy-glib/base-call-channel.h b/telepathy-glib/base-call-channel.h
index 7f054c223..d905a7bf8 100644
--- a/telepathy-glib/base-call-channel.h
+++ b/telepathy-glib/base-call-channel.h
@@ -24,6 +24,7 @@
 
 #include <telepathy-glib/base-channel.h>
 #include <telepathy-glib/base-call-content.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
@@ -69,6 +70,7 @@ struct _TpBaseCallChannel {
   TpBaseCallChannelPrivate *priv;
 };
 
+_TP_AVAILABLE_IN_0_18
 GType tp_base_call_channel_get_type (void);
 
 /* TYPE MACROS */
@@ -88,7 +90,9 @@ GType tp_base_call_channel_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
    TP_TYPE_BASE_CALL_CHANNEL, TpBaseCallChannelClass))
 
+_TP_AVAILABLE_IN_0_18
 TpCallState tp_base_call_channel_get_state (TpBaseCallChannel *self);
+_TP_AVAILABLE_IN_0_18
 void tp_base_call_channel_set_state (TpBaseCallChannel *self,
     TpCallState state,
     guint actor_handle,
@@ -96,15 +100,21 @@ void tp_base_call_channel_set_state (TpBaseCallChannel *self,
     const gchar *dbus_reason,
     const gchar *message);
 
+_TP_AVAILABLE_IN_0_18
 gboolean tp_base_call_channel_has_initial_audio (TpBaseCallChannel *self,
     const gchar **initial_audio_name);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_base_call_channel_has_initial_video (TpBaseCallChannel *self,
     const gchar **initial_video_name);
 
+_TP_AVAILABLE_IN_0_18
 gboolean tp_base_call_channel_has_mutable_contents (TpBaseCallChannel *self);
+_TP_AVAILABLE_IN_0_18
 GList * tp_base_call_channel_get_contents (TpBaseCallChannel *self);
+_TP_AVAILABLE_IN_0_18
 void tp_base_call_channel_add_content (TpBaseCallChannel *self,
     TpBaseCallContent *content);
+_TP_AVAILABLE_IN_0_18
 void tp_base_call_channel_remove_content (TpBaseCallChannel *self,
     TpBaseCallContent *content,
     TpHandle actor_handle,
@@ -112,6 +122,7 @@ void tp_base_call_channel_remove_content (TpBaseCallChannel *self,
     const gchar *dbus_reason,
     const gchar *message);
 
+_TP_AVAILABLE_IN_0_18
 void tp_base_call_channel_update_member_flags (TpBaseCallChannel *self,
     TpHandle contact,
     TpCallMemberFlags new_flags,
@@ -119,16 +130,20 @@ void tp_base_call_channel_update_member_flags (TpBaseCallChannel *self,
     TpCallStateChangeReason reason,
     const gchar *dbus_reason,
     const gchar *message);
+_TP_AVAILABLE_IN_0_18
 void tp_base_call_channel_remove_member (TpBaseCallChannel *self,
     TpHandle contact,
     TpHandle actor_handle,
     TpCallStateChangeReason reason,
     const gchar *dbus_reason,
     const gchar *message);
+_TP_AVAILABLE_IN_0_18
 GHashTable *tp_base_call_channel_get_call_members (TpBaseCallChannel *self);
 
+_TP_AVAILABLE_IN_0_18
 void tp_base_call_channel_remote_accept (TpBaseCallChannel *self);
 
+_TP_AVAILABLE_IN_0_18
 gboolean tp_base_call_channel_is_accepted (TpBaseCallChannel *self);
 
 G_END_DECLS
diff --git a/telepathy-glib/base-call-content.h b/telepathy-glib/base-call-content.h
index ea15e08ee..1af8df505 100644
--- a/telepathy-glib/base-call-content.h
+++ b/telepathy-glib/base-call-content.h
@@ -28,6 +28,7 @@
 #include <telepathy-glib/base-call-stream.h>
 #include <telepathy-glib/base-connection.h>
 #include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
@@ -72,6 +73,7 @@ struct _TpBaseCallContent {
   TpBaseCallContentPrivate *priv;
 };
 
+_TP_AVAILABLE_IN_0_18
 GType tp_base_call_content_get_type (void);
 
 /* TYPE MACROS */
@@ -91,17 +93,25 @@ GType tp_base_call_content_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
     TP_TYPE_BASE_CALL_CONTENT, TpBaseCallContentClass))
 
+_TP_AVAILABLE_IN_0_18
 TpBaseConnection *tp_base_call_content_get_connection (TpBaseCallContent *self);
+_TP_AVAILABLE_IN_0_18
 const gchar *tp_base_call_content_get_object_path (TpBaseCallContent *self);
 
+_TP_AVAILABLE_IN_0_18
 const gchar *tp_base_call_content_get_name (TpBaseCallContent *self);
+_TP_AVAILABLE_IN_0_18
 TpMediaStreamType tp_base_call_content_get_media_type (TpBaseCallContent *self);
+_TP_AVAILABLE_IN_0_18
 TpCallContentDisposition tp_base_call_content_get_disposition (
     TpBaseCallContent *self);
 
+_TP_AVAILABLE_IN_0_18
 GList *tp_base_call_content_get_streams (TpBaseCallContent *self);
+_TP_AVAILABLE_IN_0_18
 void tp_base_call_content_add_stream (TpBaseCallContent *self,
     TpBaseCallStream *stream);
+_TP_AVAILABLE_IN_0_18
 void tp_base_call_content_remove_stream (TpBaseCallContent *self,
     TpBaseCallStream *stream,
     TpHandle actor_handle,
diff --git a/telepathy-glib/base-call-stream.h b/telepathy-glib/base-call-stream.h
index eafc2cc49..90ae597ec 100644
--- a/telepathy-glib/base-call-stream.h
+++ b/telepathy-glib/base-call-stream.h
@@ -27,6 +27,7 @@
 
 #include <telepathy-glib/base-connection.h>
 #include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
@@ -66,6 +67,7 @@ struct _TpBaseCallStream {
   TpBaseCallStreamPrivate *priv;
 };
 
+_TP_AVAILABLE_IN_0_18
 GType tp_base_call_stream_get_type (void);
 
 /* TYPE MACROS */
@@ -84,13 +86,17 @@ GType tp_base_call_stream_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_CALL_STREAM, \
     TpBaseCallStreamClass))
 
+_TP_AVAILABLE_IN_0_18
 TpBaseConnection *tp_base_call_stream_get_connection (
     TpBaseCallStream *self);
+_TP_AVAILABLE_IN_0_18
 const gchar *tp_base_call_stream_get_object_path (
     TpBaseCallStream *self);
 
+_TP_AVAILABLE_IN_0_18
 TpSendingState tp_base_call_stream_get_local_sending_state (
     TpBaseCallStream *self);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_base_call_stream_update_local_sending_state (
     TpBaseCallStream *self,
     TpSendingState new_state,
@@ -99,9 +105,11 @@ gboolean tp_base_call_stream_update_local_sending_state (
     const gchar *dbus_reason,
     const gchar *message);
 
+_TP_AVAILABLE_IN_0_18
 TpSendingState tp_base_call_stream_get_remote_sending_state (
     TpBaseCallStream *self,
     TpHandle contact);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_base_call_stream_update_remote_sending_state (
     TpBaseCallStream *self,
     TpHandle contact,
@@ -110,6 +118,7 @@ gboolean tp_base_call_stream_update_remote_sending_state (
     TpCallStateChangeReason reason,
     const gchar *dbus_reason,
     const gchar *message);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_base_call_stream_remove_member (
     TpBaseCallStream *self,
     TpHandle contact,
diff --git a/telepathy-glib/base-channel.h b/telepathy-glib/base-channel.h
index 11e4e1d9c..1a45bdaf6 100644
--- a/telepathy-glib/base-channel.h
+++ b/telepathy-glib/base-channel.h
@@ -26,6 +26,7 @@
 
 #include <telepathy-glib/dbus-properties-mixin.h>
 #include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/defs.h>
 
 #include "connection.h"
 
@@ -77,6 +78,7 @@ void tp_base_channel_reopened (TpBaseChannel *chan, TpHandle initiator);
 
 const gchar *tp_base_channel_get_object_path (TpBaseChannel *chan);
 TpBaseConnection *tp_base_channel_get_connection (TpBaseChannel *chan);
+_TP_AVAILABLE_IN_0_18
 TpHandle tp_base_channel_get_self_handle (TpBaseChannel *chan);
 TpHandle tp_base_channel_get_target_handle (TpBaseChannel *chan);
 TpHandle tp_base_channel_get_initiator (TpBaseChannel *chan);
diff --git a/telepathy-glib/base-client.h b/telepathy-glib/base-client.h
index b9c681a5a..9550b4260 100644
--- a/telepathy-glib/base-client.h
+++ b/telepathy-glib/base-client.h
@@ -178,6 +178,7 @@ typedef void (*TpBaseClientDelegatedChannelsCb) (
     GPtrArray *channels,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_16
 void tp_base_client_set_delegated_channels_callback (TpBaseClient *self,
     TpBaseClientDelegatedChannelsCb callback,
     gpointer user_data,
@@ -199,6 +200,7 @@ GList *tp_base_client_get_handled_channels (TpBaseClient *self);
 gboolean tp_base_client_is_handling_channel (TpBaseClient *self,
     TpChannel *channel);
 
+_TP_AVAILABLE_IN_0_16
 void tp_base_client_delegate_channels_async (TpBaseClient *self,
     GList *channels,
     gint64 user_action_time,
@@ -206,6 +208,7 @@ void tp_base_client_delegate_channels_async (TpBaseClient *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_base_client_delegate_channels_finish (TpBaseClient *self,
     GAsyncResult *result,
     GPtrArray **delegated,
diff --git a/telepathy-glib/base-contact-list.h b/telepathy-glib/base-contact-list.h
index e8f8a8aef..345b16fa6 100644
--- a/telepathy-glib/base-contact-list.h
+++ b/telepathy-glib/base-contact-list.h
@@ -24,6 +24,7 @@
 #include <gio/gio.h>
 
 #include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/handle-repo.h>
 #include <telepathy-glib/svc-connection.h>
 
@@ -64,6 +65,7 @@ TpContactListState tp_base_contact_list_get_state (TpBaseContactList *self,
     GError **error);
 TpBaseConnection *tp_base_contact_list_get_connection (
     TpBaseContactList *self, GError **error);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_base_contact_list_get_download_at_connection (
     TpBaseContactList *self);
 
@@ -119,10 +121,12 @@ typedef void (*TpBaseContactListAsyncFunc) (
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_18
 void tp_base_contact_list_download_async (TpBaseContactList *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_18
 gboolean tp_base_contact_list_download_finish (TpBaseContactList *self,
     GAsyncResult *result,
     GError **error);
@@ -304,12 +308,14 @@ gboolean tp_base_contact_list_block_contacts_finish (TpBaseContactList *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_base_contact_list_block_contacts_with_abuse_async (
     TpBaseContactList *self,
     TpHandleSet *contacts,
     gboolean report_abusive,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_base_contact_list_block_contacts_with_abuse_finish (
     TpBaseContactList *self,
     GAsyncResult *result,
@@ -583,6 +589,7 @@ void tp_base_contact_list_mixin_list_iface_init (
     TpSvcConnectionInterfaceContactListClass *klass);
 void tp_base_contact_list_mixin_groups_iface_init (
     TpSvcConnectionInterfaceContactGroupsClass *klass);
+_TP_AVAILABLE_IN_0_16
 void tp_base_contact_list_mixin_blocking_iface_init (
     TpSvcConnectionInterfaceContactBlockingClass *klass);
 
diff --git a/telepathy-glib/base-media-call-channel.h b/telepathy-glib/base-media-call-channel.h
index 063a64d61..9cc5bc820 100644
--- a/telepathy-glib/base-media-call-channel.h
+++ b/telepathy-glib/base-media-call-channel.h
@@ -22,6 +22,7 @@
 #define __TP_BASE_MEDIA_CALL_CHANNEL_H__
 
 #include <telepathy-glib/base-call-channel.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
@@ -54,6 +55,7 @@ struct _TpBaseMediaCallChannel {
   TpBaseMediaCallChannelPrivate *priv;
 };
 
+_TP_AVAILABLE_IN_0_18
 GType tp_base_media_call_channel_get_type (void);
 
 /* TYPE MACROS */
@@ -73,7 +75,7 @@ GType tp_base_media_call_channel_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
    TP_TYPE_BASE_MEDIA_CALL_CHANNEL, TpBaseMediaCallChannelClass))
 
-
+_TP_AVAILABLE_IN_0_18
 TpLocalHoldState tp_base_media_call_channel_get_local_hold_state (
     TpBaseMediaCallChannel *channel, TpLocalHoldStateReason *reason);
 
diff --git a/telepathy-glib/base-media-call-content.h b/telepathy-glib/base-media-call-content.h
index 5e0365b62..4ad655531 100644
--- a/telepathy-glib/base-media-call-content.h
+++ b/telepathy-glib/base-media-call-content.h
@@ -26,6 +26,7 @@
 
 #include <telepathy-glib/base-call-content.h>
 #include <telepathy-glib/call-content-media-description.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
@@ -66,15 +67,18 @@ GType tp_base_media_call_content_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
     TP_TYPE_BASE_MEDIA_CALL_CONTENT, TpBaseMediaCallContentClass))
 
+_TP_AVAILABLE_IN_0_18
 GHashTable *tp_base_media_call_content_get_local_media_description (
     TpBaseMediaCallContent *self,
     TpHandle contact);
 
+_TP_AVAILABLE_IN_0_18
 void tp_base_media_call_content_offer_media_description_async (
     TpBaseMediaCallContent *self,
     TpCallContentMediaDescription *md,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_base_media_call_content_offer_media_description_finish (
     TpBaseMediaCallContent *self,
     GAsyncResult *result,
diff --git a/telepathy-glib/base-media-call-stream.h b/telepathy-glib/base-media-call-stream.h
index 2db752ce4..adecc907f 100644
--- a/telepathy-glib/base-media-call-stream.h
+++ b/telepathy-glib/base-media-call-stream.h
@@ -23,6 +23,7 @@
 
 #include <telepathy-glib/base-call-stream.h>
 #include <telepathy-glib/call-stream-endpoint.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
@@ -77,6 +78,7 @@ struct _TpBaseMediaCallStream {
   TpBaseMediaCallStreamPrivate *priv;
 };
 
+_TP_AVAILABLE_IN_0_18
 GType tp_base_media_call_stream_get_type (void);
 
 /* TYPE MACROS */
@@ -95,31 +97,45 @@ GType tp_base_media_call_stream_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_MEDIA_CALL_STREAM, \
     TpBaseMediaCallStreamClass))
 
+_TP_AVAILABLE_IN_0_18
 void tp_base_media_call_stream_set_relay_info (TpBaseMediaCallStream *self,
     GPtrArray *relays);
+_TP_AVAILABLE_IN_0_18
 void tp_base_media_call_stream_set_stun_servers (TpBaseMediaCallStream *self,
     GPtrArray *stun_servers);
+_TP_AVAILABLE_IN_0_18
 void tp_base_media_call_stream_add_endpoint (TpBaseMediaCallStream *self,
     TpCallStreamEndpoint *endpoint);
+_TP_AVAILABLE_IN_0_18
 void tp_base_media_call_stream_remove_endpoint (TpBaseMediaCallStream *self,
     TpCallStreamEndpoint *endpoint);
+_TP_AVAILABLE_IN_0_18
 GList *tp_base_media_call_stream_get_endpoints (TpBaseMediaCallStream *self);
+_TP_AVAILABLE_IN_0_18
 const gchar *tp_base_media_call_stream_get_username (
     TpBaseMediaCallStream *self);
+_TP_AVAILABLE_IN_0_18
 const gchar *tp_base_media_call_stream_get_password (
     TpBaseMediaCallStream *self);
+_TP_AVAILABLE_IN_0_18
 TpStreamFlowState tp_base_media_call_stream_get_sending_state (
     TpBaseMediaCallStream *self);
+_TP_AVAILABLE_IN_0_18
 TpStreamFlowState tp_base_media_call_stream_get_receiving_state (
     TpBaseMediaCallStream *self);
+_TP_AVAILABLE_IN_0_18
 void tp_base_media_call_stream_update_receiving_state (
     TpBaseMediaCallStream *self);
+_TP_AVAILABLE_IN_0_18
 void tp_base_media_call_stream_update_sending_state (
     TpBaseMediaCallStream *self);
+_TP_AVAILABLE_IN_0_18
 void tp_base_media_call_stream_set_local_sending (TpBaseMediaCallStream *self,
     gboolean sending);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_base_media_call_stream_get_local_sending (
     TpBaseMediaCallStream *self);
+_TP_AVAILABLE_IN_0_18
 GPtrArray *tp_base_media_call_stream_get_local_candidates (
     TpBaseMediaCallStream *self);
 
diff --git a/telepathy-glib/base-protocol.h b/telepathy-glib/base-protocol.h
index 9d34be555..23104cac4 100644
--- a/telepathy-glib/base-protocol.h
+++ b/telepathy-glib/base-protocol.h
@@ -24,6 +24,7 @@
 #include <glib-object.h>
 
 #include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/presence-mixin.h>
 
 G_BEGIN_DECLS
@@ -224,6 +225,7 @@ struct _TpProtocolAddressingInterface {
   TpBaseProtocolNormalizeURIFunc normalize_contact_uri;
 };
 
+_TP_AVAILABLE_IN_0_18
 GType tp_protocol_addressing_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
diff --git a/telepathy-glib/base-room-config.h b/telepathy-glib/base-room-config.h
index cd89ad1e3..86104f93c 100644
--- a/telepathy-glib/base-room-config.h
+++ b/telepathy-glib/base-room-config.h
@@ -22,6 +22,7 @@
 
 #include <glib-object.h>
 #include <telepathy-glib/base-channel.h>
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/_gen/genums.h>
 
 typedef struct _TpBaseRoomConfig TpBaseRoomConfig;
@@ -72,6 +73,7 @@ typedef enum {
     TP_NUM_BASE_ROOM_CONFIG_PROPERTIES /*< skip >*/
 } TpBaseRoomConfigProperty;
 
+_TP_AVAILABLE_IN_0_16
 GType tp_base_room_config_get_type (void);
 
 #define TP_TYPE_BASE_ROOM_CONFIG \
@@ -89,27 +91,34 @@ GType tp_base_room_config_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_ROOM_CONFIG, \
                               TpBaseRoomConfigClass))
 
+_TP_AVAILABLE_IN_0_16
 void tp_base_room_config_register_class (
     TpBaseChannelClass *base_channel_class);
+_TP_AVAILABLE_IN_0_16
 void tp_base_room_config_iface_init (
     gpointer g_iface,
     gpointer iface_data);
 
+_TP_AVAILABLE_IN_0_16
 TpBaseChannel *tp_base_room_config_dup_channel (
     TpBaseRoomConfig *self);
 
+_TP_AVAILABLE_IN_0_16
 void tp_base_room_config_set_can_update_configuration (
     TpBaseRoomConfig *self,
     gboolean can_update_configuration);
 
+_TP_AVAILABLE_IN_0_16
 void tp_base_room_config_set_property_mutable (
     TpBaseRoomConfig *self,
     TpBaseRoomConfigProperty property_id,
     gboolean is_mutable);
 
+_TP_AVAILABLE_IN_0_16
 void tp_base_room_config_emit_properties_changed (
     TpBaseRoomConfig *self);
 
+_TP_AVAILABLE_IN_0_16
 void tp_base_room_config_set_retrieved (
     TpBaseRoomConfig *self);
 
diff --git a/telepathy-glib/call-channel.h b/telepathy-glib/call-channel.h
index 623963330..d351ffbf7 100644
--- a/telepathy-glib/call-channel.h
+++ b/telepathy-glib/call-channel.h
@@ -22,6 +22,7 @@
 #define __TP_CALL_CHANNEL_H__
 
 #include <telepathy-glib/channel.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
@@ -53,6 +54,7 @@ struct _TpCallChannelClass
   GCallback _padding[7];
 };
 
+_TP_AVAILABLE_IN_0_18
 GType tp_call_channel_get_type (void);
 
 typedef struct _TpCallStateReason TpCallStateReason;
@@ -68,82 +70,107 @@ struct _TpCallStateReason
 };
 
 #define TP_TYPE_CALL_STATE_REASON (tp_call_state_reason_get_type ())
+_TP_AVAILABLE_IN_0_18
 GType tp_call_state_reason_get_type (void);
 
 #define TP_CALL_CHANNEL_FEATURE_CORE \
   tp_call_channel_get_feature_quark_core ()
+_TP_AVAILABLE_IN_0_18
 GQuark tp_call_channel_get_feature_quark_core (void) G_GNUC_CONST;
 
+_TP_AVAILABLE_IN_0_18
 GPtrArray *tp_call_channel_get_contents (TpCallChannel *self);
+_TP_AVAILABLE_IN_0_18
 TpCallState tp_call_channel_get_state (TpCallChannel *self,
     TpCallFlags *flags,
     GHashTable **details,
     TpCallStateReason **reason);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_channel_has_hardware_streaming (TpCallChannel *self);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_channel_has_initial_audio (TpCallChannel *self,
     const gchar **initial_audio_name);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_channel_has_initial_video (TpCallChannel *self,
     const gchar **initial_video_name);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_channel_has_mutable_contents (TpCallChannel *self);
+_TP_AVAILABLE_IN_0_18
 GHashTable *tp_call_channel_get_members (TpCallChannel *self);
 
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_channel_has_dtmf (TpCallChannel *self);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_channel_has_hold (TpCallChannel *self);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_channel_set_ringing_async (TpCallChannel *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_channel_set_ringing_finish (TpCallChannel *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_channel_set_queued_async (TpCallChannel *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_channel_set_queued_finish (TpCallChannel *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_channel_accept_async (TpCallChannel *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_channel_accept_finish (TpCallChannel *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_channel_hangup_async (TpCallChannel *self,
     TpCallStateChangeReason reason,
     const gchar *detailed_reason,
     const gchar *message,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_channel_hangup_finish (TpCallChannel *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_channel_add_content_async (TpCallChannel *self,
     const gchar *name,
     TpMediaStreamType type,
     TpMediaStreamDirection initial_direction,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 TpCallContent *tp_call_channel_add_content_finish (TpCallChannel *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_channel_send_tones_async (TpCallChannel *self,
     const gchar *tones,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_channel_send_tones_finish (TpCallChannel *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_channel_request_hold_async (TpCallChannel *self,
     gboolean hold,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_channel_request_hold_finish (TpCallChannel *self,
     GAsyncResult *result,
     GError **error);
diff --git a/telepathy-glib/call-content-media-description.h b/telepathy-glib/call-content-media-description.h
index b03df367d..2f5c49964 100644
--- a/telepathy-glib/call-content-media-description.h
+++ b/telepathy-glib/call-content-media-description.h
@@ -28,6 +28,7 @@
 
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/handle.h>
 
 G_BEGIN_DECLS
@@ -72,6 +73,7 @@ GType tp_call_content_media_description_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CALL_CONTENT_MEDIA_DESCRIPTION, \
   TpCallContentMediaDescriptionClass))
 
+_TP_AVAILABLE_IN_0_18
 TpCallContentMediaDescription *tp_call_content_media_description_new (
     TpDBusDaemon *dbus_daemon,
     const gchar *object_path,
@@ -79,16 +81,20 @@ TpCallContentMediaDescription *tp_call_content_media_description_new (
     gboolean has_remote_information,
     gboolean further_negotiation_required);
 
+_TP_AVAILABLE_IN_0_18
 const gchar *tp_call_content_media_description_get_object_path (
     TpCallContentMediaDescription *self);
+_TP_AVAILABLE_IN_0_18
 TpHandle tp_call_content_media_description_get_remote_contact (
     TpCallContentMediaDescription *self);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_content_media_description_add_ssrc (
     TpCallContentMediaDescription *self,
     TpHandle contact,
     guint ssrc);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_content_media_description_append_codec (
     TpCallContentMediaDescription *self,
     guint identifier,
@@ -98,6 +104,7 @@ void tp_call_content_media_description_append_codec (
     gboolean updated,
     GHashTable *parameters);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_content_media_description_add_rtp_header_extension (
     TpCallContentMediaDescription *self,
     guint id,
@@ -105,6 +112,7 @@ void tp_call_content_media_description_add_rtp_header_extension (
     const gchar *uri,
     const gchar *parameters);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_content_media_description_add_rtcp_feedback_message (
     TpCallContentMediaDescription *self,
     guint codec_identifier,
@@ -112,15 +120,18 @@ void tp_call_content_media_description_add_rtcp_feedback_message (
     const gchar *subtype,
     const gchar *parameters);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_content_media_description_set_rtcp_feedback_minimum_interval (
     TpCallContentMediaDescription *self,
     guint codec_identifier,
     guint rtcp_minimum_interval);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_content_media_description_set_does_avpf (
     TpCallContentMediaDescription *self,
     gboolean does_avpf);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_content_media_description_set_rtcp_extended_reports (
     TpCallContentMediaDescription *self,
     guint loss_rle_max_size,
@@ -131,12 +142,15 @@ void tp_call_content_media_description_set_rtcp_extended_reports (
     TpRTCPXRStatisticsFlags statistics_flags,
     gboolean enable_metrics);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_content_media_description_add_rtp_header_extensions_interface (
     TpCallContentMediaDescription *self);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_content_media_description_add_rtcp_feedback_interface (
     TpCallContentMediaDescription *self);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_content_media_description_add_rtcp_extended_reports_interface (
     TpCallContentMediaDescription *self);
 
diff --git a/telepathy-glib/call-content.h b/telepathy-glib/call-content.h
index b490e0d09..635edb073 100644
--- a/telepathy-glib/call-content.h
+++ b/telepathy-glib/call-content.h
@@ -23,6 +23,7 @@
 
 #include <telepathy-glib/proxy.h>
 #include <telepathy-glib/call-channel.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
@@ -51,31 +52,42 @@ struct _TpCallContentClass
   GCallback _padding[7];
 };
 
+_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
 GQuark tp_call_content_get_feature_quark_core (void) G_GNUC_CONST;
 
+_TP_AVAILABLE_IN_0_18
 const gchar *tp_call_content_get_name (TpCallContent *self);
+_TP_AVAILABLE_IN_0_18
 TpMediaStreamType tp_call_content_get_media_type (TpCallContent *self);
+_TP_AVAILABLE_IN_0_18
 TpCallContentDisposition tp_call_content_get_disposition (TpCallContent *self);
+_TP_AVAILABLE_IN_0_18
 GPtrArray *tp_call_content_get_streams (TpCallContent *self);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_content_remove_async (TpCallContent *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_content_remove_finish (TpCallContent *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_content_send_tones_async (TpCallContent *self,
     const gchar *tones,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_content_send_tones_finish (TpCallContent *self,
     GAsyncResult *result,
     GError **error);
diff --git a/telepathy-glib/call-misc.h b/telepathy-glib/call-misc.h
index 44dfa09a8..b420a0a8e 100644
--- a/telepathy-glib/call-misc.h
+++ b/telepathy-glib/call-misc.h
@@ -21,11 +21,14 @@
 #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
diff --git a/telepathy-glib/call-stream-endpoint.h b/telepathy-glib/call-stream-endpoint.h
index b8df22cd9..d97592caa 100644
--- a/telepathy-glib/call-stream-endpoint.h
+++ b/telepathy-glib/call-stream-endpoint.h
@@ -25,6 +25,7 @@
 
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/defs.h>
 
 #include <telepathy-glib/enums.h>
 
@@ -48,6 +49,7 @@ struct _TpCallStreamEndpoint {
   TpCallStreamEndpointPrivate *priv;
 };
 
+_TP_AVAILABLE_IN_0_18
 GType tp_call_stream_endpoint_get_type (void);
 
 /* TYPE MACROS */
@@ -67,26 +69,32 @@ GType tp_call_stream_endpoint_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
     TP_TYPE_CALL_STREAM_ENDPOINT, TpCallStreamEndpointClass))
 
+_TP_AVAILABLE_IN_0_18
 TpCallStreamEndpoint *tp_call_stream_endpoint_new (TpDBusDaemon *dbus_daemon,
     const gchar *object_path,
     TpStreamTransportType transport,
     gboolean is_ice_lite);
 
+_TP_AVAILABLE_IN_0_18
 const gchar *tp_call_stream_endpoint_get_object_path (
     TpCallStreamEndpoint *self);
 
+_TP_AVAILABLE_IN_0_18
 TpStreamEndpointState tp_call_stream_endpoint_get_state (
     TpCallStreamEndpoint *self,
     TpStreamComponent component);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_stream_endpoint_add_new_candidates (TpCallStreamEndpoint *self,
     const GPtrArray *candidates);
+_TP_AVAILABLE_IN_0_18
 void tp_call_stream_endpoint_add_new_candidate (TpCallStreamEndpoint *self,
     TpStreamComponent component,
     const gchar *address,
     guint port,
     const GHashTable *info_hash);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_stream_endpoint_set_remote_credentials (
     TpCallStreamEndpoint *self,
     const gchar *username,
diff --git a/telepathy-glib/call-stream.h b/telepathy-glib/call-stream.h
index 9c3403220..50f0c3643 100644
--- a/telepathy-glib/call-stream.h
+++ b/telepathy-glib/call-stream.h
@@ -23,6 +23,7 @@
 
 #include <telepathy-glib/proxy.h>
 #include <telepathy-glib/call-channel.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
@@ -51,31 +52,41 @@ struct _TpCallStreamClass
   GCallback _padding[7];
 };
 
+_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
 GQuark tp_call_stream_get_feature_quark_core (void) G_GNUC_CONST;
 
+_TP_AVAILABLE_IN_0_18
 TpSendingState tp_call_stream_get_local_sending_state (TpCallStream *self);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_stream_can_request_receiving (TpCallStream *self);
+_TP_AVAILABLE_IN_0_18
 GHashTable *tp_call_stream_get_remote_members (TpCallStream *self);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_stream_set_sending_async (TpCallStream *self,
     gboolean send,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_stream_set_sending_finish (TpCallStream *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_18
 void tp_call_stream_request_receiving_async (TpCallStream *self,
     TpContact *contact,
     gboolean receive,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_call_stream_request_receiving_finish (TpCallStream *self,
     GAsyncResult *result,
     GError **error);
diff --git a/telepathy-glib/capabilities.h b/telepathy-glib/capabilities.h
index 2bffbfa5c..b8a98a447 100644
--- a/telepathy-glib/capabilities.h
+++ b/telepathy-glib/capabilities.h
@@ -22,6 +22,7 @@
 
 #include <glib-object.h>
 
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/enums.h>
 
 G_BEGIN_DECLS
@@ -30,6 +31,7 @@ typedef struct _TpCapabilities TpCapabilities;
 typedef struct _TpCapabilitiesClass TpCapabilitiesClass;
 typedef struct _TpCapabilitiesPrivate TpCapabilitiesPrivate;
 
+_TP_AVAILABLE_IN_0_18
 GType tp_capabilities_get_type (void) G_GNUC_CONST;
 
 #define TP_TYPE_CAPABILITIES \
@@ -49,24 +51,34 @@ GType tp_capabilities_get_type (void) G_GNUC_CONST;
                               TpCapabilitiesClass))
 
 GPtrArray * tp_capabilities_get_channel_classes (TpCapabilities *self);
+
+_TP_AVAILABLE_IN_0_20
 GVariant * tp_capabilities_dup_channel_classes_variant (TpCapabilities *self);
 
 gboolean tp_capabilities_is_specific_to_contact (TpCapabilities *self);
 
 gboolean tp_capabilities_supports_text_chats (TpCapabilities *self);
 gboolean tp_capabilities_supports_text_chatrooms (TpCapabilities *self);
+_TP_AVAILABLE_IN_0_20
 gboolean tp_capabilities_supports_sms (TpCapabilities *self);
 
+_TP_AVAILABLE_IN_0_18
 gboolean tp_capabilities_supports_audio_call (TpCapabilities *self,
     TpHandleType handle_type);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_capabilities_supports_audio_video_call (TpCapabilities *self,
     TpHandleType handle_type);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_capabilities_supports_file_transfer (TpCapabilities *self);
+_TP_AVAILABLE_IN_0_20
 gboolean tp_capabilities_supports_file_transfer_uri (TpCapabilities *self);
+_TP_AVAILABLE_IN_0_20
 gboolean tp_capabilities_supports_file_transfer_description (
     TpCapabilities *self);
+_TP_AVAILABLE_IN_0_20
 gboolean tp_capabilities_supports_file_transfer_timestamp (
     TpCapabilities *self);
+_TP_AVAILABLE_IN_0_20
 gboolean tp_capabilities_supports_file_transfer_initial_offset (
     TpCapabilities *self);
 
diff --git a/telepathy-glib/channel-dispatch-operation.h b/telepathy-glib/channel-dispatch-operation.h
index 3efcc6015..fb1262f9c 100644
--- a/telepathy-glib/channel-dispatch-operation.h
+++ b/telepathy-glib/channel-dispatch-operation.h
@@ -131,12 +131,14 @@ gboolean tp_channel_dispatch_operation_handle_with_time_finish (
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_channel_dispatch_operation_claim_with_async (
     TpChannelDispatchOperation *self,
     TpBaseClient *client,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_channel_dispatch_operation_claim_with_finish (
     TpChannelDispatchOperation *self,
     GAsyncResult *result,
@@ -144,16 +146,19 @@ gboolean tp_channel_dispatch_operation_claim_with_finish (
 
 /* Reject API */
 
+_TP_AVAILABLE_IN_0_16
 void tp_channel_dispatch_operation_close_channels_async (
     TpChannelDispatchOperation *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_channel_dispatch_operation_close_channels_finish (
     TpChannelDispatchOperation *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_channel_dispatch_operation_leave_channels_async (
     TpChannelDispatchOperation *self,
     TpChannelGroupChangeReason reason,
@@ -161,16 +166,19 @@ void tp_channel_dispatch_operation_leave_channels_async (
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_channel_dispatch_operation_leave_channels_finish (
     TpChannelDispatchOperation *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_channel_dispatch_operation_destroy_channels_async (
     TpChannelDispatchOperation *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_channel_dispatch_operation_destroy_channels_finish (
     TpChannelDispatchOperation *self,
     GAsyncResult *result,
diff --git a/telepathy-glib/channel-dispatcher.h b/telepathy-glib/channel-dispatcher.h
index dc165486f..91e6b72bf 100644
--- a/telepathy-glib/channel-dispatcher.h
+++ b/telepathy-glib/channel-dispatcher.h
@@ -71,12 +71,14 @@ TpChannelDispatcher *tp_channel_dispatcher_new (TpDBusDaemon *bus_daemon)
 
 void tp_channel_dispatcher_init_known_interfaces (void);
 
+_TP_AVAILABLE_IN_0_16
 void tp_channel_dispatcher_present_channel_async (TpChannelDispatcher *self,
     TpChannel *channel,
     gint64 user_action_time,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_channel_dispatcher_present_channel_finish (
     TpChannelDispatcher *self,
     GAsyncResult *result,
diff --git a/telepathy-glib/channel-factory-iface.h b/telepathy-glib/channel-factory-iface.h
index aaa16d62b..b14bc60c0 100644
--- a/telepathy-glib/channel-factory-iface.h
+++ b/telepathy-glib/channel-factory-iface.h
@@ -25,6 +25,7 @@
 #include <glib-object.h>
 
 #include <telepathy-glib/channel-iface.h>
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/enums.h>
 #include <telepathy-glib/handle.h>
 
diff --git a/telepathy-glib/channel.h b/telepathy-glib/channel.h
index 88df49aa7..691fcdd37 100644
--- a/telepathy-glib/channel.h
+++ b/telepathy-glib/channel.h
@@ -151,17 +151,26 @@ GQuark tp_channel_get_feature_quark_group (void) G_GNUC_CONST;
 
 #define TP_CHANNEL_FEATURE_CONTACTS \
   tp_channel_get_feature_quark_contacts ()
+_TP_AVAILABLE_IN_0_16
 GQuark tp_channel_get_feature_quark_contacts (void) G_GNUC_CONST;
 
+_TP_AVAILABLE_IN_0_16
 TpContact *tp_channel_get_target_contact (TpChannel *self);
+_TP_AVAILABLE_IN_0_16
 TpContact *tp_channel_get_initiator_contact (TpChannel *self);
+_TP_AVAILABLE_IN_0_16
 TpContact *tp_channel_group_get_self_contact (TpChannel *self);
+_TP_AVAILABLE_IN_0_16
 GPtrArray *tp_channel_group_dup_members_contacts (TpChannel *self);
+_TP_AVAILABLE_IN_0_16
 GPtrArray *tp_channel_group_dup_local_pending_contacts (TpChannel *self);
+_TP_AVAILABLE_IN_0_16
 GPtrArray *tp_channel_group_dup_remote_pending_contacts (TpChannel *self);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_channel_group_get_local_pending_contact_info (TpChannel *self,
     TpContact *local_pending, TpContact **actor,
     TpChannelGroupChangeReason *reason, const gchar **message);
+_TP_AVAILABLE_IN_0_16
 TpContact *tp_channel_group_get_contact_owner (TpChannel *self,
     TpContact *contact);
 
@@ -171,11 +180,13 @@ GQuark tp_channel_get_feature_quark_chat_states (void) G_GNUC_CONST;
 TpChannelChatState tp_channel_get_chat_state (TpChannel *self,
     TpHandle contact);
 
+_TP_AVAILABLE_IN_0_16
 void tp_channel_join_async (TpChannel *self,
     const gchar *message,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_channel_join_finish (TpChannel *self,
     GAsyncResult *result,
     GError **error);
@@ -198,10 +209,12 @@ gboolean tp_channel_close_finish (TpChannel *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_channel_destroy_async (TpChannel *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_channel_destroy_finish (TpChannel *self,
     GAsyncResult *result,
     GError **error);
@@ -209,15 +222,19 @@ gboolean tp_channel_destroy_finish (TpChannel *self,
 /* Channel.Interface.Password */
 #define TP_CHANNEL_FEATURE_PASSWORD \
   tp_channel_get_feature_quark_password ()
+_TP_AVAILABLE_IN_0_16
 GQuark tp_channel_get_feature_quark_password (void) G_GNUC_CONST;
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_channel_password_needed (TpChannel *self);
 
+_TP_AVAILABLE_IN_0_16
 void tp_channel_provide_password_async (TpChannel *self,
     const gchar *password,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_channel_provide_password_finish (TpChannel *self,
     GAsyncResult *result,
     GError **error);
diff --git a/telepathy-glib/cm-message.h b/telepathy-glib/cm-message.h
index 201c94d18..79b63de93 100644
--- a/telepathy-glib/cm-message.h
+++ b/telepathy-glib/cm-message.h
@@ -25,6 +25,7 @@
 #include <glib.h>
 
 #include <telepathy-glib/base-connection.h>
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/message.h>
 
 G_BEGIN_DECLS
@@ -49,6 +50,7 @@ TpMessage *tp_cm_message_new_text (TpBaseConnection *conn,
     TpChannelTextMessageType type,
     const gchar *text);
 
+_TP_AVAILABLE_IN_0_16
 void tp_cm_message_set_message (TpMessage *self,
     guint part,
     const gchar *key,
diff --git a/telepathy-glib/connection-contact-list.h b/telepathy-glib/connection-contact-list.h
index ec3ee5c7d..ab4d8bb6a 100644
--- a/telepathy-glib/connection-contact-list.h
+++ b/telepathy-glib/connection-contact-list.h
@@ -24,151 +24,190 @@
 #include <telepathy-glib/enums.h>
 #include <telepathy-glib/connection.h>
 #include <telepathy-glib/contact.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
 #define TP_CONNECTION_FEATURE_CONTACT_LIST \
   (tp_connection_get_feature_quark_contact_list ())
+_TP_AVAILABLE_IN_0_16
 GQuark tp_connection_get_feature_quark_contact_list (void) G_GNUC_CONST;
 
 #define TP_CONNECTION_FEATURE_CONTACT_LIST_PROPERTIES \
   (tp_connection_get_feature_quark_contact_list_properties ())
+_TP_AVAILABLE_IN_0_18
 GQuark tp_connection_get_feature_quark_contact_list_properties (void) G_GNUC_CONST;
 
+_TP_AVAILABLE_IN_0_16
 TpContactListState tp_connection_get_contact_list_state (TpConnection *self);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_get_contact_list_persists (TpConnection *self);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_get_can_change_contact_list (TpConnection *self);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_get_request_uses_message (TpConnection *self);
+_TP_AVAILABLE_IN_0_16
 GPtrArray *tp_connection_dup_contact_list (TpConnection *self);
 
+_TP_AVAILABLE_IN_0_16
 void tp_connection_request_subscription_async (TpConnection *self,
     guint n_contacts,
     TpContact * const *contacts,
     const gchar *message,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_request_subscription_finish (TpConnection *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_connection_authorize_publication_async (TpConnection *self,
     guint n_contacts,
     TpContact * const *contacts,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_authorize_publication_finish (TpConnection *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_connection_remove_contacts_async (TpConnection *self,
     guint n_contacts,
     TpContact * const *contacts,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_remove_contacts_finish (TpConnection *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_connection_unsubscribe_async (TpConnection *self,
     guint n_contacts,
     TpContact * const *contacts,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_unsubscribe_finish (TpConnection *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_connection_unpublish_async (TpConnection *self,
     guint n_contacts,
     TpContact * const *contacts,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_unpublish_finish (TpConnection *self,
     GAsyncResult *result,
     GError **error);
 
 #define TP_CONNECTION_FEATURE_CONTACT_GROUPS \
   (tp_connection_get_feature_quark_contact_groups ())
+_TP_AVAILABLE_IN_0_16
 GQuark tp_connection_get_feature_quark_contact_groups (void) G_GNUC_CONST;
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_get_disjoint_groups (TpConnection *self);
+_TP_AVAILABLE_IN_0_16
 TpContactMetadataStorageType tp_connection_get_group_storage (TpConnection *self);
+_TP_AVAILABLE_IN_0_16
 const gchar * const *tp_connection_get_contact_groups (TpConnection *self);
 
+_TP_AVAILABLE_IN_0_16
 void tp_connection_set_group_members_async (TpConnection *self,
     const gchar *group,
     guint n_contacts,
     TpContact * const *contacts,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_set_group_members_finish (TpConnection *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_connection_add_to_group_async (TpConnection *self,
     const gchar *group,
     guint n_contacts,
     TpContact * const *contacts,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_add_to_group_finish (TpConnection *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_connection_remove_from_group_async (TpConnection *self,
     const gchar *group,
     guint n_contacts,
     TpContact * const *contacts,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_remove_from_group_finish (TpConnection *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_connection_remove_group_async (TpConnection *self,
     const gchar *group,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_remove_group_finish (TpConnection *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_connection_rename_group_async (TpConnection *self,
     const gchar *old_name,
     const gchar *new_name,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_rename_group_finish (TpConnection *self,
     GAsyncResult *result,
     GError **error);
 
 /* ContactBlocking */
 
+_TP_AVAILABLE_IN_0_18
 void tp_connection_block_contacts_async (TpConnection *self,
     guint n_contacts,
     TpContact * const *contacts,
     gboolean report_abusive,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_connection_block_contacts_finish (TpConnection *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_18
 void tp_connection_unblock_contacts_async (TpConnection *self,
     guint n_contacts,
     TpContact * const *contacts,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_connection_unblock_contacts_finish (TpConnection *self,
     GAsyncResult *result,
     GError **error);
 
 #define TP_CONNECTION_FEATURE_CONTACT_BLOCKING \
   (tp_connection_get_feature_quark_contact_blocking ())
+_TP_AVAILABLE_IN_0_18
 GQuark tp_connection_get_feature_quark_contact_blocking (void) G_GNUC_CONST;
 
+_TP_AVAILABLE_IN_0_18
 gboolean tp_connection_can_report_abusive (TpConnection *self);
 
+_TP_AVAILABLE_IN_0_18
 GPtrArray * tp_connection_get_blocked_contacts (TpConnection *self);
 
 G_END_DECLS
diff --git a/telepathy-glib/connection-manager.h b/telepathy-glib/connection-manager.h
index 01474057d..0e48a39fc 100644
--- a/telepathy-glib/connection-manager.h
+++ b/telepathy-glib/connection-manager.h
@@ -117,9 +117,11 @@ void tp_list_connection_managers (TpDBusDaemon *bus_daemon,
     gpointer user_data, GDestroyNotify destroy,
     GObject *weak_object);
 
+_TP_AVAILABLE_IN_0_18
 void tp_list_connection_managers_async (TpDBusDaemon *dbus_daemon,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 GList *tp_list_connection_managers_finish (GAsyncResult *result,
     GError **error);
 
@@ -155,6 +157,7 @@ const TpConnectionManagerProtocol *tp_connection_manager_get_protocol (
     TpConnectionManager *self, const gchar *protocol);
 TpProtocol *tp_connection_manager_get_protocol_object (
     TpConnectionManager *self, const gchar *protocol);
+_TP_AVAILABLE_IN_0_18
 GList *tp_connection_manager_dup_protocols (TpConnectionManager *self)
   G_GNUC_WARN_UNUSED_RESULT;
 
@@ -183,6 +186,7 @@ gboolean tp_connection_manager_param_is_dbus_property (
     const TpConnectionManagerParam *param);
 gboolean tp_connection_manager_param_get_default (
     const TpConnectionManagerParam *param, GValue *value);
+_TP_AVAILABLE_IN_0_20
 GVariant *tp_connection_manager_param_dup_default_variant (
     const TpConnectionManagerParam *param);
 
diff --git a/telepathy-glib/connection.h b/telepathy-glib/connection.h
index 177e5404c..71a739c32 100644
--- a/telepathy-glib/connection.h
+++ b/telepathy-glib/connection.h
@@ -127,6 +127,7 @@ GQuark tp_errors_disconnected_quark (void);
 TpConnection *tp_connection_new (TpDBusDaemon *dbus, const gchar *bus_name,
     const gchar *object_path, GError **error) G_GNUC_WARN_UNUSED_RESULT;
 
+_TP_AVAILABLE_IN_0_16
 TpAccount *tp_connection_get_account (TpConnection *self);
 
 TpConnectionStatus tp_connection_get_status (TpConnection *self,
@@ -192,8 +193,10 @@ gint tp_connection_presence_type_cmp_availability (TpConnectionPresenceType p1,
 gboolean tp_connection_parse_object_path (TpConnection *self, gchar **protocol,
     gchar **cm_name);
 
+_TP_AVAILABLE_IN_0_20
 const gchar *tp_connection_get_detailed_error (TpConnection *self,
     const GHashTable **details);
+_TP_AVAILABLE_IN_0_20
 gchar *tp_connection_dup_detailed_error_vardict (TpConnection *self,
     GVariant **details) G_GNUC_WARN_UNUSED_RESULT;
 
@@ -291,21 +294,28 @@ TpAvatarRequirements * tp_connection_get_avatar_requirements (
 
 #define TP_CONNECTION_FEATURE_ALIASING \
   (tp_connection_get_feature_quark_aliasing ())
+_TP_AVAILABLE_IN_0_18
 GQuark tp_connection_get_feature_quark_aliasing (void) G_GNUC_CONST;
 
+_TP_AVAILABLE_IN_0_18
 gboolean tp_connection_can_set_contact_alias (TpConnection *self);
 
 #define TP_CONNECTION_FEATURE_BALANCE \
   (tp_connection_get_feature_quark_balance ())
+_TP_AVAILABLE_IN_0_16
 GQuark tp_connection_get_feature_quark_balance (void) G_GNUC_CONST;
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_connection_get_balance (TpConnection *self,
     gint *balance, guint *scale, const gchar **currency);
+_TP_AVAILABLE_IN_0_16
 const gchar * tp_connection_get_balance_uri (TpConnection *self);
 
+_TP_AVAILABLE_IN_0_18
 void tp_connection_disconnect_async (TpConnection *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_connection_disconnect_finish (TpConnection *self,
     GAsyncResult *result,
     GError **error);
diff --git a/telepathy-glib/contact-operations.h b/telepathy-glib/contact-operations.h
index 82811ac6a..65360f532 100644
--- a/telepathy-glib/contact-operations.h
+++ b/telepathy-glib/contact-operations.h
@@ -21,74 +21,93 @@
 #define __TP_CONTACT_OPERATIONS_H__
 
 #include <telepathy-glib/contact.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
+_TP_AVAILABLE_IN_0_16
 void tp_contact_request_subscription_async (TpContact *self,
     const gchar *message,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_contact_request_subscription_finish (TpContact *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_contact_authorize_publication_async (TpContact *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_contact_authorize_publication_finish (TpContact *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_contact_remove_async (TpContact *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_contact_remove_finish (TpContact *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_contact_unsubscribe_async (TpContact *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_contact_unsubscribe_finish (TpContact *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_contact_unpublish_async (TpContact *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_contact_unpublish_finish (TpContact *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_contact_add_to_group_async (TpContact *self,
     const gchar *group,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_contact_add_to_group_finish (TpContact *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_contact_remove_from_group_async (TpContact *self,
     const gchar *group,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_contact_remove_from_group_finish (TpContact *self,
     GAsyncResult *result,
     GError **error);
 
 /* ContactBlocking */
 
+_TP_AVAILABLE_IN_0_18
 void tp_contact_block_async (TpContact *self,
     gboolean report_abusive,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_contact_block_finish (TpContact *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_18
 void tp_contact_unblock_async (TpContact *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_contact_unblock_finish (TpContact *self,
     GAsyncResult *result,
     GError **error);
diff --git a/telepathy-glib/contact.h b/telepathy-glib/contact.h
index f1dc7b608..412e569a3 100644
--- a/telepathy-glib/contact.h
+++ b/telepathy-glib/contact.h
@@ -26,6 +26,7 @@
 
 #include <telepathy-glib/capabilities.h>
 #include <telepathy-glib/connection.h>
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/handle.h>
 
 #include <telepathy-glib/_gen/genums.h>
@@ -72,6 +73,7 @@ typedef enum {
 #define TP_CONTACT_FEATURE_INVALID ((TpContactFeature) -1)
 
 /* Basic functionality, always available */
+_TP_AVAILABLE_IN_0_20
 TpAccount *tp_contact_get_account (TpContact *self);
 TpConnection *tp_contact_get_connection (TpContact *self);
 TpHandle tp_contact_get_handle (TpContact *self);
@@ -169,6 +171,7 @@ TpContact *tp_connection_dup_contact_if_possible (TpConnection *connection,
 
 /* TP_CONTACT_FEATURE_CONTACT_BLOCKING */
 
+_TP_AVAILABLE_IN_0_18
 gboolean tp_contact_is_blocked (TpContact *self);
 
 G_END_DECLS
diff --git a/telepathy-glib/dbus-properties-mixin.h b/telepathy-glib/dbus-properties-mixin.h
index b26081f3e..0f8bf1c07 100644
--- a/telepathy-glib/dbus-properties-mixin.h
+++ b/telepathy-glib/dbus-properties-mixin.h
@@ -23,6 +23,7 @@
 
 #include <glib-object.h>
 
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/_gen/genums.h>
 
 G_BEGIN_DECLS
@@ -56,6 +57,7 @@ typedef struct {
 
 void tp_svc_interface_set_dbus_properties_info (GType g_interface,
     TpDBusPropertiesMixinIfaceInfo *info);
+_TP_AVAILABLE_IN_0_16
 TpDBusPropertiesMixinIfaceInfo *tp_svc_interface_get_dbus_properties_info (
     GType g_interface);
 
@@ -124,6 +126,7 @@ void tp_dbus_properties_mixin_iface_init (gpointer g_iface,
 gboolean tp_dbus_properties_mixin_get (GObject *self,
     const gchar *interface_name, const gchar *property_name,
     GValue *value, GError **error);
+_TP_AVAILABLE_IN_0_16
 gboolean tp_dbus_properties_mixin_set (
     GObject *self,
     const gchar *interface_name,
@@ -143,11 +146,13 @@ void tp_dbus_properties_mixin_fill_properties_hash (GObject *object,
     ...)
   G_GNUC_NULL_TERMINATED;
 
+_TP_AVAILABLE_IN_0_16
 void tp_dbus_properties_mixin_emit_properties_changed (
     GObject *object,
     const gchar *interface_name,
     const gchar * const *properties);
 
+_TP_AVAILABLE_IN_0_16
 void tp_dbus_properties_mixin_emit_properties_changed_varargs (
     GObject *object,
     const gchar *interface_name,
diff --git a/telepathy-glib/dbus-tube-channel.c b/telepathy-glib/dbus-tube-channel.c
index 0533b098a..8cd552d9e 100644
--- a/telepathy-glib/dbus-tube-channel.c
+++ b/telepathy-glib/dbus-tube-channel.c
@@ -60,7 +60,7 @@
  * url="http://cgit.freedesktop.org/telepathy/telepathy-glib/tree/examples/client/dbus-tubes/">examples/client/dbus-tubes</ulink>
  * directory.
  *
- * Since: 0.15.6
+ * Since: 0.18.0
  */
 
 /**
@@ -68,7 +68,7 @@
  *
  * Data structure representing a #TpDBusTubeChannel.
  *
- * Since: 0.15.6
+ * Since: 0.18.0
  */
 
 /**
@@ -76,7 +76,7 @@
  *
  * The class of a #TpDBusTubeChannel.
  *
- * Since: 0.15.6
+ * Since: 0.18.0
  */
 
 #include "config.h"
@@ -411,7 +411,7 @@ tp_dbus_tube_channel_class_init (TpDBusTubeChannelClass *klass)
    *
    * A string representing the service name that will be used over the tube.
    *
-   * Since: 0.15.6
+   * Since: 0.18.0
    */
   param_spec = g_param_spec_string ("service-name", "Service Name",
       "The service name of the dbus tube",
@@ -427,7 +427,7 @@ tp_dbus_tube_channel_class_init (TpDBusTubeChannelClass *klass)
    *
    * Will be %NULL for outgoing tubes until the tube has been offered.
    *
-   * Since: 0.15.6
+   * Since: 0.18.0
    */
   param_spec = g_param_spec_boxed ("parameters", "Parameters",
       "The parameters of the dbus tube",
@@ -481,7 +481,7 @@ _tp_dbus_tube_channel_new_with_factory (
  *
  * Returns: (transfer none): the value of #TpDBusTubeChannel:service-name
  *
- * Since: 0.15.6
+ * Since: 0.18.0
  */
 const gchar *
 tp_dbus_tube_channel_get_service_name (TpDBusTubeChannel *self)
@@ -502,7 +502,7 @@ tp_dbus_tube_channel_get_service_name (TpDBusTubeChannel *self)
  * Returns: (transfer none) (element-type utf8 GObject.Value):
  * the value of #TpDBusTubeChannel:parameters
  *
- * Since: 0.15.6
+ * Since: 0.18.0
  */
 GHashTable *
 tp_dbus_tube_channel_get_parameters (TpDBusTubeChannel *self)
diff --git a/telepathy-glib/dbus-tube-channel.h b/telepathy-glib/dbus-tube-channel.h
index 28b81c1fc..e4ab73be2 100644
--- a/telepathy-glib/dbus-tube-channel.h
+++ b/telepathy-glib/dbus-tube-channel.h
@@ -22,6 +22,7 @@
 #define __TP_DBUS_TUBE_CHANNEL_H__
 
 #include <telepathy-glib/channel.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
@@ -52,31 +53,39 @@ struct _TpDBusTubeChannelClass
 
 #define TP_DBUS_TUBE_CHANNEL_FEATURE_CORE \
   tp_dbus_tube_channel_feature_quark_core ()
+_TP_AVAILABLE_IN_0_18
 GQuark tp_dbus_tube_channel_feature_quark_core (void) G_GNUC_CONST;
 
+_TP_AVAILABLE_IN_0_18
 GType tp_dbus_tube_channel_get_type (void);
 
+_TP_AVAILABLE_IN_0_18
 const gchar * tp_dbus_tube_channel_get_service_name (TpDBusTubeChannel *self);
 
+_TP_AVAILABLE_IN_0_18
 GHashTable * tp_dbus_tube_channel_get_parameters (TpDBusTubeChannel *self);
 
 /* Outgoing tube methods */
 
+_TP_AVAILABLE_IN_0_18
 void tp_dbus_tube_channel_offer_async (TpDBusTubeChannel *self,
     GHashTable *params,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_18
 GDBusConnection * tp_dbus_tube_channel_offer_finish (TpDBusTubeChannel *self,
     GAsyncResult *result,
     GError **error) G_GNUC_WARN_UNUSED_RESULT;
 
 /* Incoming tube methods */
 
+_TP_AVAILABLE_IN_0_18
 void tp_dbus_tube_channel_accept_async (TpDBusTubeChannel *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_18
 GDBusConnection * tp_dbus_tube_channel_accept_finish (TpDBusTubeChannel *self,
     GAsyncResult *result,
     GError **error) G_GNUC_WARN_UNUSED_RESULT;
diff --git a/telepathy-glib/debug-client.h b/telepathy-glib/debug-client.h
index 861be0370..d7e69c860 100644
--- a/telepathy-glib/debug-client.h
+++ b/telepathy-glib/debug-client.h
@@ -31,6 +31,7 @@ typedef struct _TpDebugClient TpDebugClient;
 typedef struct _TpDebugClientPrivate TpDebugClientPrivate;
 typedef struct _TpDebugClientClass TpDebugClientClass;
 
+_TP_AVAILABLE_IN_0_20
 TpDebugClient *tp_debug_client_new (
     TpDBusDaemon *dbus,
     const gchar *unique_name,
@@ -38,23 +39,28 @@ TpDebugClient *tp_debug_client_new (
 
 #define TP_DEBUG_CLIENT_FEATURE_CORE \
     (tp_debug_client_get_feature_quark_core ())
+_TP_AVAILABLE_IN_0_20
 GQuark tp_debug_client_get_feature_quark_core (void) G_GNUC_CONST;
 
+_TP_AVAILABLE_IN_0_20
 void tp_debug_client_set_enabled_async (
     TpDebugClient *self,
     gboolean enabled,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_20
 gboolean tp_debug_client_set_enabled_finish (
     TpDebugClient *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_20
 gboolean tp_debug_client_is_enabled (TpDebugClient *self);
 
 /* Tedious GObject boilerplate */
 
+_TP_AVAILABLE_IN_0_20
 GType tp_debug_client_get_type (void);
 
 #define TP_TYPE_DEBUG_CLIENT \
@@ -73,13 +79,16 @@ GType tp_debug_client_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_DEBUG_CLIENT, \
                               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,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_20
 GPtrArray * tp_debug_client_get_messages_finish (TpDebugClient *self,
     GAsyncResult *result,
     GError **error) G_GNUC_WARN_UNUSED_RESULT;
diff --git a/telepathy-glib/debug-message.h b/telepathy-glib/debug-message.h
index b556002e4..3aad8fd1a 100644
--- a/telepathy-glib/debug-message.h
+++ b/telepathy-glib/debug-message.h
@@ -23,6 +23,7 @@
 #define __TP_DEBUG_MESSAGE_H__
 
 #include <glib-object.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
@@ -41,6 +42,7 @@ struct _TpDebugMessage {
   TpDebugMessagePriv *priv;
 };
 
+_TP_AVAILABLE_IN_0_20
 GType tp_debug_message_get_type (void);
 
 /* TYPE MACROS */
@@ -65,10 +67,15 @@ GType tp_debug_message_get_type (void);
     TP_TYPE_DEBUG_MESSAGE, \
     TpDebugMessageClass))
 
+_TP_AVAILABLE_IN_0_20
 GDateTime * tp_debug_message_get_time (TpDebugMessage *self);
+_TP_AVAILABLE_IN_0_20
 const gchar * tp_debug_message_get_domain (TpDebugMessage *self);
+_TP_AVAILABLE_IN_0_20
 const gchar * tp_debug_message_get_category (TpDebugMessage *self);
+_TP_AVAILABLE_IN_0_20
 GLogLevelFlags tp_debug_message_get_level (TpDebugMessage *self);
+_TP_AVAILABLE_IN_0_20
 const gchar * tp_debug_message_get_message (TpDebugMessage *self);
 
 G_END_DECLS
diff --git a/telepathy-glib/debug-sender.h b/telepathy-glib/debug-sender.h
index a7d1d0363..de7a0d182 100644
--- a/telepathy-glib/debug-sender.h
+++ b/telepathy-glib/debug-sender.h
@@ -23,6 +23,7 @@
 #include <glib-object.h>
 
 #include <telepathy-glib/dbus-properties-mixin.h>
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/enums.h>
 #include <telepathy-glib/svc-debug.h>
 
@@ -88,6 +89,7 @@ void tp_debug_sender_add_message_printf (TpDebugSender *self,
 void tp_debug_sender_log_handler (const gchar *log_domain,
     GLogLevelFlags log_level, const gchar *message, gpointer exclude);
 
+_TP_AVAILABLE_IN_0_16
 void tp_debug_sender_set_timestamps (TpDebugSender *self, gboolean maybe);
 
 G_END_DECLS
diff --git a/telepathy-glib/deprecated-internal.h b/telepathy-glib/deprecated-internal.h
index 226e6ae5c..e17b9dfd6 100644
--- a/telepathy-glib/deprecated-internal.h
+++ b/telepathy-glib/deprecated-internal.h
@@ -24,6 +24,7 @@
 #include <telepathy-glib/base-client.h>
 #include <telepathy-glib/channel-request.h>
 #include <telepathy-glib/client-channel-factory.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
diff --git a/telepathy-glib/file-transfer-channel.h b/telepathy-glib/file-transfer-channel.h
index e497b29cf..83c455023 100644
--- a/telepathy-glib/file-transfer-channel.h
+++ b/telepathy-glib/file-transfer-channel.h
@@ -23,6 +23,7 @@
 #define __TP_FILE_TRANSFER_CHANNEL_H__
 
 #include <telepathy-glib/channel.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
@@ -54,33 +55,40 @@ struct _TpFileTransferChannelClass
 
 #define TP_FILE_TRANSFER_CHANNEL_FEATURE_CORE \
   tp_file_transfer_channel_get_feature_quark_core ()
+_TP_AVAILABLE_IN_0_16
 GQuark tp_file_transfer_channel_get_feature_quark_core (void) G_GNUC_CONST;
 
+_TP_AVAILABLE_IN_0_16
 GType tp_file_transfer_channel_get_type (void);
 
 /* Methods */
 
+_TP_AVAILABLE_IN_0_16
 TpFileTransferChannel * tp_file_transfer_channel_new (TpConnection *conn,
     const gchar *object_path,
     const GHashTable *immutable_properties,
     GError **error);
 
+_TP_AVAILABLE_IN_0_18
 void tp_file_transfer_channel_accept_file_async (TpFileTransferChannel *self,
     GFile *file,
     guint64 offset,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_18
 gboolean tp_file_transfer_channel_accept_file_finish (
     TpFileTransferChannel *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_18
 void tp_file_transfer_channel_provide_file_async (TpFileTransferChannel *self,
     GFile *file,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_18
 gboolean tp_file_transfer_channel_provide_file_finish (
     TpFileTransferChannel *self,
     GAsyncResult *result,
@@ -88,31 +96,40 @@ gboolean tp_file_transfer_channel_provide_file_finish (
 
 /* Property accessors */
 
+_TP_AVAILABLE_IN_0_16
 const char * tp_file_transfer_channel_get_mime_type (
     TpFileTransferChannel *self);
 
+_TP_AVAILABLE_IN_0_16
 GDateTime * tp_file_transfer_channel_get_date (TpFileTransferChannel *self);
 
+_TP_AVAILABLE_IN_0_18
 TpFileTransferState tp_file_transfer_channel_get_state (
     TpFileTransferChannel *self,
     TpFileTransferStateChangeReason *reason);
 
+_TP_AVAILABLE_IN_0_16
 const gchar * tp_file_transfer_channel_get_description (
     TpFileTransferChannel *self);
 
+_TP_AVAILABLE_IN_0_16
 const gchar * tp_file_transfer_channel_get_filename (
     TpFileTransferChannel *self);
 
+_TP_AVAILABLE_IN_0_16
 guint64 tp_file_transfer_channel_get_size (TpFileTransferChannel *self);
 
+_TP_AVAILABLE_IN_0_16
 guint64 tp_file_transfer_channel_get_transferred_bytes (
     TpFileTransferChannel *self);
 
 /* Metadata */
 
+_TP_AVAILABLE_IN_0_18
 const gchar * tp_file_transfer_channel_get_service_name (
     TpFileTransferChannel *self);
 
+_TP_AVAILABLE_IN_0_18
 const GHashTable * tp_file_transfer_channel_get_metadata (
     TpFileTransferChannel *self);
 
diff --git a/telepathy-glib/gnio-util.h b/telepathy-glib/gnio-util.h
index a6580ab9c..1ce7e1561 100644
--- a/telepathy-glib/gnio-util.h
+++ b/telepathy-glib/gnio-util.h
@@ -22,6 +22,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/enums.h>
 
 #ifndef __TP_GNIO_UTIL_H__
@@ -41,22 +42,26 @@ gboolean tp_unix_connection_send_credentials_with_byte (
     guchar byte,
     GCancellable *cancellable,
     GError **error);
+_TP_AVAILABLE_IN_0_18
 void tp_unix_connection_send_credentials_with_byte_async (
     GSocketConnection *connection,
     guchar byte,
     GCancellable *cancellable,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_unix_connection_send_credentials_with_byte_finish (
     GSocketConnection *connection,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_18
 GCredentials * tp_unix_connection_receive_credentials_with_byte (
     GSocketConnection *connection,
     guchar *byte,
     GCancellable *cancellable,
     GError **error);
+_TP_AVAILABLE_IN_0_18
 void tp_unix_connection_receive_credentials_with_byte_async (
     GSocketConnection *connection,
     GCancellable *cancellable,
diff --git a/telepathy-glib/message.h b/telepathy-glib/message.h
index c76561509..1e35384d0 100644
--- a/telepathy-glib/message.h
+++ b/telepathy-glib/message.h
@@ -98,6 +98,7 @@ gboolean tp_message_is_rescued (TpMessage *self);
 const gchar *tp_message_get_supersedes (TpMessage *self);
 const gchar *tp_message_get_specific_to_interface (TpMessage *self);
 gboolean tp_message_is_delivery_report (TpMessage *self);
+_TP_AVAILABLE_IN_0_16
 guint32 tp_message_get_pending_message_id (TpMessage *self,
     gboolean *valid);
 
diff --git a/telepathy-glib/protocol.h b/telepathy-glib/protocol.h
index c73babda3..7d1164a13 100644
--- a/telepathy-glib/protocol.h
+++ b/telepathy-glib/protocol.h
@@ -24,6 +24,7 @@
 
 #include <telepathy-glib/capabilities.h>
 #include <telepathy-glib/connection.h>
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/proxy.h>
 
 G_BEGIN_DECLS
@@ -85,13 +86,16 @@ GQuark tp_protocol_get_feature_quark_parameters (void) G_GNUC_CONST;
 
 const TpConnectionManagerParam *tp_protocol_get_param (TpProtocol *self,
     const gchar *param);
+_TP_AVAILABLE_IN_0_18
 TpConnectionManagerParam *tp_protocol_dup_param (TpProtocol *self,
     const gchar *param);
 gboolean tp_protocol_has_param (TpProtocol *self,
     const gchar *param);
 gboolean tp_protocol_can_register (TpProtocol *self);
 GStrv tp_protocol_dup_param_names (TpProtocol *self) G_GNUC_WARN_UNUSED_RESULT;
+_TP_AVAILABLE_IN_0_18
 GList *tp_protocol_dup_params (TpProtocol *self) G_GNUC_WARN_UNUSED_RESULT;
+_TP_AVAILABLE_IN_0_18
 const TpConnectionManagerParam *tp_protocol_borrow_params (TpProtocol *self)
   G_GNUC_WARN_UNUSED_RESULT;
 
@@ -108,6 +112,7 @@ const gchar *tp_protocol_get_english_name (TpProtocol *self);
 const gchar *tp_protocol_get_icon_name (TpProtocol *self);
 TpCapabilities *tp_protocol_get_capabilities (TpProtocol *self);
 
+_TP_AVAILABLE_IN_0_16
 TpAvatarRequirements * tp_protocol_get_avatar_requirements (TpProtocol *self);
 
 G_END_DECLS
diff --git a/telepathy-glib/proxy.h b/telepathy-glib/proxy.h
index ed47bdb18..cd2c83850 100644
--- a/telepathy-glib/proxy.h
+++ b/telepathy-glib/proxy.h
@@ -157,6 +157,7 @@ GType tp_proxy_get_type (void);
 gboolean tp_proxy_has_interface_by_id (gpointer self, GQuark iface);
 gboolean tp_proxy_has_interface (gpointer self, const gchar *iface);
 
+_TP_AVAILABLE_IN_0_16
 TpSimpleClientFactory *tp_proxy_get_factory (gpointer self);
 
 TpDBusDaemon *tp_proxy_get_dbus_daemon (gpointer self);
diff --git a/telepathy-glib/room-info.h b/telepathy-glib/room-info.h
index d2ff367c2..d114c3240 100644
--- a/telepathy-glib/room-info.h
+++ b/telepathy-glib/room-info.h
@@ -23,6 +23,7 @@
 
 #include <glib-object.h>
 
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/handle.h>
 
 G_BEGIN_DECLS
@@ -42,6 +43,7 @@ struct _TpRoomInfo {
   TpRoomInfoPriv *priv;
 };
 
+_TP_AVAILABLE_IN_0_20
 GType tp_room_info_get_type (void);
 
 /* TYPE MACROS */
@@ -66,19 +68,30 @@ GType tp_room_info_get_type (void);
     TP_TYPE_ROOM_INFO, \
     TpRoomInfoClass))
 
+_TP_AVAILABLE_IN_0_20
 TpHandle tp_room_info_get_handle (TpRoomInfo *self);
+_TP_AVAILABLE_IN_0_20
 const gchar * tp_room_info_get_channel_type (TpRoomInfo *self);
+_TP_AVAILABLE_IN_0_20
 const gchar *tp_room_info_get_handle_name (TpRoomInfo *self);
+_TP_AVAILABLE_IN_0_20
 const gchar *tp_room_info_get_name (TpRoomInfo *self);
+_TP_AVAILABLE_IN_0_20
 const gchar *tp_room_info_get_description (TpRoomInfo *self);
+_TP_AVAILABLE_IN_0_20
 const gchar *tp_room_info_get_subject (TpRoomInfo *self);
+_TP_AVAILABLE_IN_0_20
 guint tp_room_info_get_members_count (TpRoomInfo *self,
     gboolean *known);
+_TP_AVAILABLE_IN_0_20
 gboolean tp_room_info_get_requires_password (TpRoomInfo *self,
     gboolean *known);
+_TP_AVAILABLE_IN_0_20
 gboolean tp_room_info_get_invite_only (TpRoomInfo *self,
     gboolean *known);
+_TP_AVAILABLE_IN_0_20
 const gchar *tp_room_info_get_room_id (TpRoomInfo *self);
+_TP_AVAILABLE_IN_0_20
 const gchar *tp_room_info_get_server (TpRoomInfo *self);
 
 G_END_DECLS
diff --git a/telepathy-glib/simple-approver.h b/telepathy-glib/simple-approver.h
index f82a96977..0925b7e06 100644
--- a/telepathy-glib/simple-approver.h
+++ b/telepathy-glib/simple-approver.h
@@ -90,6 +90,7 @@ TpBaseClient *tp_simple_approver_new_with_am (
     gpointer user_data,
     GDestroyNotify destroy);
 
+_TP_AVAILABLE_IN_0_16
 TpBaseClient *tp_simple_approver_new_with_factory (
     TpSimpleClientFactory *factory,
     const gchar *name,
diff --git a/telepathy-glib/simple-client-factory.h b/telepathy-glib/simple-client-factory.h
index 3b9a8d0b5..006daaa2f 100644
--- a/telepathy-glib/simple-client-factory.h
+++ b/telepathy-glib/simple-client-factory.h
@@ -28,6 +28,7 @@
 #include <telepathy-glib/connection.h>
 #include <telepathy-glib/contact.h>
 #include <telepathy-glib/dbus-daemon.h>
+#include <telepathy-glib/defs.h>
 
 G_BEGIN_DECLS
 
@@ -82,6 +83,7 @@ struct _TpSimpleClientFactory {
     TpSimpleClientFactoryPrivate *priv;
 };
 
+_TP_AVAILABLE_IN_0_16
 GType tp_simple_client_factory_get_type (void);
 
 #define TP_TYPE_SIMPLE_CLIENT_FACTORY \
@@ -100,70 +102,88 @@ GType tp_simple_client_factory_get_type (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_CLIENT_FACTORY, \
                               TpSimpleClientFactoryClass))
 
+_TP_AVAILABLE_IN_0_16
 TpSimpleClientFactory * tp_simple_client_factory_new (TpDBusDaemon *dbus);
 
+_TP_AVAILABLE_IN_0_16
 TpDBusDaemon *tp_simple_client_factory_get_dbus_daemon (
     TpSimpleClientFactory *self);
 
 /* TpAccount */
+_TP_AVAILABLE_IN_0_16
 TpAccount *tp_simple_client_factory_ensure_account (TpSimpleClientFactory *self,
     const gchar *object_path,
     const GHashTable *immutable_properties,
     GError **error);
+_TP_AVAILABLE_IN_0_16
 GArray *tp_simple_client_factory_dup_account_features (
     TpSimpleClientFactory *self,
     TpAccount *account);
+_TP_AVAILABLE_IN_0_16
 void tp_simple_client_factory_add_account_features (TpSimpleClientFactory *self,
     const GQuark *features);
+_TP_AVAILABLE_IN_0_16
 void tp_simple_client_factory_add_account_features_varargs (
     TpSimpleClientFactory *self,
     GQuark feature,
     ...);
 
 /* TpConnection */
+_TP_AVAILABLE_IN_0_16
 TpConnection *tp_simple_client_factory_ensure_connection (
     TpSimpleClientFactory *self,
     const gchar *object_path,
     const GHashTable *immutable_properties,
     GError **error);
+_TP_AVAILABLE_IN_0_16
 GArray *tp_simple_client_factory_dup_connection_features (
     TpSimpleClientFactory *self,
     TpConnection *connection);
+_TP_AVAILABLE_IN_0_16
 void tp_simple_client_factory_add_connection_features (
     TpSimpleClientFactory *self,
     const GQuark *features);
+_TP_AVAILABLE_IN_0_16
 void tp_simple_client_factory_add_connection_features_varargs (
     TpSimpleClientFactory *self,
     GQuark feature,
     ...);
 
 /* TpChannel */
+_TP_AVAILABLE_IN_0_16
 TpChannel *tp_simple_client_factory_ensure_channel (TpSimpleClientFactory *self,
     TpConnection *connection,
     const gchar *object_path,
     const GHashTable *immutable_properties,
     GError **error);
+_TP_AVAILABLE_IN_0_16
 GArray *tp_simple_client_factory_dup_channel_features (
     TpSimpleClientFactory *self,
     TpChannel *channel);
+_TP_AVAILABLE_IN_0_16
 void tp_simple_client_factory_add_channel_features (TpSimpleClientFactory *self,
     const GQuark *features);
+_TP_AVAILABLE_IN_0_16
 void tp_simple_client_factory_add_channel_features_varargs (
     TpSimpleClientFactory *self,
     GQuark feature,
     ...);
 
 /* TpContact */
+_TP_AVAILABLE_IN_0_16
 TpContact *tp_simple_client_factory_ensure_contact (TpSimpleClientFactory *self,
     TpConnection *connection,
     TpHandle handle,
     const gchar *identifier);
+_TP_AVAILABLE_IN_0_16
 GArray *tp_simple_client_factory_dup_contact_features (
     TpSimpleClientFactory *self,
     TpConnection *connection);
+_TP_AVAILABLE_IN_0_16
 void tp_simple_client_factory_add_contact_features (TpSimpleClientFactory *self,
     guint n_features,
     const TpContactFeature *features);
+_TP_AVAILABLE_IN_0_16
 void tp_simple_client_factory_add_contact_features_varargs (
     TpSimpleClientFactory *self,
     TpContactFeature feature,
diff --git a/telepathy-glib/simple-handler.h b/telepathy-glib/simple-handler.h
index 75890427d..48e5d765e 100644
--- a/telepathy-glib/simple-handler.h
+++ b/telepathy-glib/simple-handler.h
@@ -94,6 +94,7 @@ TpBaseClient *tp_simple_handler_new_with_am (TpAccountManager *account_manager,
     gpointer user_data,
     GDestroyNotify destroy);
 
+_TP_AVAILABLE_IN_0_16
 TpBaseClient *tp_simple_handler_new_with_factory (
     TpSimpleClientFactory *factory,
     gboolean bypass_approval,
diff --git a/telepathy-glib/simple-observer.h b/telepathy-glib/simple-observer.h
index 556644716..107ef3662 100644
--- a/telepathy-glib/simple-observer.h
+++ b/telepathy-glib/simple-observer.h
@@ -93,6 +93,7 @@ TpBaseClient *tp_simple_observer_new_with_am (
     gpointer user_data,
     GDestroyNotify destroy);
 
+_TP_AVAILABLE_IN_0_16
 TpBaseClient *tp_simple_observer_new_with_factory (
     TpSimpleClientFactory *factory,
     gboolean recover,
diff --git a/telepathy-glib/text-channel.h b/telepathy-glib/text-channel.h
index 4d9fec5d8..beb5e718a 100644
--- a/telepathy-glib/text-channel.h
+++ b/telepathy-glib/text-channel.h
@@ -23,6 +23,7 @@
 
 #include <telepathy-glib/channel.h>
 #include <telepathy-glib/client-message.h>
+#include <telepathy-glib/defs.h>
 #include <telepathy-glib/signalled-message.h>
 
 G_BEGIN_DECLS
@@ -110,10 +111,12 @@ gboolean tp_text_channel_ack_message_finish (TpTextChannel *self,
     GAsyncResult *result,
     GError **error);
 
+_TP_AVAILABLE_IN_0_16
 void tp_text_channel_ack_all_pending_messages_async (TpTextChannel *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_text_channel_ack_all_pending_messages_finish (TpTextChannel *self,
     GAsyncResult *result,
     GError **error);
@@ -129,17 +132,22 @@ gboolean tp_text_channel_set_chat_state_finish (TpTextChannel *self,
 
 #define TP_TEXT_CHANNEL_FEATURE_SMS \
   tp_text_channel_get_feature_quark_sms ()
+_TP_AVAILABLE_IN_0_16
 GQuark tp_text_channel_get_feature_quark_sms (void) G_GNUC_CONST;
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_text_channel_is_sms_channel (TpTextChannel *self);
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_text_channel_get_sms_flash (TpTextChannel *self);
 
+_TP_AVAILABLE_IN_0_16
 void tp_text_channel_get_sms_length_async (TpTextChannel *self,
     TpMessage *message,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
+_TP_AVAILABLE_IN_0_16
 gboolean tp_text_channel_get_sms_length_finish (TpTextChannel *self,
     GAsyncResult *result,
     guint *chunks_required,