summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.co.uk>2012-05-30 11:34:17 +0200
committerXavier Claessens <xavier.claessens@collabora.co.uk>2012-06-05 12:13:17 +0200
commit05287db8a5d4557435356df0fcd6e1cf202e6503 (patch)
treed81eeb4a8f026089fa8ec583e53e47d3fa0f33ea
parentd95d44bd327d96c5936deee1a3d970bcf27f29d0 (diff)
Add single-include #error in all headers included from telepathy-glib(-dbus).h
https://bugs.freedesktop.org/show_bug.cgi?id=49384
-rw-r--r--telepathy-glib/account-channel-request.h4
-rw-r--r--telepathy-glib/account-manager.h4
-rw-r--r--telepathy-glib/account-request.h4
-rw-r--r--telepathy-glib/account.h4
-rw-r--r--telepathy-glib/add-dispatch-operation-context.h4
-rw-r--r--telepathy-glib/automatic-client-factory.h4
-rw-r--r--telepathy-glib/automatic-proxy-factory.h4
-rw-r--r--telepathy-glib/base-call-channel.h4
-rw-r--r--telepathy-glib/base-call-content.h4
-rw-r--r--telepathy-glib/base-call-stream.h4
-rw-r--r--telepathy-glib/base-channel.h4
-rw-r--r--telepathy-glib/base-client.h4
-rw-r--r--telepathy-glib/base-connection-manager.h4
-rw-r--r--telepathy-glib/base-connection.h4
-rw-r--r--telepathy-glib/base-contact-list.h4
-rw-r--r--telepathy-glib/base-media-call-channel.h4
-rw-r--r--telepathy-glib/base-media-call-content.h4
-rw-r--r--telepathy-glib/base-media-call-stream.h4
-rw-r--r--telepathy-glib/base-password-channel.h4
-rw-r--r--telepathy-glib/base-protocol.h4
-rw-r--r--telepathy-glib/base-room-config.h4
-rw-r--r--telepathy-glib/basic-proxy-factory.h4
-rw-r--r--telepathy-glib/call-channel.h4
-rw-r--r--telepathy-glib/call-content-media-description.h4
-rw-r--r--telepathy-glib/call-content.h4
-rw-r--r--telepathy-glib/call-misc.h4
-rw-r--r--telepathy-glib/call-stream-endpoint.h4
-rw-r--r--telepathy-glib/call-stream.h4
-rw-r--r--telepathy-glib/capabilities.h4
-rw-r--r--telepathy-glib/channel-dispatch-operation.h4
-rw-r--r--telepathy-glib/channel-dispatcher.h4
-rw-r--r--telepathy-glib/channel-iface.h4
-rw-r--r--telepathy-glib/channel-manager.h4
-rw-r--r--telepathy-glib/channel-request.h4
-rw-r--r--telepathy-glib/channel.h4
-rw-r--r--telepathy-glib/client-channel-factory.h4
-rw-r--r--telepathy-glib/client-message.h4
-rw-r--r--telepathy-glib/client.h4
-rw-r--r--telepathy-glib/cm-message.h4
-rw-r--r--telepathy-glib/connection-contact-list.h4
-rw-r--r--telepathy-glib/connection-manager.h4
-rw-r--r--telepathy-glib/connection.h4
-rw-r--r--telepathy-glib/contact-operations.h4
-rw-r--r--telepathy-glib/contact-search-result.h4
-rw-r--r--telepathy-glib/contact-search.h4
-rw-r--r--telepathy-glib/contact.h4
-rw-r--r--telepathy-glib/contacts-mixin.h4
-rw-r--r--telepathy-glib/dbus-properties-mixin.h4
-rw-r--r--telepathy-glib/dbus-tube-channel.h4
-rw-r--r--telepathy-glib/dbus.h4
-rw-r--r--telepathy-glib/debug-client.h4
-rw-r--r--telepathy-glib/debug-message.h3
-rw-r--r--telepathy-glib/debug-sender.h4
-rw-r--r--telepathy-glib/debug.h4
-rw-r--r--telepathy-glib/defs.h4
-rw-r--r--telepathy-glib/dtmf.h4
-rw-r--r--telepathy-glib/enums.h4
-rw-r--r--telepathy-glib/errors.h4
-rw-r--r--telepathy-glib/exportable-channel.h4
-rw-r--r--telepathy-glib/file-transfer-channel.h4
-rw-r--r--telepathy-glib/gnio-util.h4
-rw-r--r--telepathy-glib/group-mixin.h4
-rw-r--r--telepathy-glib/gtypes.h4
-rw-r--r--telepathy-glib/handle-channels-context.h4
-rw-r--r--telepathy-glib/handle-repo-dynamic.h4
-rw-r--r--telepathy-glib/handle-repo-static.h4
-rw-r--r--telepathy-glib/handle-repo.h4
-rw-r--r--telepathy-glib/handle.h4
-rw-r--r--telepathy-glib/heap.h4
-rw-r--r--telepathy-glib/interfaces.h4
-rw-r--r--telepathy-glib/intset.h4
-rw-r--r--telepathy-glib/media-interfaces.h4
-rw-r--r--telepathy-glib/message-mixin.h4
-rw-r--r--telepathy-glib/message.h4
-rw-r--r--telepathy-glib/observe-channels-context.h4
-rw-r--r--telepathy-glib/presence-mixin.h4
-rw-r--r--telepathy-glib/protocol.h4
-rw-r--r--telepathy-glib/proxy.h4
-rw-r--r--telepathy-glib/room-info.h4
-rw-r--r--telepathy-glib/room-list.h4
-rw-r--r--telepathy-glib/run.h4
-rw-r--r--telepathy-glib/signalled-message.h4
-rw-r--r--telepathy-glib/simple-approver.h4
-rw-r--r--telepathy-glib/simple-client-factory.h4
-rw-r--r--telepathy-glib/simple-handler.h4
-rw-r--r--telepathy-glib/simple-observer.h4
-rw-r--r--telepathy-glib/simple-password-manager.h4
-rw-r--r--telepathy-glib/stream-tube-channel.h4
-rw-r--r--telepathy-glib/stream-tube-connection.h4
-rw-r--r--telepathy-glib/svc-account-manager.h4
-rw-r--r--telepathy-glib/svc-account.h4
-rw-r--r--telepathy-glib/svc-call.h4
-rw-r--r--telepathy-glib/svc-channel-dispatch-operation.h4
-rw-r--r--telepathy-glib/svc-channel-dispatcher.h4
-rw-r--r--telepathy-glib/svc-channel-request.h4
-rw-r--r--telepathy-glib/svc-channel.h4
-rw-r--r--telepathy-glib/svc-client.h4
-rw-r--r--telepathy-glib/svc-connection-manager.h4
-rw-r--r--telepathy-glib/svc-connection.h4
-rw-r--r--telepathy-glib/svc-debug.h4
-rw-r--r--telepathy-glib/svc-generic.h4
-rw-r--r--telepathy-glib/svc-media-interfaces.h4
-rw-r--r--telepathy-glib/svc-properties-interface.h4
-rw-r--r--telepathy-glib/svc-protocol.h4
-rw-r--r--telepathy-glib/svc-tls.h4
-rw-r--r--telepathy-glib/text-channel.h4
-rw-r--r--telepathy-glib/tls-certificate.h4
-rw-r--r--telepathy-glib/util.h4
108 files changed, 431 insertions, 0 deletions
diff --git a/telepathy-glib/account-channel-request.h b/telepathy-glib/account-channel-request.h
index fd136ae00..efe0bb42b 100644
--- a/telepathy-glib/account-channel-request.h
+++ b/telepathy-glib/account-channel-request.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_ACCOUNT_CHANNEL_REQUEST_H__
#define __TP_ACCOUNT_CHANNEL_REQUEST_H__
diff --git a/telepathy-glib/account-manager.h b/telepathy-glib/account-manager.h
index d5692978e..7c373ed8b 100644
--- a/telepathy-glib/account-manager.h
+++ b/telepathy-glib/account-manager.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_ACCOUNT_MANAGER_H
#define TP_ACCOUNT_MANAGER_H
diff --git a/telepathy-glib/account-request.h b/telepathy-glib/account-request.h
index dcada4a6c..9ec441255 100644
--- a/telepathy-glib/account-request.h
+++ b/telepathy-glib/account-request.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_ACCOUNT_REQUEST_H
#define TP_ACCOUNT_REQUEST_H
diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h
index d1f568486..e39542de8 100644
--- a/telepathy-glib/account.h
+++ b/telepathy-glib/account.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_ACCOUNT_H
#define TP_ACCOUNT_H
diff --git a/telepathy-glib/add-dispatch-operation-context.h b/telepathy-glib/add-dispatch-operation-context.h
index eed353a94..25d0e179d 100644
--- a/telepathy-glib/add-dispatch-operation-context.h
+++ b/telepathy-glib/add-dispatch-operation-context.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_ADD_DISPATCH_OPERATION_CONTEXT_H__
#define __TP_ADD_DISPATCH_OPERATION_CONTEXT_H__
diff --git a/telepathy-glib/automatic-client-factory.h b/telepathy-glib/automatic-client-factory.h
index 02707727b..d1b8e1871 100644
--- a/telepathy-glib/automatic-client-factory.h
+++ b/telepathy-glib/automatic-client-factory.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_AUTOMATIC_CLIENT_FACTORY_H__
#define __TP_AUTOMATIC_CLIENT_FACTORY_H__
diff --git a/telepathy-glib/automatic-proxy-factory.h b/telepathy-glib/automatic-proxy-factory.h
index 9a135f434..11f0f0c63 100644
--- a/telepathy-glib/automatic-proxy-factory.h
+++ b/telepathy-glib/automatic-proxy-factory.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_AUTOMATIC_PROXY_FACTORY_H__
#define __TP_AUTOMATIC_PROXY_FACTORY_H__
diff --git a/telepathy-glib/base-call-channel.h b/telepathy-glib/base-call-channel.h
index d905a7bf8..8130ccb3c 100644
--- a/telepathy-glib/base-call-channel.h
+++ b/telepathy-glib/base-call-channel.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_BASE_CALL_CHANNEL_H__
#define __TP_BASE_CALL_CHANNEL_H__
diff --git a/telepathy-glib/base-call-content.h b/telepathy-glib/base-call-content.h
index 1af8df505..6ce3a62f4 100644
--- a/telepathy-glib/base-call-content.h
+++ b/telepathy-glib/base-call-content.h
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_BASE_CALL_CONTENT_H
#define TP_BASE_CALL_CONTENT_H
diff --git a/telepathy-glib/base-call-stream.h b/telepathy-glib/base-call-stream.h
index 90ae597ec..ebeab6359 100644
--- a/telepathy-glib/base-call-stream.h
+++ b/telepathy-glib/base-call-stream.h
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_BASE_CALL_STREAM_H
#define TP_BASE_CALL_STREAM_H
diff --git a/telepathy-glib/base-channel.h b/telepathy-glib/base-channel.h
index 1a45bdaf6..2bb96aa6e 100644
--- a/telepathy-glib/base-channel.h
+++ b/telepathy-glib/base-channel.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_BASE_CHANNEL_H__
#define __TP_BASE_CHANNEL_H__
diff --git a/telepathy-glib/base-client.h b/telepathy-glib/base-client.h
index 9550b4260..07c130259 100644
--- a/telepathy-glib/base-client.h
+++ b/telepathy-glib/base-client.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_BASE_CLIENT_H__
#define __TP_BASE_CLIENT_H__
diff --git a/telepathy-glib/base-connection-manager.h b/telepathy-glib/base-connection-manager.h
index 6fd8f305b..8546e631c 100644
--- a/telepathy-glib/base-connection-manager.h
+++ b/telepathy-glib/base-connection-manager.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_BASE_CONNECTION_MANAGER_H__
#define __TP_BASE_CONNECTION_MANAGER_H__
diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
index 58492953a..07e34348a 100644
--- a/telepathy-glib/base-connection.h
+++ b/telepathy-glib/base-connection.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_BASE_CONNECTION_H__
#define __TP_BASE_CONNECTION_H__
diff --git a/telepathy-glib/base-contact-list.h b/telepathy-glib/base-contact-list.h
index 345b16fa6..3eb5b41b0 100644
--- a/telepathy-glib/base-contact-list.h
+++ b/telepathy-glib/base-contact-list.h
@@ -17,6 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_BASE_CONTACT_LIST_H__
#define __TP_BASE_CONTACT_LIST_H__
diff --git a/telepathy-glib/base-media-call-channel.h b/telepathy-glib/base-media-call-channel.h
index 9cc5bc820..72643c0c5 100644
--- a/telepathy-glib/base-media-call-channel.h
+++ b/telepathy-glib/base-media-call-channel.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_BASE_MEDIA_CALL_CHANNEL_H__
#define __TP_BASE_MEDIA_CALL_CHANNEL_H__
diff --git a/telepathy-glib/base-media-call-content.h b/telepathy-glib/base-media-call-content.h
index 4ad655531..d209dc855 100644
--- a/telepathy-glib/base-media-call-content.h
+++ b/telepathy-glib/base-media-call-content.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_BASE_MEDIA_CALL_CONTENT_H__
#define __TP_BASE_MEDIA_CALL_CONTENT_H__
diff --git a/telepathy-glib/base-media-call-stream.h b/telepathy-glib/base-media-call-stream.h
index adecc907f..b8ee262c0 100644
--- a/telepathy-glib/base-media-call-stream.h
+++ b/telepathy-glib/base-media-call-stream.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_BASE_MEDIA_CALL_STREAM_H__
#define __TP_BASE_MEDIA_CALL_STREAM_H__
diff --git a/telepathy-glib/base-password-channel.h b/telepathy-glib/base-password-channel.h
index 3f99acd1d..1cabae313 100644
--- a/telepathy-glib/base-password-channel.h
+++ b/telepathy-glib/base-password-channel.h
@@ -17,6 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_BASE_PASSWORD_CHANNEL_H__
#define __TP_BASE_PASSWORD_CHANNEL_H__
diff --git a/telepathy-glib/base-protocol.h b/telepathy-glib/base-protocol.h
index 23104cac4..6fd863c90 100644
--- a/telepathy-glib/base-protocol.h
+++ b/telepathy-glib/base-protocol.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_BASE_PROTOCOL_H
#define TP_BASE_PROTOCOL_H
diff --git a/telepathy-glib/base-room-config.h b/telepathy-glib/base-room-config.h
index 86104f93c..b6f0cc355 100644
--- a/telepathy-glib/base-room-config.h
+++ b/telepathy-glib/base-room-config.h
@@ -17,6 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_BASE_ROOM_CONFIG_H
#define TP_BASE_ROOM_CONFIG_H
diff --git a/telepathy-glib/basic-proxy-factory.h b/telepathy-glib/basic-proxy-factory.h
index c521d3e42..bce2d6a2f 100644
--- a/telepathy-glib/basic-proxy-factory.h
+++ b/telepathy-glib/basic-proxy-factory.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_BASIC_PROXY_FACTORY_H__
#define __TP_BASIC_PROXY_FACTORY_H__
diff --git a/telepathy-glib/call-channel.h b/telepathy-glib/call-channel.h
index d351ffbf7..d6cf07e2f 100644
--- a/telepathy-glib/call-channel.h
+++ b/telepathy-glib/call-channel.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CALL_CHANNEL_H__
#define __TP_CALL_CHANNEL_H__
diff --git a/telepathy-glib/call-content-media-description.h b/telepathy-glib/call-content-media-description.h
index 2f5c49964..8e85dbf93 100644
--- a/telepathy-glib/call-content-media-description.h
+++ b/telepathy-glib/call-content-media-description.h
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__
#define __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__
diff --git a/telepathy-glib/call-content.h b/telepathy-glib/call-content.h
index 635edb073..f31e5c7c4 100644
--- a/telepathy-glib/call-content.h
+++ b/telepathy-glib/call-content.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CALL_CONTENT_H__
#define __TP_CALL_CONTENT_H__
diff --git a/telepathy-glib/call-misc.h b/telepathy-glib/call-misc.h
index b420a0a8e..c0367c530 100644
--- a/telepathy-glib/call-misc.h
+++ b/telepathy-glib/call-misc.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CALL_MISC_H__
#define __TP_CALL_MISC_H__
diff --git a/telepathy-glib/call-stream-endpoint.h b/telepathy-glib/call-stream-endpoint.h
index d97592caa..431bd8a45 100644
--- a/telepathy-glib/call-stream-endpoint.h
+++ b/telepathy-glib/call-stream-endpoint.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CALL_STREAM_ENDPOINT_H__
#define __TP_CALL_STREAM_ENDPOINT_H__
diff --git a/telepathy-glib/call-stream.h b/telepathy-glib/call-stream.h
index 50f0c3643..855b03dff 100644
--- a/telepathy-glib/call-stream.h
+++ b/telepathy-glib/call-stream.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CALL_STREAM_H__
#define __TP_CALL_STREAM_H__
diff --git a/telepathy-glib/capabilities.h b/telepathy-glib/capabilities.h
index b8a98a447..8d027cb50 100644
--- a/telepathy-glib/capabilities.h
+++ b/telepathy-glib/capabilities.h
@@ -17,6 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CAPABILITIES_H__
#define __TP_CAPABILITIES_H__
diff --git a/telepathy-glib/channel-dispatch-operation.h b/telepathy-glib/channel-dispatch-operation.h
index fb1262f9c..074e4dc00 100644
--- a/telepathy-glib/channel-dispatch-operation.h
+++ b/telepathy-glib/channel-dispatch-operation.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_CHANNEL_DISPATCH_OPERATION_H
#define TP_CHANNEL_DISPATCH_OPERATION_H
diff --git a/telepathy-glib/channel-dispatcher.h b/telepathy-glib/channel-dispatcher.h
index 91e6b72bf..339437706 100644
--- a/telepathy-glib/channel-dispatcher.h
+++ b/telepathy-glib/channel-dispatcher.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_CHANNEL_DISPATCHER_H
#define TP_CHANNEL_DISPATCHER_H
diff --git a/telepathy-glib/channel-iface.h b/telepathy-glib/channel-iface.h
index 3943b9c78..47bdcb764 100644
--- a/telepathy-glib/channel-iface.h
+++ b/telepathy-glib/channel-iface.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CHANNEL_IFACE_H__
#define __TP_CHANNEL_IFACE_H__
diff --git a/telepathy-glib/channel-manager.h b/telepathy-glib/channel-manager.h
index 7b2f64d39..6fccce3e5 100644
--- a/telepathy-glib/channel-manager.h
+++ b/telepathy-glib/channel-manager.h
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_CHANNEL_MANAGER_H
#define TP_CHANNEL_MANAGER_H
diff --git a/telepathy-glib/channel-request.h b/telepathy-glib/channel-request.h
index 9cdf3794a..a2989490a 100644
--- a/telepathy-glib/channel-request.h
+++ b/telepathy-glib/channel-request.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_CHANNEL_REQUEST_H
#define TP_CHANNEL_REQUEST_H
diff --git a/telepathy-glib/channel.h b/telepathy-glib/channel.h
index 87ea77322..837fae8fd 100644
--- a/telepathy-glib/channel.h
+++ b/telepathy-glib/channel.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CHANNEL_H__
#define __TP_CHANNEL_H__
diff --git a/telepathy-glib/client-channel-factory.h b/telepathy-glib/client-channel-factory.h
index 12e8b1ee6..ebb86b284 100644
--- a/telepathy-glib/client-channel-factory.h
+++ b/telepathy-glib/client-channel-factory.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CLIENT_CHANNEL_FACTORY_H__
#define __TP_CLIENT_CHANNEL_FACTORY_H__
diff --git a/telepathy-glib/client-message.h b/telepathy-glib/client-message.h
index b8f8a21ac..e3ddfc971 100644
--- a/telepathy-glib/client-message.h
+++ b/telepathy-glib/client-message.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CLIENT_MESSAGE_H__
#define __TP_CLIENT_MESSAGE_H__
diff --git a/telepathy-glib/client.h b/telepathy-glib/client.h
index fce1220dc..003f4e2e7 100644
--- a/telepathy-glib/client.h
+++ b/telepathy-glib/client.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_CLIENT_H
#define TP_CLIENT_H
diff --git a/telepathy-glib/cm-message.h b/telepathy-glib/cm-message.h
index 79b63de93..a0516c1f6 100644
--- a/telepathy-glib/cm-message.h
+++ b/telepathy-glib/cm-message.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CM_MESSAGE_H__
#define __TP_CM_MESSAGE_H__
diff --git a/telepathy-glib/connection-contact-list.h b/telepathy-glib/connection-contact-list.h
index ab4d8bb6a..8a9f99d65 100644
--- a/telepathy-glib/connection-contact-list.h
+++ b/telepathy-glib/connection-contact-list.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CONNECTION_CONTACT_LIST_H__
#define __TP_CONNECTION_CONTACT_LIST_H__
diff --git a/telepathy-glib/connection-manager.h b/telepathy-glib/connection-manager.h
index 7590031d2..f7f6933ed 100644
--- a/telepathy-glib/connection-manager.h
+++ b/telepathy-glib/connection-manager.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CONNECTION_MANAGER_H__
#define __TP_CONNECTION_MANAGER_H__
diff --git a/telepathy-glib/connection.h b/telepathy-glib/connection.h
index 55a0061c9..0a6a9a9d4 100644
--- a/telepathy-glib/connection.h
+++ b/telepathy-glib/connection.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CONNECTION_H__
#define __TP_CONNECTION_H__
diff --git a/telepathy-glib/contact-operations.h b/telepathy-glib/contact-operations.h
index 65360f532..55a377f42 100644
--- a/telepathy-glib/contact-operations.h
+++ b/telepathy-glib/contact-operations.h
@@ -17,6 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CONTACT_OPERATIONS_H__
#define __TP_CONTACT_OPERATIONS_H__
diff --git a/telepathy-glib/contact-search-result.h b/telepathy-glib/contact-search-result.h
index 035afa397..4e9460277 100644
--- a/telepathy-glib/contact-search-result.h
+++ b/telepathy-glib/contact-search-result.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CONTACT_SEARCH_RESULT_H__
#define __TP_CONTACT_SEARCH_RESULT_H__
diff --git a/telepathy-glib/contact-search.h b/telepathy-glib/contact-search.h
index 24636ca6f..4a9b0a91d 100644
--- a/telepathy-glib/contact-search.h
+++ b/telepathy-glib/contact-search.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CONTACT_SEARCH_H__
#define __TP_CONTACT_SEARCH_H__
diff --git a/telepathy-glib/contact.h b/telepathy-glib/contact.h
index c91b3a376..56355d90d 100644
--- a/telepathy-glib/contact.h
+++ b/telepathy-glib/contact.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CONTACT_H__
#define __TP_CONTACT_H__
diff --git a/telepathy-glib/contacts-mixin.h b/telepathy-glib/contacts-mixin.h
index ff72a11e9..67cec1be8 100644
--- a/telepathy-glib/contacts-mixin.h
+++ b/telepathy-glib/contacts-mixin.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_CONTACTS_MIXIN_H__
#define __TP_CONTACTS_MIXIN_H__
diff --git a/telepathy-glib/dbus-properties-mixin.h b/telepathy-glib/dbus-properties-mixin.h
index 0f8bf1c07..dff7271f5 100644
--- a/telepathy-glib/dbus-properties-mixin.h
+++ b/telepathy-glib/dbus-properties-mixin.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_DBUS_PROPERTIES_MIXIN_H__
#define __TP_DBUS_PROPERTIES_MIXIN_H__
diff --git a/telepathy-glib/dbus-tube-channel.h b/telepathy-glib/dbus-tube-channel.h
index e4ab73be2..7d08eaed9 100644
--- a/telepathy-glib/dbus-tube-channel.h
+++ b/telepathy-glib/dbus-tube-channel.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_DBUS_TUBE_CHANNEL_H__
#define __TP_DBUS_TUBE_CHANNEL_H__
diff --git a/telepathy-glib/dbus.h b/telepathy-glib/dbus.h
index 53a26069c..f4d1b767b 100644
--- a/telepathy-glib/dbus.h
+++ b/telepathy-glib/dbus.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TELEPATHY_DBUS_H__
#define __TELEPATHY_DBUS_H__
#define __TP_IN_DBUS_H__
diff --git a/telepathy-glib/debug-client.h b/telepathy-glib/debug-client.h
index d7e69c860..74a8b2cc9 100644
--- a/telepathy-glib/debug-client.h
+++ b/telepathy-glib/debug-client.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_DEBUG_CLIENT_H
#define TP_DEBUG_CLIENT_H
diff --git a/telepathy-glib/debug-message.h b/telepathy-glib/debug-message.h
index 3aad8fd1a..eba53b19a 100644
--- a/telepathy-glib/debug-message.h
+++ b/telepathy-glib/debug-message.h
@@ -18,6 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
#ifndef __TP_DEBUG_MESSAGE_H__
#define __TP_DEBUG_MESSAGE_H__
diff --git a/telepathy-glib/debug-sender.h b/telepathy-glib/debug-sender.h
index de7a0d182..aa8bac918 100644
--- a/telepathy-glib/debug-sender.h
+++ b/telepathy-glib/debug-sender.h
@@ -17,6 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_DEBUG_SENDER_H__
#define __TP_DEBUG_SENDER_H__
diff --git a/telepathy-glib/debug.h b/telepathy-glib/debug.h
index d04e2dbfb..6014bf114 100644
--- a/telepathy-glib/debug.h
+++ b/telepathy-glib/debug.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_DEBUG_H__
#define __TP_DEBUG_H__
diff --git a/telepathy-glib/defs.h b/telepathy-glib/defs.h
index 3d7a7d893..d7a36c66a 100644
--- a/telepathy-glib/defs.h
+++ b/telepathy-glib/defs.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_DEFS_H__
#define __TP_DEFS_H__
diff --git a/telepathy-glib/dtmf.h b/telepathy-glib/dtmf.h
index c505aa0ce..b147e816b 100644
--- a/telepathy-glib/dtmf.h
+++ b/telepathy-glib/dtmf.h
@@ -17,6 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_DTMF_H__
#define __TP_DTMF_H__
diff --git a/telepathy-glib/enums.h b/telepathy-glib/enums.h
index c4c0e2b09..735177e6d 100644
--- a/telepathy-glib/enums.h
+++ b/telepathy-glib/enums.h
@@ -1,6 +1,10 @@
#ifndef __TP_ENUMS_H__
#define __TP_ENUMS_H__
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#include <telepathy-glib/_gen/telepathy-enums.h>
#include <telepathy-glib/_gen/genums.h>
diff --git a/telepathy-glib/errors.h b/telepathy-glib/errors.h
index c0cc14198..80ce3b55b 100644
--- a/telepathy-glib/errors.h
+++ b/telepathy-glib/errors.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_ERRORS_H__
#define __TP_ERRORS_H__
diff --git a/telepathy-glib/exportable-channel.h b/telepathy-glib/exportable-channel.h
index 2e83a7de9..6bc0384c5 100644
--- a/telepathy-glib/exportable-channel.h
+++ b/telepathy-glib/exportable-channel.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_EXPORTABLE_CHANNEL_H
#define TP_EXPORTABLE_CHANNEL_H
diff --git a/telepathy-glib/file-transfer-channel.h b/telepathy-glib/file-transfer-channel.h
index 83c455023..cbd645e4f 100644
--- a/telepathy-glib/file-transfer-channel.h
+++ b/telepathy-glib/file-transfer-channel.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_FILE_TRANSFER_CHANNEL_H__
#define __TP_FILE_TRANSFER_CHANNEL_H__
diff --git a/telepathy-glib/gnio-util.h b/telepathy-glib/gnio-util.h
index 1ce7e1561..d82c17da5 100644
--- a/telepathy-glib/gnio-util.h
+++ b/telepathy-glib/gnio-util.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#include <glib-object.h>
#include <gio/gio.h>
diff --git a/telepathy-glib/group-mixin.h b/telepathy-glib/group-mixin.h
index caf8ce31e..4020e2cbd 100644
--- a/telepathy-glib/group-mixin.h
+++ b/telepathy-glib/group-mixin.h
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_GROUP_MIXIN_H__
#define __TP_GROUP_MIXIN_H__
diff --git a/telepathy-glib/gtypes.h b/telepathy-glib/gtypes.h
index 3f481a8dd..e7d53c766 100644
--- a/telepathy-glib/gtypes.h
+++ b/telepathy-glib/gtypes.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_GTYPES_H__
#define __TP_GTYPES_H__
diff --git a/telepathy-glib/handle-channels-context.h b/telepathy-glib/handle-channels-context.h
index 95ad682af..aaa28d6a8 100644
--- a/telepathy-glib/handle-channels-context.h
+++ b/telepathy-glib/handle-channels-context.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_HANDLE_CHANNELS_CONTEXT_H__
#define __TP_HANDLE_CHANNELS_CONTEXT_H__
diff --git a/telepathy-glib/handle-repo-dynamic.h b/telepathy-glib/handle-repo-dynamic.h
index bfd43413c..be4f33f40 100644
--- a/telepathy-glib/handle-repo-dynamic.h
+++ b/telepathy-glib/handle-repo-dynamic.h
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_HANDLE_REPO_DYNAMIC_H__
#define __TP_HANDLE_REPO_DYNAMIC_H__
diff --git a/telepathy-glib/handle-repo-static.h b/telepathy-glib/handle-repo-static.h
index 47f5f722b..6ea2b916d 100644
--- a/telepathy-glib/handle-repo-static.h
+++ b/telepathy-glib/handle-repo-static.h
@@ -21,6 +21,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_HANDLE_REPO_STATIC_H__
#define __TP_HANDLE_REPO_STATIC_H__
diff --git a/telepathy-glib/handle-repo.h b/telepathy-glib/handle-repo.h
index cfe58e4e7..ece3faf3c 100644
--- a/telepathy-glib/handle-repo.h
+++ b/telepathy-glib/handle-repo.h
@@ -21,6 +21,10 @@
*
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_HANDLE_REPO_H__
#define __TP_HANDLE_REPO_H__
diff --git a/telepathy-glib/handle.h b/telepathy-glib/handle.h
index 25a46ec96..70c94506b 100644
--- a/telepathy-glib/handle.h
+++ b/telepathy-glib/handle.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_HANDLE_H__
#define __TP_HANDLE_H__
diff --git a/telepathy-glib/heap.h b/telepathy-glib/heap.h
index cca243cf4..426777f1f 100644
--- a/telepathy-glib/heap.h
+++ b/telepathy-glib/heap.h
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_HEAP_H__
#define __TP_HEAP_H__
diff --git a/telepathy-glib/interfaces.h b/telepathy-glib/interfaces.h
index 202d38976..ee9812016 100644
--- a/telepathy-glib/interfaces.h
+++ b/telepathy-glib/interfaces.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_INTERFACES_H__
#define __TP_INTERFACES_H__
diff --git a/telepathy-glib/intset.h b/telepathy-glib/intset.h
index e1ac2e824..c56715bd1 100644
--- a/telepathy-glib/intset.h
+++ b/telepathy-glib/intset.h
@@ -20,6 +20,10 @@
*
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_INTSET_H__
#define __TP_INTSET_H__
diff --git a/telepathy-glib/media-interfaces.h b/telepathy-glib/media-interfaces.h
index 6dc601505..71bcd0e72 100644
--- a/telepathy-glib/media-interfaces.h
+++ b/telepathy-glib/media-interfaces.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_MEDIA_INTERFACES_H__
#define __TP_MEDIA_INTERFACES_H__
diff --git a/telepathy-glib/message-mixin.h b/telepathy-glib/message-mixin.h
index 2293733d7..5dde0992f 100644
--- a/telepathy-glib/message-mixin.h
+++ b/telepathy-glib/message-mixin.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_MESSAGE_MIXIN_H
#define TP_MESSAGE_MIXIN_H
diff --git a/telepathy-glib/message.h b/telepathy-glib/message.h
index 1e35384d0..5f2ddf8aa 100644
--- a/telepathy-glib/message.h
+++ b/telepathy-glib/message.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_MESSAGE_H__
#define __TP_MESSAGE_H__
diff --git a/telepathy-glib/observe-channels-context.h b/telepathy-glib/observe-channels-context.h
index 3666289aa..1c8ea4791 100644
--- a/telepathy-glib/observe-channels-context.h
+++ b/telepathy-glib/observe-channels-context.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_OBSERVE_CHANNELS_CONTEXT_H__
#define __TP_OBSERVE_CHANNELS_CONTEXT_H__
diff --git a/telepathy-glib/presence-mixin.h b/telepathy-glib/presence-mixin.h
index 48cef758e..63d2c7e38 100644
--- a/telepathy-glib/presence-mixin.h
+++ b/telepathy-glib/presence-mixin.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_PRESENCE_MIXIN_H__
#define __TP_PRESENCE_MIXIN_H__
diff --git a/telepathy-glib/protocol.h b/telepathy-glib/protocol.h
index da729a6c7..af64c3a24 100644
--- a/telepathy-glib/protocol.h
+++ b/telepathy-glib/protocol.h
@@ -17,6 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef TP_PROTOCOL_H
#define TP_PROTOCOL_H
diff --git a/telepathy-glib/proxy.h b/telepathy-glib/proxy.h
index 300b507e9..04f414114 100644
--- a/telepathy-glib/proxy.h
+++ b/telepathy-glib/proxy.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_PROXY_H__
#define __TP_PROXY_H__
diff --git a/telepathy-glib/room-info.h b/telepathy-glib/room-info.h
index d114c3240..0b33bc1f2 100644
--- a/telepathy-glib/room-info.h
+++ b/telepathy-glib/room-info.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_ROOM_INFO_H__
#define __TP_ROOM_INFO_H__
diff --git a/telepathy-glib/room-list.h b/telepathy-glib/room-list.h
index bc1042c41..221b9aa9e 100644
--- a/telepathy-glib/room-list.h
+++ b/telepathy-glib/room-list.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_ROOM_LIST_H__
#define __TP_ROOM_LIST_H__
diff --git a/telepathy-glib/run.h b/telepathy-glib/run.h
index 21c0ef3c4..463a3e6f2 100644
--- a/telepathy-glib/run.h
+++ b/telepathy-glib/run.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_RUN_H__
#define __TP_RUN_H__
diff --git a/telepathy-glib/signalled-message.h b/telepathy-glib/signalled-message.h
index 9b72e56e3..6fa8f45f5 100644
--- a/telepathy-glib/signalled-message.h
+++ b/telepathy-glib/signalled-message.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_SIGNALLED_MESSAGE_H__
#define __TP_SIGNALLED_MESSAGE_H__
diff --git a/telepathy-glib/simple-approver.h b/telepathy-glib/simple-approver.h
index 0925b7e06..74e01aed0 100644
--- a/telepathy-glib/simple-approver.h
+++ b/telepathy-glib/simple-approver.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_SIMPLE_APPROVER_H__
#define __TP_SIMPLE_APPROVER_H__
diff --git a/telepathy-glib/simple-client-factory.h b/telepathy-glib/simple-client-factory.h
index ced250405..03e94a1ea 100644
--- a/telepathy-glib/simple-client-factory.h
+++ b/telepathy-glib/simple-client-factory.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_SIMPLE_CLIENT_FACTORY_H__
#define __TP_SIMPLE_CLIENT_FACTORY_H__
diff --git a/telepathy-glib/simple-handler.h b/telepathy-glib/simple-handler.h
index 48e5d765e..6d4a21f99 100644
--- a/telepathy-glib/simple-handler.h
+++ b/telepathy-glib/simple-handler.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_SIMPLE_HANDLER_H__
#define __TP_SIMPLE_HANDLER_H__
diff --git a/telepathy-glib/simple-observer.h b/telepathy-glib/simple-observer.h
index 107ef3662..512f928b6 100644
--- a/telepathy-glib/simple-observer.h
+++ b/telepathy-glib/simple-observer.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_SIMPLE_OBSERVER_H__
#define __TP_SIMPLE_OBSERVER_H__
diff --git a/telepathy-glib/simple-password-manager.h b/telepathy-glib/simple-password-manager.h
index 854cb80dc..6842201c6 100644
--- a/telepathy-glib/simple-password-manager.h
+++ b/telepathy-glib/simple-password-manager.h
@@ -17,6 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_SIMPLE_PASSWORD_MANAGER_H__
#define __TP_SIMPLE_PASSWORD_MANAGER_H__
diff --git a/telepathy-glib/stream-tube-channel.h b/telepathy-glib/stream-tube-channel.h
index 39c2c7e6f..26709a5d8 100644
--- a/telepathy-glib/stream-tube-channel.h
+++ b/telepathy-glib/stream-tube-channel.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_STREAM_TUBE_CHANNEL_H__
#define __TP_STREAM_TUBE_CHANNEL_H__
diff --git a/telepathy-glib/stream-tube-connection.h b/telepathy-glib/stream-tube-connection.h
index 771affe6e..9cba4769e 100644
--- a/telepathy-glib/stream-tube-connection.h
+++ b/telepathy-glib/stream-tube-connection.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_STREAM_TUBE_CONNECTION_H__
#define __TP_STREAM_TUBE_CONNECTION_H__
diff --git a/telepathy-glib/svc-account-manager.h b/telepathy-glib/svc-account-manager.h
index ed7b4e248..a2daf3412 100644
--- a/telepathy-glib/svc-account-manager.h
+++ b/telepathy-glib/svc-account-manager.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_META_SVC_ACCOUNT_MANAGER_H__
#define __TP_META_SVC_ACCOUNT_MANAGER_H__
diff --git a/telepathy-glib/svc-account.h b/telepathy-glib/svc-account.h
index 1818cb3af..187323ded 100644
--- a/telepathy-glib/svc-account.h
+++ b/telepathy-glib/svc-account.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_META_SVC_ACCOUNT_H__
#define __TP_META_SVC_ACCOUNT_H__
diff --git a/telepathy-glib/svc-call.h b/telepathy-glib/svc-call.h
index 76cd6c7d9..b785841ab 100644
--- a/telepathy-glib/svc-call.h
+++ b/telepathy-glib/svc-call.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_META_SVC_ACCOUNT_H__
#define __TP_META_SVC_ACCOUNT_H__
diff --git a/telepathy-glib/svc-channel-dispatch-operation.h b/telepathy-glib/svc-channel-dispatch-operation.h
index ae74c5435..2bbe054ec 100644
--- a/telepathy-glib/svc-channel-dispatch-operation.h
+++ b/telepathy-glib/svc-channel-dispatch-operation.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_META_SVC_CHANNEL_DISPATCH_OPERATION_H__
#define __TP_META_SVC_CHANNEL_DISPATCH_OPERATION_H__
diff --git a/telepathy-glib/svc-channel-dispatcher.h b/telepathy-glib/svc-channel-dispatcher.h
index 87ad45973..f8e2cbd8d 100644
--- a/telepathy-glib/svc-channel-dispatcher.h
+++ b/telepathy-glib/svc-channel-dispatcher.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_META_SVC_CHANNEL_DISPATCHER_H__
#define __TP_META_SVC_CHANNEL_DISPATCHER_H__
diff --git a/telepathy-glib/svc-channel-request.h b/telepathy-glib/svc-channel-request.h
index f849a8239..781d6e03a 100644
--- a/telepathy-glib/svc-channel-request.h
+++ b/telepathy-glib/svc-channel-request.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_META_SVC_CHANNEL_REQUEST_H__
#define __TP_META_SVC_CHANNEL_REQUEST_H__
diff --git a/telepathy-glib/svc-channel.h b/telepathy-glib/svc-channel.h
index 479ab7eec..452a93358 100644
--- a/telepathy-glib/svc-channel.h
+++ b/telepathy-glib/svc-channel.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_META_SVC_CHANNEL_H__
#define __TP_META_SVC_CHANNEL_H__
diff --git a/telepathy-glib/svc-client.h b/telepathy-glib/svc-client.h
index d774a9d9d..c7aab8a61 100644
--- a/telepathy-glib/svc-client.h
+++ b/telepathy-glib/svc-client.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_META_SVC_CLIENT_H__
#define __TP_META_SVC_CLIENT_H__
diff --git a/telepathy-glib/svc-connection-manager.h b/telepathy-glib/svc-connection-manager.h
index b0cd98dce..cb5e04cb1 100644
--- a/telepathy-glib/svc-connection-manager.h
+++ b/telepathy-glib/svc-connection-manager.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_META_SVC_CONNECTION_MANAGER_H__
#define __TP_META_SVC_CONNECTION_MANAGER_H__
diff --git a/telepathy-glib/svc-connection.h b/telepathy-glib/svc-connection.h
index 6cfa7dd77..60e8437de 100644
--- a/telepathy-glib/svc-connection.h
+++ b/telepathy-glib/svc-connection.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_META_SVC_CONNECTION_H__
#define __TP_META_SVC_CONNECTION_H__
diff --git a/telepathy-glib/svc-debug.h b/telepathy-glib/svc-debug.h
index abedc378e..682e63117 100644
--- a/telepathy-glib/svc-debug.h
+++ b/telepathy-glib/svc-debug.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_SVC_DEBUG_H__
#define __TP_SVC_DEBUG_H__
diff --git a/telepathy-glib/svc-generic.h b/telepathy-glib/svc-generic.h
index 326cd7d2d..bcb4775f6 100644
--- a/telepathy-glib/svc-generic.h
+++ b/telepathy-glib/svc-generic.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_SVC_GENERIC_H__
#define __TP_SVC_GENERIC_H__
diff --git a/telepathy-glib/svc-media-interfaces.h b/telepathy-glib/svc-media-interfaces.h
index c1c27ad38..004f94241 100644
--- a/telepathy-glib/svc-media-interfaces.h
+++ b/telepathy-glib/svc-media-interfaces.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_SVC_MEDIA_INTERFACES_H__
#define __TP_SVC_MEDIA_INTERFACES_H__
diff --git a/telepathy-glib/svc-properties-interface.h b/telepathy-glib/svc-properties-interface.h
index 1f9a066be..2cae3d070 100644
--- a/telepathy-glib/svc-properties-interface.h
+++ b/telepathy-glib/svc-properties-interface.h
@@ -1,2 +1,6 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
/* svc-properties-interface is now officially svc-generic */
#include <telepathy-glib/svc-generic.h>
diff --git a/telepathy-glib/svc-protocol.h b/telepathy-glib/svc-protocol.h
index 934d44f20..8e0b3d631 100644
--- a/telepathy-glib/svc-protocol.h
+++ b/telepathy-glib/svc-protocol.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_META_SVC_PROTOCOL_H__
#define __TP_META_SVC_PROTOCOL_H__
diff --git a/telepathy-glib/svc-tls.h b/telepathy-glib/svc-tls.h
index 9c4fc561a..8b03e503d 100644
--- a/telepathy-glib/svc-tls.h
+++ b/telepathy-glib/svc-tls.h
@@ -1,3 +1,7 @@
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_META_SVC_TLS_H__
#define __TP_META_SVC_TLS_H__
diff --git a/telepathy-glib/text-channel.h b/telepathy-glib/text-channel.h
index 828def48d..c4f782978 100644
--- a/telepathy-glib/text-channel.h
+++ b/telepathy-glib/text-channel.h
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_TEXT_CHANNEL_H__
#define __TP_TEXT_CHANNEL_H__
diff --git a/telepathy-glib/tls-certificate.h b/telepathy-glib/tls-certificate.h
index 72b1c018d..0b2886983 100644
--- a/telepathy-glib/tls-certificate.h
+++ b/telepathy-glib/tls-certificate.h
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_TLS_CERTIFICATE_H__
#define __TP_TLS_CERTIFICATE_H__
diff --git a/telepathy-glib/util.h b/telepathy-glib/util.h
index 3474e7ee5..cad2507ce 100644
--- a/telepathy-glib/util.h
+++ b/telepathy-glib/util.h
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)
+#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly."
+#endif
+
#ifndef __TP_UTIL_H__
#define __TP_UTIL_H__
#define __TP_IN_UTIL_H__