Make including fancy headers mandatory.

Build error if not including fancy headers files (#error directive).

95 files changed, 364 insertions, 6 deletions

diff --git a/TelepathyQt4/Client/Account b/TelepathyQt4/Client/Account
index c5d2dbd0..a3ff0260 100644
--- a/TelepathyQt4/Client/Account
+++ b/TelepathyQt4/Client/Account
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_Account_HEADER_GUARD_
 #define _TelepathyQt4_Client_Account_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/account.h>
 
 #endif
diff --git a/TelepathyQt4/Client/AccountInterface b/TelepathyQt4/Client/AccountInterface
index 06123aab..1d91eae7 100644
--- a/TelepathyQt4/Client/AccountInterface
+++ b/TelepathyQt4/Client/AccountInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_AccountInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_AccountInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/account.h>
 
 #endif
diff --git a/TelepathyQt4/Client/AccountManager b/TelepathyQt4/Client/AccountManager
index 194e6385..af2ebf1a 100644
--- a/TelepathyQt4/Client/AccountManager
+++ b/TelepathyQt4/Client/AccountManager
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_AccountManager_HEADER_GUARD_
 #define _TelepathyQt4_Client_AccountManager_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/account-manager.h>
 
 #endif
diff --git a/TelepathyQt4/Client/AccountManagerInterface b/TelepathyQt4/Client/AccountManagerInterface
index eb9e3511..b67f45f4 100644
--- a/TelepathyQt4/Client/AccountManagerInterface
+++ b/TelepathyQt4/Client/AccountManagerInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_AccountManagerInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_AccountManagerInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/account-manager.h>
 
 #endif
diff --git a/TelepathyQt4/Client/Channel b/TelepathyQt4/Client/Channel
index b5ae6be2..97707248 100644
--- a/TelepathyQt4/Client/Channel
+++ b/TelepathyQt4/Client/Channel
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_Channel_HEADER_GUARD_
 #define _TelepathyQt4_Client_Channel_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ChannelInterface b/TelepathyQt4/Client/ChannelInterface
index 1dd363a2..6349a761 100644
--- a/TelepathyQt4/Client/ChannelInterface
+++ b/TelepathyQt4/Client/ChannelInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ChannelInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ChannelInterfaceCallStateInterface b/TelepathyQt4/Client/ChannelInterfaceCallStateInterface
index fb734acb..2b4c3f96 100644
--- a/TelepathyQt4/Client/ChannelInterfaceCallStateInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceCallStateInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ChannelInterfaceCallStateInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterfaceCallStateInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ChannelInterfaceChatStateInterface b/TelepathyQt4/Client/ChannelInterfaceChatStateInterface
index f3ffa25a..87dab8f9 100644
--- a/TelepathyQt4/Client/ChannelInterfaceChatStateInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceChatStateInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ChannelInterfaceChatStateInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterfaceChatStateInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ChannelInterfaceDTMFInterface b/TelepathyQt4/Client/ChannelInterfaceDTMFInterface
index be01e0f3..a84d1335 100644
--- a/TelepathyQt4/Client/ChannelInterfaceDTMFInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceDTMFInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ChannelInterfaceDTMFInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterfaceDTMFInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ChannelInterfaceGroupInterface b/TelepathyQt4/Client/ChannelInterfaceGroupInterface
index a0287b18..7db89bae 100644
--- a/TelepathyQt4/Client/ChannelInterfaceGroupInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceGroupInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ChannelInterfaceGroupInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterfaceGroupInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ChannelInterfaceHoldInterface b/TelepathyQt4/Client/ChannelInterfaceHoldInterface
index ca552a11..c1518a2d 100644
--- a/TelepathyQt4/Client/ChannelInterfaceHoldInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceHoldInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ChannelInterfaceHoldInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterfaceHoldInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface b/TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface
index fbc88087..19391e03 100644
--- a/TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ChannelInterfaceMediaSignallingInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterfaceMediaSignallingInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ChannelInterfacePasswordInterface b/TelepathyQt4/Client/ChannelInterfacePasswordInterface
index ad1de3d6..f06dfe8b 100644
--- a/TelepathyQt4/Client/ChannelInterfacePasswordInterface
+++ b/TelepathyQt4/Client/ChannelInterfacePasswordInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ChannelInterfacePasswordInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterfacePasswordInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ChannelTypeContactListInterface b/TelepathyQt4/Client/ChannelTypeContactListInterface
index 83e83e86..0fea75d4 100644
--- a/TelepathyQt4/Client/ChannelTypeContactListInterface
+++ b/TelepathyQt4/Client/ChannelTypeContactListInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ChannelTypeContactListInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelTypeContactListInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ChannelTypeRoomListInterface b/TelepathyQt4/Client/ChannelTypeRoomListInterface
index eb201931..61c885f3 100644
--- a/TelepathyQt4/Client/ChannelTypeRoomListInterface
+++ b/TelepathyQt4/Client/ChannelTypeRoomListInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ChannelTypeRoomListInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelTypeRoomListInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ChannelTypeStreamedMediaInterface b/TelepathyQt4/Client/ChannelTypeStreamedMediaInterface
index 22a5e640..169466a5 100644
--- a/TelepathyQt4/Client/ChannelTypeStreamedMediaInterface
+++ b/TelepathyQt4/Client/ChannelTypeStreamedMediaInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ChannelTypeStreamedMediaInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelTypeStreamedMediaInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ChannelTypeTextInterface b/TelepathyQt4/Client/ChannelTypeTextInterface
index 5fcab0d6..d7e1c2f0 100644
--- a/TelepathyQt4/Client/ChannelTypeTextInterface
+++ b/TelepathyQt4/Client/ChannelTypeTextInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ChannelTypeTextInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelTypeTextInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ChannelTypeTubesInterface b/TelepathyQt4/Client/ChannelTypeTubesInterface
index b822a5c8..f3921614 100644
--- a/TelepathyQt4/Client/ChannelTypeTubesInterface
+++ b/TelepathyQt4/Client/ChannelTypeTubesInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ChannelTypeTubesInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelTypeTubesInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/Connection b/TelepathyQt4/Client/Connection
index b2f2ed7a..d14a5429 100644
--- a/TelepathyQt4/Client/Connection
+++ b/TelepathyQt4/Client/Connection
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_Connection_HEADER_GUARD_
 #define _TelepathyQt4_Client_Connection_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/connection.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ConnectionInterface b/TelepathyQt4/Client/ConnectionInterface
index 593fb4ed..29fe0a5b 100644
--- a/TelepathyQt4/Client/ConnectionInterface
+++ b/TelepathyQt4/Client/ConnectionInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/connection.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ConnectionInterfaceAliasingInterface b/TelepathyQt4/Client/ConnectionInterfaceAliasingInterface
index 460a7e96..5b4e5ce0 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceAliasingInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceAliasingInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterfaceAliasingInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterfaceAliasingInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/connection.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface b/TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface
index 605f8785..d23207d9 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterfaceAvatarsInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterfaceAvatarsInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/connection.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface b/TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface
index acf256a5..ac3f450d 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterfaceCapabilitiesInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterfaceCapabilitiesInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/connection.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ConnectionInterfaceContactsInterface b/TelepathyQt4/Client/ConnectionInterfaceContactsInterface
index ef7a6967..0885d785 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceContactsInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceContactsInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterfaceContactsInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterfaceContactsInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/connection.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ConnectionInterfacePresenceInterface b/TelepathyQt4/Client/ConnectionInterfacePresenceInterface
index 7a8dd4b7..a7c6326f 100644
--- a/TelepathyQt4/Client/ConnectionInterfacePresenceInterface
+++ b/TelepathyQt4/Client/ConnectionInterfacePresenceInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterfacePresenceInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterfacePresenceInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/connection.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ConnectionInterfaceRequestsInterface b/TelepathyQt4/Client/ConnectionInterfaceRequestsInterface
index a527cc3f..b3d14b1b 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceRequestsInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceRequestsInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterfaceRequestsInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterfaceRequestsInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/connection.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface b/TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface
index 2d0c29a5..78ec2e0a 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterfaceSimplePresenceInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterfaceSimplePresenceInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/connection.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ConnectionManager b/TelepathyQt4/Client/ConnectionManager
index 194bd295..f3352246 100644
--- a/TelepathyQt4/Client/ConnectionManager
+++ b/TelepathyQt4/Client/ConnectionManager
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ConnectionManager_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionManager_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/connection-manager.h>
 
 #endif
diff --git a/TelepathyQt4/Client/ConnectionManagerInterface b/TelepathyQt4/Client/ConnectionManagerInterface
index 9146f06b..3d869fb1 100644
--- a/TelepathyQt4/Client/ConnectionManagerInterface
+++ b/TelepathyQt4/Client/ConnectionManagerInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_ConnectionManagerInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionManagerInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/connection-manager.h>
 
 #endif
diff --git a/TelepathyQt4/Client/DBus b/TelepathyQt4/Client/DBus
index ac073832..a4beffce 100644
--- a/TelepathyQt4/Client/DBus
+++ b/TelepathyQt4/Client/DBus
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_DBus_HEADER_GUARD_
 #define _TelepathyQt4_Client_DBus_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/dbus.h>
 
 #endif
diff --git a/TelepathyQt4/Client/DBusDaemonInterface b/TelepathyQt4/Client/DBusDaemonInterface
index 3a9de0bf..ee48ce97 100644
--- a/TelepathyQt4/Client/DBusDaemonInterface
+++ b/TelepathyQt4/Client/DBusDaemonInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_DBusDaemonInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_DBusDaemonInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/dbus.h>
 
 #endif
diff --git a/TelepathyQt4/Client/DBusProxy b/TelepathyQt4/Client/DBusProxy
index 3b4fbd20..b6939e36 100644
--- a/TelepathyQt4/Client/DBusProxy
+++ b/TelepathyQt4/Client/DBusProxy
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_DBusProxy_HEADER_GUARD_
 #define _TelepathyQt4_Client_DBusProxy_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/dbus-proxy.h>
 
 #endif
diff --git a/TelepathyQt4/Client/IntrospectableInterface b/TelepathyQt4/Client/IntrospectableInterface
index 16ac3f1c..5af81fc4 100644
--- a/TelepathyQt4/Client/IntrospectableInterface
+++ b/TelepathyQt4/Client/IntrospectableInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_IntrospectableInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_IntrospectableInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/dbus.h>
 
 #endif
diff --git a/TelepathyQt4/Client/MediaSessionHandler b/TelepathyQt4/Client/MediaSessionHandler
index 5c82be0b..e1b6408b 100644
--- a/TelepathyQt4/Client/MediaSessionHandler
+++ b/TelepathyQt4/Client/MediaSessionHandler
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_MediaSessionHandler_HEADER_GUARD_
 #define _TelepathyQt4_Client_MediaSessionHandler_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/media-session-handler.h>
 
 #endif
diff --git a/TelepathyQt4/Client/MediaSessionHandlerInterface b/TelepathyQt4/Client/MediaSessionHandlerInterface
index 43ef02b9..42a0bb7b 100644
--- a/TelepathyQt4/Client/MediaSessionHandlerInterface
+++ b/TelepathyQt4/Client/MediaSessionHandlerInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_MediaSessionHandlerInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_MediaSessionHandlerInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/media-session-handler.h>
 
 #endif
diff --git a/TelepathyQt4/Client/MediaStreamHandler b/TelepathyQt4/Client/MediaStreamHandler
index ec346408..afd06583 100644
--- a/TelepathyQt4/Client/MediaStreamHandler
+++ b/TelepathyQt4/Client/MediaStreamHandler
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_MediaStreamHandler_HEADER_GUARD_
 #define _TelepathyQt4_Client_MediaStreamHandler_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/media-stream-handler.h>
 
 #endif
diff --git a/TelepathyQt4/Client/MediaStreamHandlerInterface b/TelepathyQt4/Client/MediaStreamHandlerInterface
index af1dc2ef..a5e08caa 100644
--- a/TelepathyQt4/Client/MediaStreamHandlerInterface
+++ b/TelepathyQt4/Client/MediaStreamHandlerInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_MediaStreamHandlerInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_MediaStreamHandlerInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/media-stream-handler.h>
 
 #endif
diff --git a/TelepathyQt4/Client/OptionalInterfaceFactory b/TelepathyQt4/Client/OptionalInterfaceFactory
index b8af12ab..af42dc1d 100644
--- a/TelepathyQt4/Client/OptionalInterfaceFactory
+++ b/TelepathyQt4/Client/OptionalInterfaceFactory
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_OptionalInterfaceFactory_HEADER_GUARD_
 #define _TelepathyQt4_Client_OptionalInterfaceFactory_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/optional-interface-factory.h>
 
 #endif
diff --git a/TelepathyQt4/Client/PeerInterface b/TelepathyQt4/Client/PeerInterface
index 97211037..a6948626 100644
--- a/TelepathyQt4/Client/PeerInterface
+++ b/TelepathyQt4/Client/PeerInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_PeerInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_PeerInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/dbus.h>
 
 #endif
diff --git a/TelepathyQt4/Client/PendingChannel b/TelepathyQt4/Client/PendingChannel
index cbb0c5e4..5ff4ea02 100644
--- a/TelepathyQt4/Client/PendingChannel
+++ b/TelepathyQt4/Client/PendingChannel
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_PendingChannel_HEADER_GUARD_
 #define _TelepathyQt4_Client_PendingChannel_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/pending-channel.h>
 
 #endif
diff --git a/TelepathyQt4/Client/PendingFailure b/TelepathyQt4/Client/PendingFailure
index 8bd42335..38f5bccf 100644
--- a/TelepathyQt4/Client/PendingFailure
+++ b/TelepathyQt4/Client/PendingFailure
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_PendingFailure_HEADER_GUARD_
 #define _TelepathyQt4_Client_PendingFailure_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/simple-pending-operations.h>
 
 #endif
diff --git a/TelepathyQt4/Client/PendingOperation b/TelepathyQt4/Client/PendingOperation
index 34f704d2..a520ba72 100644
--- a/TelepathyQt4/Client/PendingOperation
+++ b/TelepathyQt4/Client/PendingOperation
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_PendingOperation_HEADER_GUARD_
 #define _TelepathyQt4_Client_PendingOperation_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/pending-operation.h>
 
 #endif
diff --git a/TelepathyQt4/Client/PendingSuccess b/TelepathyQt4/Client/PendingSuccess
index c62c89d7..3bf64f52 100644
--- a/TelepathyQt4/Client/PendingSuccess
+++ b/TelepathyQt4/Client/PendingSuccess
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_PendingSuccess_HEADER_GUARD_
 #define _TelepathyQt4_Client_PendingSuccess_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/simple-pending-operations.h>
 
 #endif
diff --git a/TelepathyQt4/Client/PendingVoidMethodCall b/TelepathyQt4/Client/PendingVoidMethodCall
index f9f50e02..37cabd44 100644
--- a/TelepathyQt4/Client/PendingVoidMethodCall
+++ b/TelepathyQt4/Client/PendingVoidMethodCall
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_PendingVoidMethodCall_HEADER_GUARD_
 #define _TelepathyQt4_Client_PendingVoidMethodCall_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/simple-pending-operations.h>
 
 #endif
diff --git a/TelepathyQt4/Client/Properties b/TelepathyQt4/Client/Properties
index 3eb1bba6..cb93cda5 100644
--- a/TelepathyQt4/Client/Properties
+++ b/TelepathyQt4/Client/Properties
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_Properties_HEADER_GUARD_
 #define _TelepathyQt4_Client_Properties_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/properties.h>
 
 #endif
diff --git a/TelepathyQt4/Client/PropertiesInterface b/TelepathyQt4/Client/PropertiesInterface
index b413c4c8..cb430599 100644
--- a/TelepathyQt4/Client/PropertiesInterface
+++ b/TelepathyQt4/Client/PropertiesInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_PropertiesInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_PropertiesInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/dbus.h>
 
 #endif
diff --git a/TelepathyQt4/Client/PropertiesInterfaceInterface b/TelepathyQt4/Client/PropertiesInterfaceInterface
index 555c9ace..30f60398 100644
--- a/TelepathyQt4/Client/PropertiesInterfaceInterface
+++ b/TelepathyQt4/Client/PropertiesInterfaceInterface
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_PropertiesInterfaceInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_PropertiesInterfaceInterface_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/properties.h>
 
 #endif
diff --git a/TelepathyQt4/Client/StatefulDBusProxy b/TelepathyQt4/Client/StatefulDBusProxy
index 5c81a505..1f4ac5c2 100644
--- a/TelepathyQt4/Client/StatefulDBusProxy
+++ b/TelepathyQt4/Client/StatefulDBusProxy
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_StatefulDBusProxy_HEADER_GUARD_
 #define _TelepathyQt4_Client_StatefulDBusProxy_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/dbus-proxy.h>
 
 #endif
diff --git a/TelepathyQt4/Client/StatelessDBusProxy b/TelepathyQt4/Client/StatelessDBusProxy
index e1093e67..f8046b39 100644
--- a/TelepathyQt4/Client/StatelessDBusProxy
+++ b/TelepathyQt4/Client/StatelessDBusProxy
@@ -1,6 +1,10 @@
 #ifndef _TelepathyQt4_Client_StatelessDBusProxy_HEADER_GUARD_
 #define _TelepathyQt4_Client_StatelessDBusProxy_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Client/dbus-proxy.h>
 
 #endif
diff --git a/TelepathyQt4/Client/account-manager.cpp b/TelepathyQt4/Client/account-manager.cpp
index 3dd02316..55deea88 100644
--- a/TelepathyQt4/Client/account-manager.cpp
+++ b/TelepathyQt4/Client/account-manager.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "account-manager.h"
 
 #include <TelepathyQt4/_gen/cli-account-manager.moc.hpp>
diff --git a/TelepathyQt4/Client/account-manager.h b/TelepathyQt4/Client/account-manager.h
index b82f9972..c704fa25 100644
--- a/TelepathyQt4/Client/account-manager.h
+++ b/TelepathyQt4/Client/account-manager.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_account_manager_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_account_manager_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 /**
  * \addtogroup clientsideproxies Client-side proxies
  *
diff --git a/TelepathyQt4/Client/account.cpp b/TelepathyQt4/Client/account.cpp
index 249931e5..6a6afba2 100644
--- a/TelepathyQt4/Client/account.cpp
+++ b/TelepathyQt4/Client/account.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "account.h"
 
 #include <TelepathyQt4/_gen/cli-account-body.hpp>
diff --git a/TelepathyQt4/Client/account.h b/TelepathyQt4/Client/account.h
index 20f149b6..12f3fe1c 100644
--- a/TelepathyQt4/Client/account.h
+++ b/TelepathyQt4/Client/account.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_account_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_account_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 /**
  * \addtogroup clientsideproxies Client-side proxies
  *
diff --git a/TelepathyQt4/Client/channel.cpp b/TelepathyQt4/Client/channel.cpp
index 33106935..f30f4ebc 100644
--- a/TelepathyQt4/Client/channel.cpp
+++ b/TelepathyQt4/Client/channel.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "channel.h"
 #include "channel.moc.hpp"
 
diff --git a/TelepathyQt4/Client/channel.h b/TelepathyQt4/Client/channel.h
index c4ae5c9a..9c6b0194 100644
--- a/TelepathyQt4/Client/channel.h
+++ b/TelepathyQt4/Client/channel.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_channel_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_channel_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 /**
  * \addtogroup clientsideproxies Client-side proxies
  *
diff --git a/TelepathyQt4/Client/connection-manager.cpp b/TelepathyQt4/Client/connection-manager.cpp
index 5ca1e372..723b0721 100644
--- a/TelepathyQt4/Client/connection-manager.cpp
+++ b/TelepathyQt4/Client/connection-manager.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "connection-manager.h"
 #include "connection-manager.moc.hpp"
 
diff --git a/TelepathyQt4/Client/connection-manager.h b/TelepathyQt4/Client/connection-manager.h
index fd813358..2fbcc496 100644
--- a/TelepathyQt4/Client/connection-manager.h
+++ b/TelepathyQt4/Client/connection-manager.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_connection_manager_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_connection_manager_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 /**
  * \addtogroup clientsideproxies Client-side proxies
  *
diff --git a/TelepathyQt4/Client/connection.cpp b/TelepathyQt4/Client/connection.cpp
index 549f1c5f..e43674ba 100644
--- a/TelepathyQt4/Client/connection.cpp
+++ b/TelepathyQt4/Client/connection.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "connection.h"
 #include "connection.moc.hpp"
 
diff --git a/TelepathyQt4/Client/connection.h b/TelepathyQt4/Client/connection.h
index a3191b0a..2585e6ea 100644
--- a/TelepathyQt4/Client/connection.h
+++ b/TelepathyQt4/Client/connection.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_connection_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_connection_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 /**
  * \addtogroup clientsideproxies Client-side proxies
  *
diff --git a/TelepathyQt4/Client/dbus-proxy.cpp b/TelepathyQt4/Client/dbus-proxy.cpp
index 164dbb9a..d49a5663 100644
--- a/TelepathyQt4/Client/dbus-proxy.cpp
+++ b/TelepathyQt4/Client/dbus-proxy.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "dbus-proxy.h"
 #include "dbus-proxy.moc.hpp"
 
diff --git a/TelepathyQt4/Client/dbus-proxy.h b/TelepathyQt4/Client/dbus-proxy.h
index 4307b418..2181b2fe 100644
--- a/TelepathyQt4/Client/dbus-proxy.h
+++ b/TelepathyQt4/Client/dbus-proxy.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_dbus_proxy_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_dbus_proxy_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 // FIXME: What groups should this be in/define?
 
 #include <QDBusAbstractInterface>
diff --git a/TelepathyQt4/Client/dbus.cpp b/TelepathyQt4/Client/dbus.cpp
index 39f7578d..ab830216 100644
--- a/TelepathyQt4/Client/dbus.cpp
+++ b/TelepathyQt4/Client/dbus.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "dbus.h"
 
 #include <TelepathyQt4/_gen/cli-dbus-body.hpp>
diff --git a/TelepathyQt4/Client/dbus.h b/TelepathyQt4/Client/dbus.h
index 5b130e4a..2875c5e2 100644
--- a/TelepathyQt4/Client/dbus.h
+++ b/TelepathyQt4/Client/dbus.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_dbus_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_dbus_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 /**
  * \addtogroup clientsideproxies Client-side proxies
  *
diff --git a/TelepathyQt4/Client/media-session-handler.cpp b/TelepathyQt4/Client/media-session-handler.cpp
index d69529b1..f15e5d58 100644
--- a/TelepathyQt4/Client/media-session-handler.cpp
+++ b/TelepathyQt4/Client/media-session-handler.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "media-session-handler.h"
 
 #include <TelepathyQt4/_gen/cli-media-session-handler-body.hpp>
diff --git a/TelepathyQt4/Client/media-session-handler.h b/TelepathyQt4/Client/media-session-handler.h
index e566c600..601e5841 100644
--- a/TelepathyQt4/Client/media-session-handler.h
+++ b/TelepathyQt4/Client/media-session-handler.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_media_session_handler_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_media_session_handler_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 /**
  * \addtogroup clientsideproxies Client-side proxies
  *
diff --git a/TelepathyQt4/Client/media-stream-handler.cpp b/TelepathyQt4/Client/media-stream-handler.cpp
index 7209523f..52f39714 100644
--- a/TelepathyQt4/Client/media-stream-handler.cpp
+++ b/TelepathyQt4/Client/media-stream-handler.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "media-stream-handler.h"
 
 #include <TelepathyQt4/_gen/cli-media-stream-handler-body.hpp>
diff --git a/TelepathyQt4/Client/media-stream-handler.h b/TelepathyQt4/Client/media-stream-handler.h
index 58903b72..ba42a844 100644
--- a/TelepathyQt4/Client/media-stream-handler.h
+++ b/TelepathyQt4/Client/media-stream-handler.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_media_stream_handler_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_media_stream_handler_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 /**
  * \addtogroup clientsideproxies Client-side proxies
  *
diff --git a/TelepathyQt4/Client/optional-interface-factory.cpp b/TelepathyQt4/Client/optional-interface-factory.cpp
index 8f88842b..e3e915d0 100644
--- a/TelepathyQt4/Client/optional-interface-factory.cpp
+++ b/TelepathyQt4/Client/optional-interface-factory.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "optional-interface-factory.h"
 
 #include <TelepathyQt4/debug-internal.h>
diff --git a/TelepathyQt4/Client/optional-interface-factory.h b/TelepathyQt4/Client/optional-interface-factory.h
index 4a9adc03..f01466ee 100644
--- a/TelepathyQt4/Client/optional-interface-factory.h
+++ b/TelepathyQt4/Client/optional-interface-factory.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_optional_interface_factory_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_optional_interface_factory_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 /**
  * \addtogroup clientsideproxies Client-side proxies
  *
diff --git a/TelepathyQt4/Client/pending-channel.cpp b/TelepathyQt4/Client/pending-channel.cpp
index 72c7f265..fd36bbf8 100644
--- a/TelepathyQt4/Client/pending-channel.cpp
+++ b/TelepathyQt4/Client/pending-channel.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "pending-channel.h"
 #include "pending-channel.moc.hpp"
 
diff --git a/TelepathyQt4/Client/pending-channel.h b/TelepathyQt4/Client/pending-channel.h
index 0c93f26a..af6703da 100644
--- a/TelepathyQt4/Client/pending-channel.h
+++ b/TelepathyQt4/Client/pending-channel.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_pending_channel_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_pending_channel_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 /**
  * \addtogroup clientsideproxies Client-side proxies
  *
diff --git a/TelepathyQt4/Client/pending-operation.cpp b/TelepathyQt4/Client/pending-operation.cpp
index c8426a13..e525a162 100644
--- a/TelepathyQt4/Client/pending-operation.cpp
+++ b/TelepathyQt4/Client/pending-operation.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "pending-operation.h"
 #include "simple-pending-operations.h"
 #include "pending-operation.moc.hpp"
diff --git a/TelepathyQt4/Client/pending-operation.h b/TelepathyQt4/Client/pending-operation.h
index ada4824c..8353fbb0 100644
--- a/TelepathyQt4/Client/pending-operation.h
+++ b/TelepathyQt4/Client/pending-operation.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_pending_operation_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_pending_operation_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <QObject>
 
 class QDBusError;
diff --git a/TelepathyQt4/Client/properties.cpp b/TelepathyQt4/Client/properties.cpp
index dc273787..dcb57a5c 100644
--- a/TelepathyQt4/Client/properties.cpp
+++ b/TelepathyQt4/Client/properties.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "properties.h"
 
 #include <TelepathyQt4/_gen/cli-properties-body.hpp>
diff --git a/TelepathyQt4/Client/properties.h b/TelepathyQt4/Client/properties.h
index 23c85acf..d21952b1 100644
--- a/TelepathyQt4/Client/properties.h
+++ b/TelepathyQt4/Client/properties.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_properties_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_properties_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 /**
  * \addtogroup clientsideproxies Client-side proxies
  *
diff --git a/TelepathyQt4/Client/simple-pending-operations.h b/TelepathyQt4/Client/simple-pending-operations.h
index bd1f5e20..2f980d7d 100644
--- a/TelepathyQt4/Client/simple-pending-operations.h
+++ b/TelepathyQt4/Client/simple-pending-operations.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_cli_pending_operations_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_pending_operations_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <QObject>
 
 #include <TelepathyQt4/Client/PendingOperation>
diff --git a/TelepathyQt4/Constants b/TelepathyQt4/Constants
index a7c46f31..74cc5db4 100644
--- a/TelepathyQt4/Constants
+++ b/TelepathyQt4/Constants
@@ -1,6 +1,11 @@
 #ifndef _TelepathyQt4_Constants_HEADER_GUARD_
 #define _TelepathyQt4_Constants_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/constants.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/TelepathyQt4/Debug b/TelepathyQt4/Debug
index 52d9490b..ec1c3db0 100644
--- a/TelepathyQt4/Debug
+++ b/TelepathyQt4/Debug
@@ -1,6 +1,11 @@
 #ifndef _TelepathyQt4_Debug_HEADER_GUARD_
 #define _TelepathyQt4_Debug_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/debug.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/TelepathyQt4/KeyFile b/TelepathyQt4/KeyFile
index 0d4adc0d..b27c0bd8 100644
--- a/TelepathyQt4/KeyFile
+++ b/TelepathyQt4/KeyFile
@@ -1,6 +1,11 @@
 #ifndef _TelepathyQt4_KeyFile_HEADER_GUARD_
 #define _TelepathyQt4_KeyFile_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/key-file.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/TelepathyQt4/Makefile.am b/TelepathyQt4/Makefile.am
index 9431cefd..cdda6b2f 100644
--- a/TelepathyQt4/Makefile.am
+++ b/TelepathyQt4/Makefile.am
@@ -224,6 +224,7 @@ _gen/constants.h: _gen/stable-spec.xml \
 	$(PYTHON) $(top_srcdir)/tools/qt4-constants-gen.py \
 		--namespace='Telepathy' \
 		--str-constant-prefix='TELEPATHY_' \
+		--must-define='IN_TELEPATHY_QT4_INTERNALS' \
 		--specxml=$< \
 		> $@.tmp && mv $@.tmp $@
 
@@ -236,6 +237,7 @@ _gen/types.h _gen/types-body.hpp: _gen/stable-spec.xml \
 		--implfile='_gen/types-body.hpp' \
 		--realinclude='TelepathyQt4/types.h' \
 		--prettyinclude='TelepathyQt4/Types' \
+		--must-define='IN_TELEPATHY_QT4_INTERNALS' \
 		--specxml=$<
 
 # Things generated per interface group
@@ -301,6 +303,7 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
 		--specxml=_gen/stable-spec.xml \
 		--ifacexml=$< \
 		--extraincludes='<TelepathyQt4/Types>' \
+		--must-define='IN_TELEPATHY_QT4_INTERNALS' \
 		$$mainiface
 
 %.moc.hpp: %.h _gen/constants.h _gen/types.h
diff --git a/TelepathyQt4/ManagerFile b/TelepathyQt4/ManagerFile
index 86aa058e..6d07b597 100644
--- a/TelepathyQt4/ManagerFile
+++ b/TelepathyQt4/ManagerFile
@@ -1,6 +1,11 @@
 #ifndef _TelepathyQt4_ManagerFile_HEADER_GUARD_
 #define _TelepathyQt4_ManagerFile_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/manager-file.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/TelepathyQt4/Types b/TelepathyQt4/Types
index 23da39b7..d9afb1d9 100644
--- a/TelepathyQt4/Types
+++ b/TelepathyQt4/Types
@@ -1,6 +1,11 @@
 #ifndef _TelepathyQt4_Types_HEADER_GUARD_
 #define _TelepathyQt4_Types_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/types.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/TelepathyQt4/constants.h b/TelepathyQt4/constants.h
index d8915dc6..46df7fd5 100644
--- a/TelepathyQt4/constants.h
+++ b/TelepathyQt4/constants.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_constants_h_HEADER_GUARD_
 #define _TelepathyQt4_constants_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 /**
  * \addtogroup typesconstants Types and constants
  *
diff --git a/TelepathyQt4/debug-internal.h b/TelepathyQt4/debug-internal.h
index 9e755cf8..506a3ad4 100644
--- a/TelepathyQt4/debug-internal.h
+++ b/TelepathyQt4/debug-internal.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_debug_HEADER_GUARD_
 #define _TelepathyQt4_debug_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <QDebug>
 
 #include <config.h>
diff --git a/TelepathyQt4/debug.cpp b/TelepathyQt4/debug.cpp
index 66321410..1982a4e6 100644
--- a/TelepathyQt4/debug.cpp
+++ b/TelepathyQt4/debug.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "debug.h"
 #include "debug-internal.h"
 
diff --git a/TelepathyQt4/debug.h b/TelepathyQt4/debug.h
index de32404d..05c2a23f 100644
--- a/TelepathyQt4/debug.h
+++ b/TelepathyQt4/debug.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_debug_h_HEADER_GUARD_
 #define _TelepathyQt4_debug_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 /**
  * \defgroup debug Common debug support
  *
diff --git a/TelepathyQt4/key-file.cpp b/TelepathyQt4/key-file.cpp
index c957a604..a27f3670 100644
--- a/TelepathyQt4/key-file.cpp
+++ b/TelepathyQt4/key-file.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "key-file.h"
 
 #include "debug-internal.h"
diff --git a/TelepathyQt4/key-file.h b/TelepathyQt4/key-file.h
index 2870c145..1b88a899 100644
--- a/TelepathyQt4/key-file.h
+++ b/TelepathyQt4/key-file.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_key_file_h_HEADER_GUARD_
 #define _TelepathyQt4_key_file_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
diff --git a/TelepathyQt4/manager-file.cpp b/TelepathyQt4/manager-file.cpp
index 4d872c7c..86407cca 100644
--- a/TelepathyQt4/manager-file.cpp
+++ b/TelepathyQt4/manager-file.cpp
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "manager-file.h"
 
 #include "debug-internal.h"
diff --git a/TelepathyQt4/manager-file.h b/TelepathyQt4/manager-file.h
index 12b9c38f..8921a98c 100644
--- a/TelepathyQt4/manager-file.h
+++ b/TelepathyQt4/manager-file.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_manager_file_h_HEADER_GUARD_
 #define _TelepathyQt4_manager_file_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/Types>
 
 namespace Telepathy
diff --git a/TelepathyQt4/types.cpp b/TelepathyQt4/types.cpp
index 12aeb7c3..6595ce7b 100644
--- a/TelepathyQt4/types.cpp
+++ b/TelepathyQt4/types.cpp
@@ -19,4 +19,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#define IN_TELEPATHY_QT4_INTERNALS
 #include "_gen/types-body.hpp"
diff --git a/TelepathyQt4/types.h b/TelepathyQt4/types.h
index 2ab1d9d9..f7ac9081 100644
--- a/TelepathyQt4/types.h
+++ b/TelepathyQt4/types.h
@@ -22,6 +22,10 @@
 #ifndef _TelepathyQt4_types_h_HEADER_GUARD_
 #define _TelepathyQt4_types_h_HEADER_GUARD_
 
+#ifndef IN_TELEPATHY_QT4_INTERNALS
+#error IN_TELEPATHY_QT4_INTERNALS
+#endif
+
 #include <TelepathyQt4/_gen/types.h>
 
 #endif
diff --git a/tools/qt4-client-gen.py b/tools/qt4-client-gen.py
index cb916073..a8fab4e8 100644
--- a/tools/qt4-client-gen.py
+++ b/tools/qt4-client-gen.py
@@ -37,6 +37,7 @@ class Generator(object):
             self.prettyinclude = opts.get('--prettyinclude')
             self.extraincludes = opts.get('--extraincludes', None)
             self.mainiface = opts.get('--mainiface', None)
+            self.must_define = opts.get('--must-define', None)
             ifacedom = xml.dom.minidom.parse(opts['--ifacexml'])
             specdom = xml.dom.minidom.parse(opts['--specxml'])
         except KeyError, k:
@@ -60,8 +61,15 @@ class Generator(object):
  */
 """)
 
-        if self.extraincludes:
+        if self.must_define:
             self.h('\n')
+            self.h('#ifndef %s\n' % self.must_define)
+            self.h('#error %s\n' % self.must_define)
+            self.h('#endif\n')
+
+        self.h('\n')
+
+        if self.extraincludes:
             for include in self.extraincludes.split(','):
                 self.h('#include %s\n' % include)
 
@@ -77,8 +85,10 @@ class Generator(object):
 
 """)
 
-        self.b("""\
-#include "%s"
+        if self.must_define:
+            self.b("""#define %s\n""" % (self.must_define))
+
+        self.b("""#include "%s"
 
 """ % self.realinclude)
 
@@ -416,6 +426,7 @@ if __name__ == '__main__':
              'realinclude=',
              'prettyinclude=',
              'extraincludes=',
-             'mainiface='])
+             'mainiface=',
+             'must-define='])
 
     Generator(dict(options))()
diff --git a/tools/qt4-constants-gen.py b/tools/qt4-constants-gen.py
index 13fc0217..dea56c17 100644
--- a/tools/qt4-constants-gen.py
+++ b/tools/qt4-constants-gen.py
@@ -29,6 +29,7 @@ class Generator(object):
         try:
             self.namespace = opts['--namespace']
             self.prefix = opts['--str-constant-prefix']
+            self.must_define = opts.get('--must-define', None)
             dom = xml.dom.minidom.parse(opts['--specxml'])
         except KeyError, k:
             assert False, 'Missing required parameter %s' % k.args[0]
@@ -46,7 +47,16 @@ class Generator(object):
 
         stdout.write("""
  */
+ """)
 
+        if self.must_define:
+            stdout.write("""
+#ifndef %s
+#error %s
+#endif
+""" % (self.must_define, self.must_define))
+
+        stdout.write("""
 #include <QFlags>
 
 /**
@@ -229,6 +239,7 @@ if __name__ == '__main__':
     options, argv = gnu_getopt(argv[1:], '',
             ['namespace=',
              'str-constant-prefix=',
+             'must-define=',
              'specxml='])
 
     Generator(dict(options))()
diff --git a/tools/qt4-types-gen.py b/tools/qt4-types-gen.py
index e1670dae..5525ae1f 100644
--- a/tools/qt4-types-gen.py
+++ b/tools/qt4-types-gen.py
@@ -58,6 +58,7 @@ class Generator(object):
             self.realinclude = opts['--realinclude']
             self.prettyinclude = opts.get('--prettyinclude', self.realinclude)
             self.extraincludes = opts.get('--extraincludes', None)
+            self.must_define = opts.get('--must-define', None)
             dom = xml.dom.minidom.parse(opts['--specxml'])
         except KeyError, k:
             assert False, 'Missing required parameter %s' % k.args[0]
@@ -88,10 +89,17 @@ class Generator(object):
 
         self.gather_required()
 
-        if self.extraincludes:
+        if self.must_define:
             self.decl('\n')
+            self.decl('#ifndef %s\n' % self.must_define)
+            self.decl('#error %s\n' % self.must_define)
+            self.decl('#endif')
+
+        self.decl('\n')
+
+        if self.extraincludes:
             for include in self.extraincludes.split(','):
-                self.decl('#include %s' % include)
+                self.decl('#include %s\n' % include)
 
         self.decl("""
 #include <QtGlobal>
@@ -136,9 +144,15 @@ class Generator(object):
  */
 
 """)
+
+        if self.must_define:
+            self.impl("""
+#define %s""" % self.must_define)
+
         self.impl("""
 #include "%s"
 """ % self.realinclude)
+
         self.both("""
 namespace %s
 {
@@ -401,6 +415,7 @@ if __name__ == '__main__':
              'realinclude=',
              'prettyinclude=',
              'extraincludes=',
+             'must-define=',
              'namespace=',
              'specxml='])