[Telepathy-commits] [telepathy-qt4/master] Renamed IN_TELEPATHY_QT4_INTERNALS to IN_TELEPATHY_QT4_HEADER.

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Mon Jan 5 07:10:41 PST 2009 

---
 TelepathyQt4/Client/Account                        |    6 +++---
 TelepathyQt4/Client/AccountInterface               |    6 +++---
 TelepathyQt4/Client/AccountManager                 |    6 +++---
 TelepathyQt4/Client/AccountManagerInterface        |    6 +++---
 TelepathyQt4/Client/Channel                        |    6 +++---
 TelepathyQt4/Client/ChannelInterface               |    6 +++---
 .../Client/ChannelInterfaceCallStateInterface      |    6 +++---
 .../Client/ChannelInterfaceChatStateInterface      |    6 +++---
 TelepathyQt4/Client/ChannelInterfaceDTMFInterface  |    6 +++---
 TelepathyQt4/Client/ChannelInterfaceGroupInterface |    6 +++---
 TelepathyQt4/Client/ChannelInterfaceHoldInterface  |    6 +++---
 .../ChannelInterfaceMediaSignallingInterface       |    6 +++---
 .../Client/ChannelInterfacePasswordInterface       |    6 +++---
 .../Client/ChannelTypeContactListInterface         |    6 +++---
 TelepathyQt4/Client/ChannelTypeRoomListInterface   |    6 +++---
 .../Client/ChannelTypeStreamedMediaInterface       |    6 +++---
 TelepathyQt4/Client/ChannelTypeTextInterface       |    6 +++---
 TelepathyQt4/Client/ChannelTypeTubesInterface      |    6 +++---
 TelepathyQt4/Client/Connection                     |    6 +++---
 TelepathyQt4/Client/ConnectionInterface            |    6 +++---
 .../Client/ConnectionInterfaceAliasingInterface    |    6 +++---
 .../Client/ConnectionInterfaceAvatarsInterface     |    6 +++---
 .../ConnectionInterfaceCapabilitiesInterface       |    6 +++---
 .../Client/ConnectionInterfaceContactsInterface    |    6 +++---
 .../Client/ConnectionInterfacePresenceInterface    |    6 +++---
 .../Client/ConnectionInterfaceRequestsInterface    |    6 +++---
 .../ConnectionInterfaceSimplePresenceInterface     |    6 +++---
 TelepathyQt4/Client/ConnectionManager              |    6 +++---
 TelepathyQt4/Client/ConnectionManagerInterface     |    6 +++---
 TelepathyQt4/Client/DBus                           |    6 +++---
 TelepathyQt4/Client/DBusDaemonInterface            |    6 +++---
 TelepathyQt4/Client/DBusProxy                      |    6 +++---
 TelepathyQt4/Client/IntrospectableInterface        |    6 +++---
 TelepathyQt4/Client/MediaSessionHandler            |    6 +++---
 TelepathyQt4/Client/MediaSessionHandlerInterface   |    6 +++---
 TelepathyQt4/Client/MediaStreamHandler             |    6 +++---
 TelepathyQt4/Client/MediaStreamHandlerInterface    |    6 +++---
 TelepathyQt4/Client/OptionalInterfaceFactory       |    6 +++---
 TelepathyQt4/Client/PeerInterface                  |    6 +++---
 TelepathyQt4/Client/PendingChannel                 |    6 +++---
 TelepathyQt4/Client/PendingFailure                 |    6 +++---
 TelepathyQt4/Client/PendingOperation               |    6 +++---
 TelepathyQt4/Client/PendingSuccess                 |    6 +++---
 TelepathyQt4/Client/PendingVoidMethodCall          |    6 +++---
 TelepathyQt4/Client/Properties                     |    6 +++---
 TelepathyQt4/Client/PropertiesInterface            |    6 +++---
 TelepathyQt4/Client/PropertiesInterfaceInterface   |    6 +++---
 TelepathyQt4/Client/StatefulDBusProxy              |    6 +++---
 TelepathyQt4/Client/StatelessDBusProxy             |    6 +++---
 TelepathyQt4/Client/account-manager.cpp            |    2 +-
 TelepathyQt4/Client/account-manager.h              |    4 ++--
 TelepathyQt4/Client/account.cpp                    |    2 +-
 TelepathyQt4/Client/account.h                      |    4 ++--
 TelepathyQt4/Client/channel.cpp                    |    2 +-
 TelepathyQt4/Client/channel.h                      |    4 ++--
 TelepathyQt4/Client/connection-manager.cpp         |    2 +-
 TelepathyQt4/Client/connection-manager.h           |    4 ++--
 TelepathyQt4/Client/connection.cpp                 |    2 +-
 TelepathyQt4/Client/connection.h                   |    4 ++--
 TelepathyQt4/Client/dbus-proxy.cpp                 |    2 +-
 TelepathyQt4/Client/dbus-proxy.h                   |    4 ++--
 TelepathyQt4/Client/dbus.cpp                       |    2 +-
 TelepathyQt4/Client/dbus.h                         |    4 ++--
 TelepathyQt4/Client/media-session-handler.cpp      |    2 +-
 TelepathyQt4/Client/media-session-handler.h        |    4 ++--
 TelepathyQt4/Client/media-stream-handler.cpp       |    2 +-
 TelepathyQt4/Client/media-stream-handler.h         |    4 ++--
 TelepathyQt4/Client/optional-interface-factory.cpp |    2 +-
 TelepathyQt4/Client/optional-interface-factory.h   |    4 ++--
 TelepathyQt4/Client/pending-channel.cpp            |    2 +-
 TelepathyQt4/Client/pending-channel.h              |    4 ++--
 TelepathyQt4/Client/pending-operation.cpp          |    2 +-
 TelepathyQt4/Client/pending-operation.h            |    4 ++--
 TelepathyQt4/Client/properties.cpp                 |    2 +-
 TelepathyQt4/Client/properties.h                   |    4 ++--
 TelepathyQt4/Client/simple-pending-operations.h    |    4 ++--
 TelepathyQt4/Constants                             |    6 +++---
 TelepathyQt4/Debug                                 |    6 +++---
 TelepathyQt4/KeyFile                               |    6 +++---
 TelepathyQt4/Makefile.am                           |    6 +++---
 TelepathyQt4/ManagerFile                           |    6 +++---
 TelepathyQt4/Types                                 |    6 +++---
 TelepathyQt4/constants.h                           |    4 ++--
 TelepathyQt4/debug.cpp                             |    2 +-
 TelepathyQt4/debug.h                               |    4 ++--
 TelepathyQt4/key-file.cpp                          |    2 +-
 TelepathyQt4/key-file.h                            |    4 ++--
 TelepathyQt4/manager-file.cpp                      |    2 +-
 TelepathyQt4/manager-file.h                        |    4 ++--
 TelepathyQt4/types.cpp                             |    2 +-
 TelepathyQt4/types.h                               |    4 ++--
 91 files changed, 220 insertions(+), 220 deletions(-)

diff --git a/TelepathyQt4/Client/Account b/TelepathyQt4/Client/Account
index 6cbfb8e..94966cd 100644
--- a/TelepathyQt4/Client/Account
+++ b/TelepathyQt4/Client/Account
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_Account_HEADER_GUARD_
 #define _TelepathyQt4_Client_Account_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/account.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/AccountInterface b/TelepathyQt4/Client/AccountInterface
index 6edbc84..12d5405 100644
--- a/TelepathyQt4/Client/AccountInterface
+++ b/TelepathyQt4/Client/AccountInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_AccountInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_AccountInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/account.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/AccountManager b/TelepathyQt4/Client/AccountManager
index 5e0437b..e50504d 100644
--- a/TelepathyQt4/Client/AccountManager
+++ b/TelepathyQt4/Client/AccountManager
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_AccountManager_HEADER_GUARD_
 #define _TelepathyQt4_Client_AccountManager_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/account-manager.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/AccountManagerInterface b/TelepathyQt4/Client/AccountManagerInterface
index 11e1f07..8b7aba6 100644
--- a/TelepathyQt4/Client/AccountManagerInterface
+++ b/TelepathyQt4/Client/AccountManagerInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_AccountManagerInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_AccountManagerInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/account-manager.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/Channel b/TelepathyQt4/Client/Channel
index c1f6008..7679ccd 100644
--- a/TelepathyQt4/Client/Channel
+++ b/TelepathyQt4/Client/Channel
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_Channel_HEADER_GUARD_
 #define _TelepathyQt4_Client_Channel_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterface b/TelepathyQt4/Client/ChannelInterface
index 15b6d56..0581902 100644
--- a/TelepathyQt4/Client/ChannelInterface
+++ b/TelepathyQt4/Client/ChannelInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ChannelInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterfaceCallStateInterface b/TelepathyQt4/Client/ChannelInterfaceCallStateInterface
index cab9e2f..73c9a2e 100644
--- a/TelepathyQt4/Client/ChannelInterfaceCallStateInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceCallStateInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ChannelInterfaceCallStateInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterfaceCallStateInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterfaceChatStateInterface b/TelepathyQt4/Client/ChannelInterfaceChatStateInterface
index 3283f9f..7ff98d1 100644
--- a/TelepathyQt4/Client/ChannelInterfaceChatStateInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceChatStateInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ChannelInterfaceChatStateInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterfaceChatStateInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterfaceDTMFInterface b/TelepathyQt4/Client/ChannelInterfaceDTMFInterface
index aaf4337..02ac8ec 100644
--- a/TelepathyQt4/Client/ChannelInterfaceDTMFInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceDTMFInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ChannelInterfaceDTMFInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterfaceDTMFInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterfaceGroupInterface b/TelepathyQt4/Client/ChannelInterfaceGroupInterface
index ea51693..513c927 100644
--- a/TelepathyQt4/Client/ChannelInterfaceGroupInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceGroupInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ChannelInterfaceGroupInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterfaceGroupInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterfaceHoldInterface b/TelepathyQt4/Client/ChannelInterfaceHoldInterface
index ff6d9f5..42d22b6 100644
--- a/TelepathyQt4/Client/ChannelInterfaceHoldInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceHoldInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ChannelInterfaceHoldInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterfaceHoldInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface b/TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface
index b8dce7d..5e635d8 100644
--- a/TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface
+++ b/TelepathyQt4/Client/ChannelInterfaceMediaSignallingInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ChannelInterfaceMediaSignallingInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterfaceMediaSignallingInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelInterfacePasswordInterface b/TelepathyQt4/Client/ChannelInterfacePasswordInterface
index 5c32b6b..c1757c0 100644
--- a/TelepathyQt4/Client/ChannelInterfacePasswordInterface
+++ b/TelepathyQt4/Client/ChannelInterfacePasswordInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ChannelInterfacePasswordInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelInterfacePasswordInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelTypeContactListInterface b/TelepathyQt4/Client/ChannelTypeContactListInterface
index 6cb00bc..8c2ea86 100644
--- a/TelepathyQt4/Client/ChannelTypeContactListInterface
+++ b/TelepathyQt4/Client/ChannelTypeContactListInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ChannelTypeContactListInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelTypeContactListInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelTypeRoomListInterface b/TelepathyQt4/Client/ChannelTypeRoomListInterface
index 46903fc..1d2721e 100644
--- a/TelepathyQt4/Client/ChannelTypeRoomListInterface
+++ b/TelepathyQt4/Client/ChannelTypeRoomListInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ChannelTypeRoomListInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelTypeRoomListInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelTypeStreamedMediaInterface b/TelepathyQt4/Client/ChannelTypeStreamedMediaInterface
index d0baad1..573475c 100644
--- a/TelepathyQt4/Client/ChannelTypeStreamedMediaInterface
+++ b/TelepathyQt4/Client/ChannelTypeStreamedMediaInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ChannelTypeStreamedMediaInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelTypeStreamedMediaInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelTypeTextInterface b/TelepathyQt4/Client/ChannelTypeTextInterface
index 195d6ce..f61c4d4 100644
--- a/TelepathyQt4/Client/ChannelTypeTextInterface
+++ b/TelepathyQt4/Client/ChannelTypeTextInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ChannelTypeTextInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelTypeTextInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ChannelTypeTubesInterface b/TelepathyQt4/Client/ChannelTypeTubesInterface
index 892fb8f..266ec19 100644
--- a/TelepathyQt4/Client/ChannelTypeTubesInterface
+++ b/TelepathyQt4/Client/ChannelTypeTubesInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ChannelTypeTubesInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ChannelTypeTubesInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/Connection b/TelepathyQt4/Client/Connection
index 48ad0b7..082e469 100644
--- a/TelepathyQt4/Client/Connection
+++ b/TelepathyQt4/Client/Connection
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_Connection_HEADER_GUARD_
 #define _TelepathyQt4_Client_Connection_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/connection.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterface b/TelepathyQt4/Client/ConnectionInterface
index f604070..7467512 100644
--- a/TelepathyQt4/Client/ConnectionInterface
+++ b/TelepathyQt4/Client/ConnectionInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/connection.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterfaceAliasingInterface b/TelepathyQt4/Client/ConnectionInterfaceAliasingInterface
index 82d9434..bbc49c7 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceAliasingInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceAliasingInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterfaceAliasingInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterfaceAliasingInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/connection.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface b/TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface
index 3cb23f5..d473fb9 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceAvatarsInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterfaceAvatarsInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterfaceAvatarsInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/connection.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface b/TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface
index 62dce3e..e125d56 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceCapabilitiesInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterfaceCapabilitiesInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterfaceCapabilitiesInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/connection.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterfaceContactsInterface b/TelepathyQt4/Client/ConnectionInterfaceContactsInterface
index 05369ff..8a66801 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceContactsInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceContactsInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterfaceContactsInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterfaceContactsInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/connection.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterfacePresenceInterface b/TelepathyQt4/Client/ConnectionInterfacePresenceInterface
index 976a831..8946062 100644
--- a/TelepathyQt4/Client/ConnectionInterfacePresenceInterface
+++ b/TelepathyQt4/Client/ConnectionInterfacePresenceInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterfacePresenceInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterfacePresenceInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/connection.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterfaceRequestsInterface b/TelepathyQt4/Client/ConnectionInterfaceRequestsInterface
index cef0178..7ea614d 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceRequestsInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceRequestsInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterfaceRequestsInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterfaceRequestsInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/connection.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface b/TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface
index 80fee4a..fc92872 100644
--- a/TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface
+++ b/TelepathyQt4/Client/ConnectionInterfaceSimplePresenceInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ConnectionInterfaceSimplePresenceInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionInterfaceSimplePresenceInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/connection.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionManager b/TelepathyQt4/Client/ConnectionManager
index 06fd6ae..7dee708 100644
--- a/TelepathyQt4/Client/ConnectionManager
+++ b/TelepathyQt4/Client/ConnectionManager
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ConnectionManager_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionManager_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/connection-manager.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/ConnectionManagerInterface b/TelepathyQt4/Client/ConnectionManagerInterface
index 771ab4b..51c9062 100644
--- a/TelepathyQt4/Client/ConnectionManagerInterface
+++ b/TelepathyQt4/Client/ConnectionManagerInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_ConnectionManagerInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionManagerInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/connection-manager.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/DBus b/TelepathyQt4/Client/DBus
index f0efc91..0a7f008 100644
--- a/TelepathyQt4/Client/DBus
+++ b/TelepathyQt4/Client/DBus
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_DBus_HEADER_GUARD_
 #define _TelepathyQt4_Client_DBus_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/dbus.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/DBusDaemonInterface b/TelepathyQt4/Client/DBusDaemonInterface
index 7c96f44..6d5c1f9 100644
--- a/TelepathyQt4/Client/DBusDaemonInterface
+++ b/TelepathyQt4/Client/DBusDaemonInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_DBusDaemonInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_DBusDaemonInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/dbus.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/DBusProxy b/TelepathyQt4/Client/DBusProxy
index 2c5ad05..8e7e50f 100644
--- a/TelepathyQt4/Client/DBusProxy
+++ b/TelepathyQt4/Client/DBusProxy
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_DBusProxy_HEADER_GUARD_
 #define _TelepathyQt4_Client_DBusProxy_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/dbus-proxy.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/IntrospectableInterface b/TelepathyQt4/Client/IntrospectableInterface
index 9adeab3..a91e7f0 100644
--- a/TelepathyQt4/Client/IntrospectableInterface
+++ b/TelepathyQt4/Client/IntrospectableInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_IntrospectableInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_IntrospectableInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/dbus.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/MediaSessionHandler b/TelepathyQt4/Client/MediaSessionHandler
index 35a4ce0..7e4d8b5 100644
--- a/TelepathyQt4/Client/MediaSessionHandler
+++ b/TelepathyQt4/Client/MediaSessionHandler
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_MediaSessionHandler_HEADER_GUARD_
 #define _TelepathyQt4_Client_MediaSessionHandler_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/media-session-handler.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/MediaSessionHandlerInterface b/TelepathyQt4/Client/MediaSessionHandlerInterface
index a7f235d..8ed9889 100644
--- a/TelepathyQt4/Client/MediaSessionHandlerInterface
+++ b/TelepathyQt4/Client/MediaSessionHandlerInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_MediaSessionHandlerInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_MediaSessionHandlerInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/media-session-handler.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/MediaStreamHandler b/TelepathyQt4/Client/MediaStreamHandler
index 8fc1bd8..1789bb4 100644
--- a/TelepathyQt4/Client/MediaStreamHandler
+++ b/TelepathyQt4/Client/MediaStreamHandler
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_MediaStreamHandler_HEADER_GUARD_
 #define _TelepathyQt4_Client_MediaStreamHandler_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/media-stream-handler.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/MediaStreamHandlerInterface b/TelepathyQt4/Client/MediaStreamHandlerInterface
index 359026f..1af69f7 100644
--- a/TelepathyQt4/Client/MediaStreamHandlerInterface
+++ b/TelepathyQt4/Client/MediaStreamHandlerInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_MediaStreamHandlerInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_MediaStreamHandlerInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/media-stream-handler.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/OptionalInterfaceFactory b/TelepathyQt4/Client/OptionalInterfaceFactory
index 5f2dca2..3523997 100644
--- a/TelepathyQt4/Client/OptionalInterfaceFactory
+++ b/TelepathyQt4/Client/OptionalInterfaceFactory
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_OptionalInterfaceFactory_HEADER_GUARD_
 #define _TelepathyQt4_Client_OptionalInterfaceFactory_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/optional-interface-factory.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PeerInterface b/TelepathyQt4/Client/PeerInterface
index c4baf05..ab1c9ad 100644
--- a/TelepathyQt4/Client/PeerInterface
+++ b/TelepathyQt4/Client/PeerInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_PeerInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_PeerInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/dbus.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PendingChannel b/TelepathyQt4/Client/PendingChannel
index 0556a46..6281696 100644
--- a/TelepathyQt4/Client/PendingChannel
+++ b/TelepathyQt4/Client/PendingChannel
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_PendingChannel_HEADER_GUARD_
 #define _TelepathyQt4_Client_PendingChannel_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/pending-channel.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PendingFailure b/TelepathyQt4/Client/PendingFailure
index 0964605..05e67fa 100644
--- a/TelepathyQt4/Client/PendingFailure
+++ b/TelepathyQt4/Client/PendingFailure
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_PendingFailure_HEADER_GUARD_
 #define _TelepathyQt4_Client_PendingFailure_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/simple-pending-operations.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PendingOperation b/TelepathyQt4/Client/PendingOperation
index db0797c..ffddab7 100644
--- a/TelepathyQt4/Client/PendingOperation
+++ b/TelepathyQt4/Client/PendingOperation
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_PendingOperation_HEADER_GUARD_
 #define _TelepathyQt4_Client_PendingOperation_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/pending-operation.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PendingSuccess b/TelepathyQt4/Client/PendingSuccess
index 25e5bf5..4174b08 100644
--- a/TelepathyQt4/Client/PendingSuccess
+++ b/TelepathyQt4/Client/PendingSuccess
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_PendingSuccess_HEADER_GUARD_
 #define _TelepathyQt4_Client_PendingSuccess_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/simple-pending-operations.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PendingVoidMethodCall b/TelepathyQt4/Client/PendingVoidMethodCall
index 4856232..cba711a 100644
--- a/TelepathyQt4/Client/PendingVoidMethodCall
+++ b/TelepathyQt4/Client/PendingVoidMethodCall
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_PendingVoidMethodCall_HEADER_GUARD_
 #define _TelepathyQt4_Client_PendingVoidMethodCall_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/simple-pending-operations.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/Properties b/TelepathyQt4/Client/Properties
index d1045c2..e4be83e 100644
--- a/TelepathyQt4/Client/Properties
+++ b/TelepathyQt4/Client/Properties
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_Properties_HEADER_GUARD_
 #define _TelepathyQt4_Client_Properties_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/properties.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PropertiesInterface b/TelepathyQt4/Client/PropertiesInterface
index aca78ea..b18df7a 100644
--- a/TelepathyQt4/Client/PropertiesInterface
+++ b/TelepathyQt4/Client/PropertiesInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_PropertiesInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_PropertiesInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/dbus.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/PropertiesInterfaceInterface b/TelepathyQt4/Client/PropertiesInterfaceInterface
index fc84fcf..6107521 100644
--- a/TelepathyQt4/Client/PropertiesInterfaceInterface
+++ b/TelepathyQt4/Client/PropertiesInterfaceInterface
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_PropertiesInterfaceInterface_HEADER_GUARD_
 #define _TelepathyQt4_Client_PropertiesInterfaceInterface_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/properties.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/StatefulDBusProxy b/TelepathyQt4/Client/StatefulDBusProxy
index 4180189..46bf453 100644
--- a/TelepathyQt4/Client/StatefulDBusProxy
+++ b/TelepathyQt4/Client/StatefulDBusProxy
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_StatefulDBusProxy_HEADER_GUARD_
 #define _TelepathyQt4_Client_StatefulDBusProxy_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/dbus-proxy.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/StatelessDBusProxy b/TelepathyQt4/Client/StatelessDBusProxy
index 716c4be..35d8d1a 100644
--- a/TelepathyQt4/Client/StatelessDBusProxy
+++ b/TelepathyQt4/Client/StatelessDBusProxy
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Client_StatelessDBusProxy_HEADER_GUARD_
 #define _TelepathyQt4_Client_StatelessDBusProxy_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Client/dbus-proxy.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Client/account-manager.cpp b/TelepathyQt4/Client/account-manager.cpp
index 55deea8..9f665e4 100644
--- a/TelepathyQt4/Client/account-manager.cpp
+++ b/TelepathyQt4/Client/account-manager.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #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 c704fa2..9ec6c2e 100644
--- a/TelepathyQt4/Client/account-manager.h
+++ b/TelepathyQt4/Client/account-manager.h
@@ -22,8 +22,8 @@
 #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
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 /**
diff --git a/TelepathyQt4/Client/account.cpp b/TelepathyQt4/Client/account.cpp
index 6a6afba..0b9deba 100644
--- a/TelepathyQt4/Client/account.cpp
+++ b/TelepathyQt4/Client/account.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #include "account.h"
 
 #include <TelepathyQt4/_gen/cli-account-body.hpp>
diff --git a/TelepathyQt4/Client/account.h b/TelepathyQt4/Client/account.h
index 12f3fe1..d0abf55 100644
--- a/TelepathyQt4/Client/account.h
+++ b/TelepathyQt4/Client/account.h
@@ -22,8 +22,8 @@
 #ifndef _TelepathyQt4_cli_account_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_account_h_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#error IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 /**
diff --git a/TelepathyQt4/Client/channel.cpp b/TelepathyQt4/Client/channel.cpp
index f30f4eb..8d26e50 100644
--- a/TelepathyQt4/Client/channel.cpp
+++ b/TelepathyQt4/Client/channel.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #include "channel.h"
 #include "channel.moc.hpp"
 
diff --git a/TelepathyQt4/Client/channel.h b/TelepathyQt4/Client/channel.h
index 9c6b019..369753a 100644
--- a/TelepathyQt4/Client/channel.h
+++ b/TelepathyQt4/Client/channel.h
@@ -22,8 +22,8 @@
 #ifndef _TelepathyQt4_cli_channel_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_channel_h_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#error IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 /**
diff --git a/TelepathyQt4/Client/connection-manager.cpp b/TelepathyQt4/Client/connection-manager.cpp
index 723b072..370979a 100644
--- a/TelepathyQt4/Client/connection-manager.cpp
+++ b/TelepathyQt4/Client/connection-manager.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #include "connection-manager.h"
 #include "connection-manager.moc.hpp"
 
diff --git a/TelepathyQt4/Client/connection-manager.h b/TelepathyQt4/Client/connection-manager.h
index eb5b415..ed6c093 100644
--- a/TelepathyQt4/Client/connection-manager.h
+++ b/TelepathyQt4/Client/connection-manager.h
@@ -22,8 +22,8 @@
 #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
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 /**
diff --git a/TelepathyQt4/Client/connection.cpp b/TelepathyQt4/Client/connection.cpp
index e43674b..a9c81fa 100644
--- a/TelepathyQt4/Client/connection.cpp
+++ b/TelepathyQt4/Client/connection.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #include "connection.h"
 #include "connection.moc.hpp"
 
diff --git a/TelepathyQt4/Client/connection.h b/TelepathyQt4/Client/connection.h
index 2585e6e..452d736 100644
--- a/TelepathyQt4/Client/connection.h
+++ b/TelepathyQt4/Client/connection.h
@@ -22,8 +22,8 @@
 #ifndef _TelepathyQt4_cli_connection_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_connection_h_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#error IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 /**
diff --git a/TelepathyQt4/Client/dbus-proxy.cpp b/TelepathyQt4/Client/dbus-proxy.cpp
index d49a566..7e02f20 100644
--- a/TelepathyQt4/Client/dbus-proxy.cpp
+++ b/TelepathyQt4/Client/dbus-proxy.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #include "dbus-proxy.h"
 #include "dbus-proxy.moc.hpp"
 
diff --git a/TelepathyQt4/Client/dbus-proxy.h b/TelepathyQt4/Client/dbus-proxy.h
index 2181b2f..4d7725d 100644
--- a/TelepathyQt4/Client/dbus-proxy.h
+++ b/TelepathyQt4/Client/dbus-proxy.h
@@ -22,8 +22,8 @@
 #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
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 // FIXME: What groups should this be in/define?
diff --git a/TelepathyQt4/Client/dbus.cpp b/TelepathyQt4/Client/dbus.cpp
index ab83021..88ef4ff 100644
--- a/TelepathyQt4/Client/dbus.cpp
+++ b/TelepathyQt4/Client/dbus.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #include "dbus.h"
 
 #include <TelepathyQt4/_gen/cli-dbus-body.hpp>
diff --git a/TelepathyQt4/Client/dbus.h b/TelepathyQt4/Client/dbus.h
index 2875c5e..edcc0e7 100644
--- a/TelepathyQt4/Client/dbus.h
+++ b/TelepathyQt4/Client/dbus.h
@@ -22,8 +22,8 @@
 #ifndef _TelepathyQt4_cli_dbus_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_dbus_h_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#error IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 /**
diff --git a/TelepathyQt4/Client/media-session-handler.cpp b/TelepathyQt4/Client/media-session-handler.cpp
index f15e5d5..dbfa591 100644
--- a/TelepathyQt4/Client/media-session-handler.cpp
+++ b/TelepathyQt4/Client/media-session-handler.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #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 601e584..e09f1cc 100644
--- a/TelepathyQt4/Client/media-session-handler.h
+++ b/TelepathyQt4/Client/media-session-handler.h
@@ -22,8 +22,8 @@
 #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
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 /**
diff --git a/TelepathyQt4/Client/media-stream-handler.cpp b/TelepathyQt4/Client/media-stream-handler.cpp
index 52f3971..52b05d2 100644
--- a/TelepathyQt4/Client/media-stream-handler.cpp
+++ b/TelepathyQt4/Client/media-stream-handler.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #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 ba42a84..b8ace47 100644
--- a/TelepathyQt4/Client/media-stream-handler.h
+++ b/TelepathyQt4/Client/media-stream-handler.h
@@ -22,8 +22,8 @@
 #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
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 /**
diff --git a/TelepathyQt4/Client/optional-interface-factory.cpp b/TelepathyQt4/Client/optional-interface-factory.cpp
index e3e915d..eaaa12c 100644
--- a/TelepathyQt4/Client/optional-interface-factory.cpp
+++ b/TelepathyQt4/Client/optional-interface-factory.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #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 f01466e..a74a393 100644
--- a/TelepathyQt4/Client/optional-interface-factory.h
+++ b/TelepathyQt4/Client/optional-interface-factory.h
@@ -22,8 +22,8 @@
 #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
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 /**
diff --git a/TelepathyQt4/Client/pending-channel.cpp b/TelepathyQt4/Client/pending-channel.cpp
index fd36bbf..ef0f44f 100644
--- a/TelepathyQt4/Client/pending-channel.cpp
+++ b/TelepathyQt4/Client/pending-channel.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #include "pending-channel.h"
 #include "pending-channel.moc.hpp"
 
diff --git a/TelepathyQt4/Client/pending-channel.h b/TelepathyQt4/Client/pending-channel.h
index af6703d..8ffe296 100644
--- a/TelepathyQt4/Client/pending-channel.h
+++ b/TelepathyQt4/Client/pending-channel.h
@@ -22,8 +22,8 @@
 #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
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 /**
diff --git a/TelepathyQt4/Client/pending-operation.cpp b/TelepathyQt4/Client/pending-operation.cpp
index e525a16..c40e198 100644
--- a/TelepathyQt4/Client/pending-operation.cpp
+++ b/TelepathyQt4/Client/pending-operation.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #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 8353fbb..8ed40b7 100644
--- a/TelepathyQt4/Client/pending-operation.h
+++ b/TelepathyQt4/Client/pending-operation.h
@@ -22,8 +22,8 @@
 #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
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <QObject>
diff --git a/TelepathyQt4/Client/properties.cpp b/TelepathyQt4/Client/properties.cpp
index dcb57a5..8249918 100644
--- a/TelepathyQt4/Client/properties.cpp
+++ b/TelepathyQt4/Client/properties.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #include "properties.h"
 
 #include <TelepathyQt4/_gen/cli-properties-body.hpp>
diff --git a/TelepathyQt4/Client/properties.h b/TelepathyQt4/Client/properties.h
index d21952b..1062619 100644
--- a/TelepathyQt4/Client/properties.h
+++ b/TelepathyQt4/Client/properties.h
@@ -22,8 +22,8 @@
 #ifndef _TelepathyQt4_cli_properties_h_HEADER_GUARD_
 #define _TelepathyQt4_cli_properties_h_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#error IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 /**
diff --git a/TelepathyQt4/Client/simple-pending-operations.h b/TelepathyQt4/Client/simple-pending-operations.h
index 2f980d7..63090bb 100644
--- a/TelepathyQt4/Client/simple-pending-operations.h
+++ b/TelepathyQt4/Client/simple-pending-operations.h
@@ -22,8 +22,8 @@
 #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
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <QObject>
diff --git a/TelepathyQt4/Constants b/TelepathyQt4/Constants
index b48723d..11be2ee 100644
--- a/TelepathyQt4/Constants
+++ b/TelepathyQt4/Constants
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Constants_HEADER_GUARD_
 #define _TelepathyQt4_Constants_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/constants.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Debug b/TelepathyQt4/Debug
index bebb057..fe5aab6 100644
--- a/TelepathyQt4/Debug
+++ b/TelepathyQt4/Debug
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Debug_HEADER_GUARD_
 #define _TelepathyQt4_Debug_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/debug.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/KeyFile b/TelepathyQt4/KeyFile
index 3e4c9da..0839310 100644
--- a/TelepathyQt4/KeyFile
+++ b/TelepathyQt4/KeyFile
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_KeyFile_HEADER_GUARD_
 #define _TelepathyQt4_KeyFile_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/key-file.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Makefile.am b/TelepathyQt4/Makefile.am
index cdda6b2..9bf100e 100644
--- a/TelepathyQt4/Makefile.am
+++ b/TelepathyQt4/Makefile.am
@@ -224,7 +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' \
+		--must-define='IN_TELEPATHY_QT4_HEADER' \
 		--specxml=$< \
 		> $@.tmp && mv $@.tmp $@
 
@@ -237,7 +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' \
+		--must-define='IN_TELEPATHY_QT4_HEADER' \
 		--specxml=$<
 
 # Things generated per interface group
@@ -303,7 +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' \
+		--must-define='IN_TELEPATHY_QT4_HEADER' \
 		$$mainiface
 
 %.moc.hpp: %.h _gen/constants.h _gen/types.h
diff --git a/TelepathyQt4/ManagerFile b/TelepathyQt4/ManagerFile
index 9fbc9ca..11b4601 100644
--- a/TelepathyQt4/ManagerFile
+++ b/TelepathyQt4/ManagerFile
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_ManagerFile_HEADER_GUARD_
 #define _TelepathyQt4_ManagerFile_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/manager-file.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/Types b/TelepathyQt4/Types
index 5600bc8..0bd48cc 100644
--- a/TelepathyQt4/Types
+++ b/TelepathyQt4/Types
@@ -1,13 +1,13 @@
 #ifndef _TelepathyQt4_Types_HEADER_GUARD_
 #define _TelepathyQt4_Types_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#define IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#define IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/types.h>
 
-#undef IN_TELEPATHY_QT4_INTERNALS
+#undef IN_TELEPATHY_QT4_HEADER
 
 #endif
 // vim:set ft=cpp:
diff --git a/TelepathyQt4/constants.h b/TelepathyQt4/constants.h
index 46df7fd..712fb34 100644
--- a/TelepathyQt4/constants.h
+++ b/TelepathyQt4/constants.h
@@ -22,8 +22,8 @@
 #ifndef _TelepathyQt4_constants_h_HEADER_GUARD_
 #define _TelepathyQt4_constants_h_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#error IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 /**
diff --git a/TelepathyQt4/debug.cpp b/TelepathyQt4/debug.cpp
index 1982a4e..567bbe8 100644
--- a/TelepathyQt4/debug.cpp
+++ b/TelepathyQt4/debug.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #include "debug.h"
 #include "debug-internal.h"
 
diff --git a/TelepathyQt4/debug.h b/TelepathyQt4/debug.h
index 05c2a23..a6652bc 100644
--- a/TelepathyQt4/debug.h
+++ b/TelepathyQt4/debug.h
@@ -22,8 +22,8 @@
 #ifndef _TelepathyQt4_debug_h_HEADER_GUARD_
 #define _TelepathyQt4_debug_h_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#error IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 /**
diff --git a/TelepathyQt4/key-file.cpp b/TelepathyQt4/key-file.cpp
index b0e77ea..afbf204 100644
--- a/TelepathyQt4/key-file.cpp
+++ b/TelepathyQt4/key-file.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #include "key-file.h"
 
 #include "debug-internal.h"
diff --git a/TelepathyQt4/key-file.h b/TelepathyQt4/key-file.h
index 1b88a89..98dbb65 100644
--- a/TelepathyQt4/key-file.h
+++ b/TelepathyQt4/key-file.h
@@ -22,8 +22,8 @@
 #ifndef _TelepathyQt4_key_file_h_HEADER_GUARD_
 #define _TelepathyQt4_key_file_h_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#error IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <QtCore/QString>
diff --git a/TelepathyQt4/manager-file.cpp b/TelepathyQt4/manager-file.cpp
index 86407cc..823bc5b 100644
--- a/TelepathyQt4/manager-file.cpp
+++ b/TelepathyQt4/manager-file.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #include "manager-file.h"
 
 #include "debug-internal.h"
diff --git a/TelepathyQt4/manager-file.h b/TelepathyQt4/manager-file.h
index 8921a98..9669fdd 100644
--- a/TelepathyQt4/manager-file.h
+++ b/TelepathyQt4/manager-file.h
@@ -22,8 +22,8 @@
 #ifndef _TelepathyQt4_manager_file_h_HEADER_GUARD_
 #define _TelepathyQt4_manager_file_h_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#error IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/Types>
diff --git a/TelepathyQt4/types.cpp b/TelepathyQt4/types.cpp
index 6595ce7..229d9fc 100644
--- a/TelepathyQt4/types.cpp
+++ b/TelepathyQt4/types.cpp
@@ -19,5 +19,5 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define IN_TELEPATHY_QT4_INTERNALS
+#define IN_TELEPATHY_QT4_HEADER
 #include "_gen/types-body.hpp"
diff --git a/TelepathyQt4/types.h b/TelepathyQt4/types.h
index f7ac908..57fb01c 100644
--- a/TelepathyQt4/types.h
+++ b/TelepathyQt4/types.h
@@ -22,8 +22,8 @@
 #ifndef _TelepathyQt4_types_h_HEADER_GUARD_
 #define _TelepathyQt4_types_h_HEADER_GUARD_
 
-#ifndef IN_TELEPATHY_QT4_INTERNALS
-#error IN_TELEPATHY_QT4_INTERNALS
+#ifndef IN_TELEPATHY_QT4_HEADER
+#error IN_TELEPATHY_QT4_HEADER
 #endif
 
 #include <TelepathyQt4/_gen/types.h>
-- 
1.5.6.5

More information about the Telepathy-commits mailing list