Moved TelepathyQt4/cli-* to TelepathyQt4/Client/.

48 files changed, 181 insertions, 149 deletions

diff --git a/qt4/TelepathyQt4/Client/Account b/qt4/TelepathyQt4/Client/Account
new file mode 100644
index 000000000..c5d2dbd02
--- /dev/null
+++ b/qt4/TelepathyQt4/Client/Account
@@ -0,0 +1,7 @@
+#ifndef _TelepathyQt4_Client_Account_HEADER_GUARD_
+#define _TelepathyQt4_Client_Account_HEADER_GUARD_
+
+#include <TelepathyQt4/Client/account.h>
+
+#endif
+// vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/AccountManager b/qt4/TelepathyQt4/Client/AccountManager
index ae99e7f56..194e63855 100644
--- a/qt4/TelepathyQt4/Client/AccountManager
+++ b/qt4/TelepathyQt4/Client/AccountManager
@@ -1,9 +1,7 @@
 #ifndef _TelepathyQt4_Client_AccountManager_HEADER_GUARD_
 #define _TelepathyQt4_Client_AccountManager_HEADER_GUARD_
 
-#include "TelepathyQt4/cli-account.h"
-
-#include "TelepathyQt4/cli-account-manager.h"
+#include <TelepathyQt4/Client/account-manager.h>
 
 #endif
 // vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/Channel b/qt4/TelepathyQt4/Client/Channel
index f804921cc..b5ae6be22 100644
--- a/qt4/TelepathyQt4/Client/Channel
+++ b/qt4/TelepathyQt4/Client/Channel
@@ -1,6 +1,7 @@
 #ifndef _TelepathyQt4_Client_Channel_HEADER_GUARD_
 #define _TelepathyQt4_Client_Channel_HEADER_GUARD_
 
-#include <TelepathyQt4/cli-channel.h>
+#include <TelepathyQt4/Client/channel.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/Connection b/qt4/TelepathyQt4/Client/Connection
index 6c22f58e0..b2f2ed7a4 100644
--- a/qt4/TelepathyQt4/Client/Connection
+++ b/qt4/TelepathyQt4/Client/Connection
@@ -1,6 +1,7 @@
 #ifndef _TelepathyQt4_Client_Connection_HEADER_GUARD_
 #define _TelepathyQt4_Client_Connection_HEADER_GUARD_
 
-#include <TelepathyQt4/cli-connection.h>
+#include <TelepathyQt4/Client/connection.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/ConnectionManager b/qt4/TelepathyQt4/Client/ConnectionManager
index 262aa8b3e..194bd2952 100644
--- a/qt4/TelepathyQt4/Client/ConnectionManager
+++ b/qt4/TelepathyQt4/Client/ConnectionManager
@@ -1,6 +1,7 @@
 #ifndef _TelepathyQt4_Client_ConnectionManager_HEADER_GUARD_
 #define _TelepathyQt4_Client_ConnectionManager_HEADER_GUARD_
 
-#include <TelepathyQt4/cli-connection-manager.h>
+#include <TelepathyQt4/Client/connection-manager.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/DBus b/qt4/TelepathyQt4/Client/DBus
index 1b9ba3e94..ac073832a 100644
--- a/qt4/TelepathyQt4/Client/DBus
+++ b/qt4/TelepathyQt4/Client/DBus
@@ -1,6 +1,7 @@
 #ifndef _TelepathyQt4_Client_DBus_HEADER_GUARD_
 #define _TelepathyQt4_Client_DBus_HEADER_GUARD_
 
-#include <TelepathyQt4/cli-dbus.h>
+#include <TelepathyQt4/Client/dbus.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/DBusProxy b/qt4/TelepathyQt4/Client/DBusProxy
index d5b2c358e..3b4fbd206 100644
--- a/qt4/TelepathyQt4/Client/DBusProxy
+++ b/qt4/TelepathyQt4/Client/DBusProxy
@@ -1,6 +1,7 @@
-#ifndef _TelepathyQt4_Client_DBus_Proxy_HEADER_GUARD_
-#define _TelepathyQt4_Client_DBus_Proxy_HEADER_GUARD_
+#ifndef _TelepathyQt4_Client_DBusProxy_HEADER_GUARD_
+#define _TelepathyQt4_Client_DBusProxy_HEADER_GUARD_
 
-#include <TelepathyQt4/cli-dbus-proxy.h>
+#include <TelepathyQt4/Client/dbus-proxy.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/MediaSessionHandler b/qt4/TelepathyQt4/Client/MediaSessionHandler
index c7fe9f20b..5c82be0b4 100644
--- a/qt4/TelepathyQt4/Client/MediaSessionHandler
+++ b/qt4/TelepathyQt4/Client/MediaSessionHandler
@@ -1,6 +1,7 @@
 #ifndef _TelepathyQt4_Client_MediaSessionHandler_HEADER_GUARD_
 #define _TelepathyQt4_Client_MediaSessionHandler_HEADER_GUARD_
 
-#include <TelepathyQt4/cli-media-session-handler.h>
+#include <TelepathyQt4/Client/media-session-handler.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/MediaStreamHandler b/qt4/TelepathyQt4/Client/MediaStreamHandler
index edd1dd651..ec3464084 100644
--- a/qt4/TelepathyQt4/Client/MediaStreamHandler
+++ b/qt4/TelepathyQt4/Client/MediaStreamHandler
@@ -1,6 +1,7 @@
 #ifndef _TelepathyQt4_Client_MediaStreamHandler_HEADER_GUARD_
 #define _TelepathyQt4_Client_MediaStreamHandler_HEADER_GUARD_
 
-#include <TelepathyQt4/cli-media-stream-handler.h>
+#include <TelepathyQt4/Client/media-stream-handler.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/OptionalInterfaceFactory b/qt4/TelepathyQt4/Client/OptionalInterfaceFactory
index 00c06e535..b8af12abc 100644
--- a/qt4/TelepathyQt4/Client/OptionalInterfaceFactory
+++ b/qt4/TelepathyQt4/Client/OptionalInterfaceFactory
@@ -1,6 +1,7 @@
 #ifndef _TelepathyQt4_Client_OptionalInterfaceFactory_HEADER_GUARD_
 #define _TelepathyQt4_Client_OptionalInterfaceFactory_HEADER_GUARD_
 
-#include <TelepathyQt4/cli-optional-interface-factory.h>
+#include <TelepathyQt4/Client/optional-interface-factory.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/PendingChannel b/qt4/TelepathyQt4/Client/PendingChannel
new file mode 100644
index 000000000..cbb0c5e4f
--- /dev/null
+++ b/qt4/TelepathyQt4/Client/PendingChannel
@@ -0,0 +1,7 @@
+#ifndef _TelepathyQt4_Client_PendingChannel_HEADER_GUARD_
+#define _TelepathyQt4_Client_PendingChannel_HEADER_GUARD_
+
+#include <TelepathyQt4/Client/pending-channel.h>
+
+#endif
+// vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/PendingFailure b/qt4/TelepathyQt4/Client/PendingFailure
index a49d428e1..8bd42335c 100644
--- a/qt4/TelepathyQt4/Client/PendingFailure
+++ b/qt4/TelepathyQt4/Client/PendingFailure
@@ -1,8 +1,7 @@
 #ifndef _TelepathyQt4_Client_PendingFailure_HEADER_GUARD_
 #define _TelepathyQt4_Client_PendingFailure_HEADER_GUARD_
 
-#include <TelepathyQt4/cli-simple-pending-operations.h>
+#include <TelepathyQt4/Client/simple-pending-operations.h>
 
 #endif
 // vim:set ft=cpp:
-
diff --git a/qt4/TelepathyQt4/Client/PendingOperation b/qt4/TelepathyQt4/Client/PendingOperation
index 9ac8eba40..34f704d23 100644
--- a/qt4/TelepathyQt4/Client/PendingOperation
+++ b/qt4/TelepathyQt4/Client/PendingOperation
@@ -1,6 +1,7 @@
 #ifndef _TelepathyQt4_Client_PendingOperation_HEADER_GUARD_
 #define _TelepathyQt4_Client_PendingOperation_HEADER_GUARD_
 
-#include <TelepathyQt4/cli-pending-operation.h>
+#include <TelepathyQt4/Client/pending-operation.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/PendingSuccess b/qt4/TelepathyQt4/Client/PendingSuccess
index 8f9d66ab1..c62c89d7a 100644
--- a/qt4/TelepathyQt4/Client/PendingSuccess
+++ b/qt4/TelepathyQt4/Client/PendingSuccess
@@ -1,7 +1,7 @@
 #ifndef _TelepathyQt4_Client_PendingSuccess_HEADER_GUARD_
 #define _TelepathyQt4_Client_PendingSuccess_HEADER_GUARD_
 
-#include <TelepathyQt4/cli-simple-pending-operations.h>
+#include <TelepathyQt4/Client/simple-pending-operations.h>
 
 #endif
 // vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/PendingVoidMethodCall b/qt4/TelepathyQt4/Client/PendingVoidMethodCall
index 9e3a183ef..f9f50e020 100644
--- a/qt4/TelepathyQt4/Client/PendingVoidMethodCall
+++ b/qt4/TelepathyQt4/Client/PendingVoidMethodCall
@@ -1,8 +1,7 @@
 #ifndef _TelepathyQt4_Client_PendingVoidMethodCall_HEADER_GUARD_
 #define _TelepathyQt4_Client_PendingVoidMethodCall_HEADER_GUARD_
 
-#include <TelepathyQt4/cli-simple-pending-operations.h>
+#include <TelepathyQt4/Client/simple-pending-operations.h>
 
 #endif
 // vim:set ft=cpp:
-
diff --git a/qt4/TelepathyQt4/Client/Properties b/qt4/TelepathyQt4/Client/Properties
index 788ba2a8b..3eb1bba6e 100644
--- a/qt4/TelepathyQt4/Client/Properties
+++ b/qt4/TelepathyQt4/Client/Properties
@@ -1,6 +1,7 @@
 #ifndef _TelepathyQt4_Client_Properties_HEADER_GUARD_
 #define _TelepathyQt4_Client_Properties_HEADER_GUARD_
 
-#include <TelepathyQt4/cli-properties.h>
+#include <TelepathyQt4/Client/properties.h>
 
 #endif
+// vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/StatefulDBusProxy b/qt4/TelepathyQt4/Client/StatefulDBusProxy
new file mode 100644
index 000000000..5c81a505b
--- /dev/null
+++ b/qt4/TelepathyQt4/Client/StatefulDBusProxy
@@ -0,0 +1,7 @@
+#ifndef _TelepathyQt4_Client_StatefulDBusProxy_HEADER_GUARD_
+#define _TelepathyQt4_Client_StatefulDBusProxy_HEADER_GUARD_
+
+#include <TelepathyQt4/Client/dbus-proxy.h>
+
+#endif
+// vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/Client/StatelessDBusProxy b/qt4/TelepathyQt4/Client/StatelessDBusProxy
new file mode 100644
index 000000000..e1093e670
--- /dev/null
+++ b/qt4/TelepathyQt4/Client/StatelessDBusProxy
@@ -0,0 +1,7 @@
+#ifndef _TelepathyQt4_Client_StatelessDBusProxy_HEADER_GUARD_
+#define _TelepathyQt4_Client_StatelessDBusProxy_HEADER_GUARD_
+
+#include <TelepathyQt4/Client/dbus-proxy.h>
+
+#endif
+// vim:set ft=cpp:
diff --git a/qt4/TelepathyQt4/cli-account-manager.cpp b/qt4/TelepathyQt4/Client/account-manager.cpp
index 04150fb8f..3dd023169 100644
--- a/qt4/TelepathyQt4/cli-account-manager.cpp
+++ b/qt4/TelepathyQt4/Client/account-manager.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "cli-account-manager.h"
+#include "account-manager.h"
 
 #include <TelepathyQt4/_gen/cli-account-manager.moc.hpp>
 #include <TelepathyQt4/_gen/cli-account-manager-body.hpp>
diff --git a/qt4/TelepathyQt4/cli-account-manager.h b/qt4/TelepathyQt4/Client/account-manager.h
index ff5fe859e..b82f99727 100644
--- a/qt4/TelepathyQt4/cli-account-manager.h
+++ b/qt4/TelepathyQt4/Client/account-manager.h
@@ -40,11 +40,6 @@
  * ...
  */
 
-#include "TelepathyQt4/_gen/cli-account-manager.h"
-
-#if 0
-#include "TelepathyQt4/_gen/cli-account-manager-interface-creation.h"
-#include "TelepathyQt4/_gen/cli-account-manager-interface-query.h"
-#endif
+#include <TelepathyQt4/_gen/cli-account-manager.h>
 
 #endif
diff --git a/qt4/TelepathyQt4/cli-account.cpp b/qt4/TelepathyQt4/Client/account.cpp
index 08adfe38b..249931e5f 100644
--- a/qt4/TelepathyQt4/cli-account.cpp
+++ b/qt4/TelepathyQt4/Client/account.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "cli-account.h"
+#include "account.h"
 
 #include <TelepathyQt4/_gen/cli-account-body.hpp>
 #include <TelepathyQt4/_gen/cli-account.moc.hpp>
diff --git a/qt4/TelepathyQt4/cli-account.h b/qt4/TelepathyQt4/Client/account.h
index a39733b2b..20f149b68 100644
--- a/qt4/TelepathyQt4/cli-account.h
+++ b/qt4/TelepathyQt4/Client/account.h
@@ -33,13 +33,9 @@
  * backwards compatibility helpers for older services and other utilities.
  */
 
-/* See cli-account-manager.h for doxygen */
+/* See account-manager.h for doxygen */
 
-#include "TelepathyQt4/_gen/cli-account.h"
-
-#if 0
-#include "TelepathyQt4/_gen/cli-account-interface-avatar.h"
-#endif
+#include <TelepathyQt4/_gen/cli-account.h>
 
 #endif
 
diff --git a/qt4/TelepathyQt4/cli-channel.cpp b/qt4/TelepathyQt4/Client/channel.cpp
index 545ade7e2..320e27706 100644
--- a/qt4/TelepathyQt4/cli-channel.cpp
+++ b/qt4/TelepathyQt4/Client/channel.cpp
@@ -19,17 +19,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "cli-channel.h"
+#include "channel.h"
+#include "channel.moc.hpp"
 
-#include "_gen/cli-channel-body.hpp"
-#include "_gen/cli-channel.moc.hpp"
-#include "cli-channel.moc.hpp"
+#include "dbus.h"
 
-#include <QQueue>
+#include <TelepathyQt4/_gen/cli-channel-body.hpp>
+#include <TelepathyQt4/_gen/cli-channel.moc.hpp>
+
+#include <TelepathyQt4/Constants>
+#include <TelepathyQt4/debug-internal.hpp>
 
-#include "cli-dbus.h"
-#include "constants.h"
-#include "debug-internal.hpp"
+#include <QQueue>
 
 namespace Telepathy
 {
diff --git a/qt4/TelepathyQt4/cli-channel.h b/qt4/TelepathyQt4/Client/channel.h
index 7bcb4b94b..c4ae5c9a9 100644
--- a/qt4/TelepathyQt4/cli-channel.h
+++ b/qt4/TelepathyQt4/Client/channel.h
@@ -43,21 +43,14 @@
 
 #include <TelepathyQt4/_gen/cli-channel.h>
 
-#include <QSet>
-
-#include <QDBusPendingCallWatcher>
-
-namespace Telepathy {
-namespace Client {
-class Channel;
-}
-}
-
 #include <TelepathyQt4/Client/Connection>
 #include <TelepathyQt4/Client/DBus>
 #include <TelepathyQt4/Client/DBusProxy>
 #include <TelepathyQt4/Client/OptionalInterfaceFactory>
 
+#include <QSet>
+#include <QDBusPendingCallWatcher>
+
 namespace Telepathy
 {
 namespace Client
@@ -66,7 +59,7 @@ namespace Client
 /**
  * \class Channel
  * \ingroup clientchannel
- * \headerfile TelepathyQt4/cli-channel.h <TelepathyQt4/Client/Channel>
+ * \headerfile TelepathyQt4/Client/channel.h <TelepathyQt4/Client/Channel>
  *
  * High-level proxy object for accessing remote %Telepathy %Channel objects.
  *
diff --git a/qt4/TelepathyQt4/cli-connection-manager.cpp b/qt4/TelepathyQt4/Client/connection-manager.cpp
index 3c95d622d..415ab9d65 100644
--- a/qt4/TelepathyQt4/cli-connection-manager.cpp
+++ b/qt4/TelepathyQt4/Client/connection-manager.cpp
@@ -19,17 +19,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "cli-connection-manager.h"
+#include "connection-manager.h"
+#include "connection-manager.moc.hpp"
 
-#include <QtCore/QQueue>
-#include <QtCore/QStringList>
-#include <QtCore/QTimer>
+#include <TelepathyQt4/_gen/cli-connection-manager-body.hpp>
+#include <TelepathyQt4/_gen/cli-connection-manager.moc.hpp>
 
 #include <TelepathyQt4/Client/DBus>
 #include <TelepathyQt4/ManagerFile>
 #include <TelepathyQt4/Types>
+#include <TelepathyQt4/debug-internal.hpp>
 
-#include "TelepathyQt4/debug-internal.hpp"
+#include <QQueue>
+#include <QStringList>
+#include <QTimer>
 
 namespace Telepathy
 {
@@ -454,7 +457,3 @@ void ConnectionManager::continueIntrospection()
 
 } // Telepathy::Client
 } // Telepathy
-
-#include <TelepathyQt4/_gen/cli-connection-manager-body.hpp>
-#include <TelepathyQt4/_gen/cli-connection-manager.moc.hpp>
-#include <TelepathyQt4/cli-connection-manager.moc.hpp>
diff --git a/qt4/TelepathyQt4/cli-connection-manager.h b/qt4/TelepathyQt4/Client/connection-manager.h
index 0456a974e..fd8133589 100644
--- a/qt4/TelepathyQt4/cli-connection-manager.h
+++ b/qt4/TelepathyQt4/Client/connection-manager.h
@@ -42,10 +42,10 @@
 
 #include <TelepathyQt4/_gen/cli-connection-manager.h>
 
-#include <TelepathyQt4/Constants>
 #include <TelepathyQt4/Client/DBus>
 #include <TelepathyQt4/Client/DBusProxy>
 #include <TelepathyQt4/Client/OptionalInterfaceFactory>
+#include <TelepathyQt4/Constants>
 
 namespace Telepathy
 {
@@ -155,7 +155,7 @@ private:
 /**
  * \class ConnectionManager
  * \ingroup clientcm
- * \headerfile TelepathyQt4/cli-connection-manager.h <TelepathyQt4/Client/ConnectionManager>
+ * \headerfile TelepathyQt4/Client/connection-manager.h <TelepathyQt4/Client/ConnectionManager>
  *
  * Object representing a Telepathy connection manager. Connection managers
  * allow connections to be made on one or more protocols.
diff --git a/qt4/TelepathyQt4/cli-connection.cpp b/qt4/TelepathyQt4/Client/connection.cpp
index 759dc4950..4e8ac841c 100644
--- a/qt4/TelepathyQt4/cli-connection.cpp
+++ b/qt4/TelepathyQt4/Client/connection.cpp
@@ -19,21 +19,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "cli-connection.h"
+#include "connection.h"
+#include "connection.moc.hpp"
 
 #include <TelepathyQt4/_gen/cli-connection-body.hpp>
 #include <TelepathyQt4/_gen/cli-connection.moc.hpp>
-#include <TelepathyQt4/cli-connection.moc.hpp>
+
+#include <TelepathyQt4/Client/PendingChannel>
+#include <TelepathyQt4/Client/PendingVoidMethodCall>
+#include <TelepathyQt4/debug-internal.hpp>
 
 #include <QMap>
 #include <QQueue>
 #include <QString>
 #include <QtGlobal>
 
-#include <TelepathyQt4/Client/PendingVoidMethodCall>
-
-#include "debug-internal.hpp"
-
 namespace Telepathy
 {
 namespace Client
diff --git a/qt4/TelepathyQt4/cli-connection.h b/qt4/TelepathyQt4/Client/connection.h
index acf355a81..a3191b0a6 100644
--- a/qt4/TelepathyQt4/cli-connection.h
+++ b/qt4/TelepathyQt4/Client/connection.h
@@ -49,17 +49,21 @@ class Connection;
 
 #include <TelepathyQt4/_gen/cli-connection.h>
 
-#include <QDBusPendingCallWatcher>
-#include <QStringList>
-
-#include <TelepathyQt4/Constants>
 #include <TelepathyQt4/Client/Channel>
 #include <TelepathyQt4/Client/DBus>
 #include <TelepathyQt4/Client/DBusProxy>
 #include <TelepathyQt4/Client/OptionalInterfaceFactory>
 #include <TelepathyQt4/Client/PendingOperation>
+#include <TelepathyQt4/Constants>
+
+#include <QDBusPendingCallWatcher>
+#include <QStringList>
 
-#include "cli-pending-channel.h"
+namespace Telepathy {
+namespace Client {
+class PendingChannel;
+}
+};
 
 namespace Telepathy
 {
@@ -69,7 +73,7 @@ namespace Client
 /**
  * \class Connection
  * \ingroup clientconn
- * \headerfile <TelepathyQt4/cli-connection.h> <TelepathyQt4/Client/Connection>
+ * \headerfile <TelepathyQt4/Client/connection.h> <TelepathyQt4/Client/Connection>
  *
  * High-level proxy object for accessing remote %Telepathy %Connection objects.
  *
diff --git a/qt4/TelepathyQt4/cli-dbus-proxy.cpp b/qt4/TelepathyQt4/Client/dbus-proxy.cpp
index 9a4d65413..f98b57dfc 100644
--- a/qt4/TelepathyQt4/cli-dbus-proxy.cpp
+++ b/qt4/TelepathyQt4/Client/dbus-proxy.cpp
@@ -19,9 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "cli-dbus-proxy.h"
+#include "dbus-proxy.h"
+#include "dbus-proxy.moc.hpp"
 
-#include "debug-internal.hpp"
+#include <TelepathyQt4/debug-internal.hpp>
 
 namespace Telepathy
 {
@@ -89,5 +90,3 @@ StatefulDBusProxy::StatefulDBusProxy(const QDBusConnection& dbusConnection,
 
 }
 }
-
-#include "cli-dbus-proxy.moc.hpp"
diff --git a/qt4/TelepathyQt4/cli-dbus-proxy.h b/qt4/TelepathyQt4/Client/dbus-proxy.h
index 79e409710..4307b4185 100644
--- a/qt4/TelepathyQt4/cli-dbus-proxy.h
+++ b/qt4/TelepathyQt4/Client/dbus-proxy.h
@@ -24,8 +24,8 @@
 
 // FIXME: What groups should this be in/define?
 
-#include <QtDBus/QDBusAbstractInterface>
-#include <QtDBus/QDBusConnection>
+#include <QDBusAbstractInterface>
+#include <QDBusConnection>
 
 namespace Telepathy
 {
@@ -35,7 +35,7 @@ namespace Client
 /**
  * \class DBusProxy
  * \ingroup FIXME: what group is it in?
- * \headerfile TelepathyQt4/cli-dbus-proxy.h <TelepathyQt4/Client/DBusProxy>
+ * \headerfile TelepathyQt4/Client/dbus-proxy.h <TelepathyQt4/Client/DBusProxy>
  *
  * Base class representing a remote object available over D-Bus.
  *
@@ -134,7 +134,7 @@ private:
 /**
  * \class StatelessDBusProxy
  * \ingroup FIXME: what group is it in?
- * \headerfile TelepathyQt4/cli-dbus-proxy.h <TelepathyQt4/Client/DBusProxy>
+ * \headerfile TelepathyQt4/Client/dbus-proxy.h <TelepathyQt4/Client/DBusProxy>
  *
  * Base class representing a remote object whose API is basically stateless.
  * These objects can remain valid even if the service providing them exits
@@ -161,7 +161,7 @@ private:
 /**
  * \class StatefulDBusProxy
  * \ingroup FIXME: what group is it in?
- * \headerfile TelepathyQt4/cli-dbus-proxy.h <TelepathyQt4/Client/DBusProxy>
+ * \headerfile TelepathyQt4/Client/dbus-proxy.h <TelepathyQt4/Client/DBusProxy>
  *
  * Base class representing a remote object whose API is stateful. These
  * objects do not remain useful if the service providing them exits or
diff --git a/qt4/TelepathyQt4/cli-dbus.cpp b/qt4/TelepathyQt4/Client/dbus.cpp
index c479e6d27..39f7578d3 100644
--- a/qt4/TelepathyQt4/cli-dbus.cpp
+++ b/qt4/TelepathyQt4/Client/dbus.cpp
@@ -19,5 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "dbus.h"
+
 #include <TelepathyQt4/_gen/cli-dbus-body.hpp>
 #include <TelepathyQt4/_gen/cli-dbus.moc.hpp>
diff --git a/qt4/TelepathyQt4/cli-dbus.h b/qt4/TelepathyQt4/Client/dbus.h
index 5b130e4a6..5b130e4a6 100644
--- a/qt4/TelepathyQt4/cli-dbus.h
+++ b/qt4/TelepathyQt4/Client/dbus.h
diff --git a/qt4/TelepathyQt4/cli-media-session-handler.cpp b/qt4/TelepathyQt4/Client/media-session-handler.cpp
index efcdba855..d69529b13 100644
--- a/qt4/TelepathyQt4/cli-media-session-handler.cpp
+++ b/qt4/TelepathyQt4/Client/media-session-handler.cpp
@@ -19,5 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "media-session-handler.h"
+
 #include <TelepathyQt4/_gen/cli-media-session-handler-body.hpp>
 #include <TelepathyQt4/_gen/cli-media-session-handler.moc.hpp>
diff --git a/qt4/TelepathyQt4/cli-media-session-handler.h b/qt4/TelepathyQt4/Client/media-session-handler.h
index e566c6004..e566c6004 100644
--- a/qt4/TelepathyQt4/cli-media-session-handler.h
+++ b/qt4/TelepathyQt4/Client/media-session-handler.h
diff --git a/qt4/TelepathyQt4/cli-media-stream-handler.cpp b/qt4/TelepathyQt4/Client/media-stream-handler.cpp
index c8d5170ad..7209523fe 100644
--- a/qt4/TelepathyQt4/cli-media-stream-handler.cpp
+++ b/qt4/TelepathyQt4/Client/media-stream-handler.cpp
@@ -19,5 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "media-stream-handler.h"
+
 #include <TelepathyQt4/_gen/cli-media-stream-handler-body.hpp>
 #include <TelepathyQt4/_gen/cli-media-stream-handler.moc.hpp>
diff --git a/qt4/TelepathyQt4/cli-media-stream-handler.h b/qt4/TelepathyQt4/Client/media-stream-handler.h
index 58903b726..58903b726 100644
--- a/qt4/TelepathyQt4/cli-media-stream-handler.h
+++ b/qt4/TelepathyQt4/Client/media-stream-handler.h
diff --git a/qt4/TelepathyQt4/cli-optional-interface-factory.cpp b/qt4/TelepathyQt4/Client/optional-interface-factory.cpp
index 9406fe056..2e070e41c 100644
--- a/qt4/TelepathyQt4/cli-optional-interface-factory.cpp
+++ b/qt4/TelepathyQt4/Client/optional-interface-factory.cpp
@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "cli-optional-interface-factory.h"
+#include "optional-interface-factory.h"
+
+#include <TelepathyQt4/debug-internal.hpp>
 
 #include <QMap>
 #include <QString>
 
-#include "debug-internal.hpp"
-
 namespace Telepathy
 {
 namespace Client
diff --git a/qt4/TelepathyQt4/cli-optional-interface-factory.h b/qt4/TelepathyQt4/Client/optional-interface-factory.h
index ce6256cae..4a9adc034 100644
--- a/qt4/TelepathyQt4/cli-optional-interface-factory.h
+++ b/qt4/TelepathyQt4/Client/optional-interface-factory.h
@@ -33,9 +33,8 @@
  * backwards compatibility helpers for older services and other utilities.
  */
 
-#include <QtGlobal>
-
 #include <QDBusAbstractInterface>
+#include <QtGlobal>
 
 namespace Telepathy
 {
@@ -45,7 +44,7 @@ namespace Client
 /**
  * \class OptionalInterfaceFactory
  * \ingroup clientsideproxies
- * \headerfile <TelepathyQt4/cli-optional-interface-factory.h> <TelepathyQt4/Client/OptionalInterfaceFactory>
+ * \headerfile <TelepathyQt4/Client/optional-interface-factory.h> <TelepathyQt4/Client/OptionalInterfaceFactory>
  *
  * Implementation helper class for high-level proxy classes willing to offer
  * access to shared instances of interface proxies for optional interfaces.
diff --git a/qt4/TelepathyQt4/cli-pending-channel.cpp b/qt4/TelepathyQt4/Client/pending-channel.cpp
index 22fccc218..07d5e5437 100644
--- a/qt4/TelepathyQt4/cli-pending-channel.cpp
+++ b/qt4/TelepathyQt4/Client/pending-channel.cpp
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "cli-pending-channel.h"
+#include "pending-channel.h"
+#include "pending-channel.moc.hpp"
 
-#include "cli-pending-channel.moc.hpp"
-
-#include "debug-internal.hpp"
+#include <TelepathyQt4/Client/channel.h>
+#include <TelepathyQt4/debug-internal.hpp>
 
 namespace Telepathy
 {
diff --git a/qt4/TelepathyQt4/cli-pending-channel.h b/qt4/TelepathyQt4/Client/pending-channel.h
index 95d424393..0c93f26ab 100644
--- a/qt4/TelepathyQt4/cli-pending-channel.h
+++ b/qt4/TelepathyQt4/Client/pending-channel.h
@@ -41,18 +41,17 @@
  * interfaces.
  */
 
-namespace Telepathy
-{
-namespace Client
-{
-class PendingChannel;
-}
-}
-
-#include <TelepathyQt4/Constants>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt4/Client/Channel>
 #include <TelepathyQt4/Client/Connection>
 #include <TelepathyQt4/Client/PendingOperation>
+#include <TelepathyQt4/Constants>
+#include <TelepathyQt4/Types>
+
+namespace Telepathy {
+namespace Client {
+class Channel;
+}
+}
 
 namespace Telepathy
 {
@@ -62,7 +61,7 @@ namespace Client
 /**
  * \class PendingChannel
  * \ingroup clientconn
- * \headerfile <TelepathyQt4/cli-pending-channel.h> <TelepathyQt4/Client/Connection>
+ * \headerfile <TelepathyQt4/Client/pending-channel.h> <TelepathyQt4/Client/PendingChannel>
  *
  * Class containing the parameters of and the reply to an asynchronous channel
  * request. Instances of this class cannot be constructed directly; the only way
diff --git a/qt4/TelepathyQt4/cli-pending-operation.cpp b/qt4/TelepathyQt4/Client/pending-operation.cpp
index 81085d392..c2fe9d605 100644
--- a/qt4/TelepathyQt4/cli-pending-operation.cpp
+++ b/qt4/TelepathyQt4/Client/pending-operation.cpp
@@ -19,17 +19,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "cli-pending-operation.h"
-#include "cli-simple-pending-operations.h"
+#include "pending-operation.h"
+#include "simple-pending-operations.h"
+#include "pending-operation.moc.hpp"
+#include "simple-pending-operations.moc.hpp"
 
-#include <QTimer>
+#include <TelepathyQt4/debug-internal.hpp>
 
 #include <QDBusPendingCall>
 #include <QDBusPendingCallWatcher>
-
-#include "cli-pending-operation.moc.hpp"
-#include "cli-simple-pending-operations.moc.hpp"
-#include "debug-internal.hpp"
+#include <QTimer>
 
 namespace Telepathy
 {
diff --git a/qt4/TelepathyQt4/cli-pending-operation.h b/qt4/TelepathyQt4/Client/pending-operation.h
index ada4824cb..ada4824cb 100644
--- a/qt4/TelepathyQt4/cli-pending-operation.h
+++ b/qt4/TelepathyQt4/Client/pending-operation.h
diff --git a/qt4/TelepathyQt4/cli-properties.cpp b/qt4/TelepathyQt4/Client/properties.cpp
index f8f9065e2..dc2737875 100644
--- a/qt4/TelepathyQt4/cli-properties.cpp
+++ b/qt4/TelepathyQt4/Client/properties.cpp
@@ -19,5 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "properties.h"
+
 #include <TelepathyQt4/_gen/cli-properties-body.hpp>
 #include <TelepathyQt4/_gen/cli-properties.moc.hpp>
diff --git a/qt4/TelepathyQt4/cli-properties.h b/qt4/TelepathyQt4/Client/properties.h
index 23c85acf9..23c85acf9 100644
--- a/qt4/TelepathyQt4/cli-properties.h
+++ b/qt4/TelepathyQt4/Client/properties.h
diff --git a/qt4/TelepathyQt4/cli-simple-pending-operations.h b/qt4/TelepathyQt4/Client/simple-pending-operations.h
index bd1f5e205..bd1f5e205 100644
--- a/qt4/TelepathyQt4/cli-simple-pending-operations.h
+++ b/qt4/TelepathyQt4/Client/simple-pending-operations.h
diff --git a/qt4/TelepathyQt4/Makefile.am b/qt4/TelepathyQt4/Makefile.am
index 2b23688fd..12a397a72 100644
--- a/qt4/TelepathyQt4/Makefile.am
+++ b/qt4/TelepathyQt4/Makefile.am
@@ -35,19 +35,19 @@ libtelepathy_qt4_la_LIBADD = $(ALL_LIBS)
 libtelepathy_qt4_la_DEPENDENCIES = Makefile.am
 
 libtelepathy_qt4_la_SOURCES = \
-    cli-account.cpp \
-    cli-account-manager.cpp \
-    cli-channel.cpp \
-    cli-connection.cpp \
-    cli-connection-manager.cpp \
-    cli-dbus.cpp \
-    cli-dbus-proxy.cpp \
-    cli-media-session-handler.cpp \
-    cli-media-stream-handler.cpp \
-    cli-optional-interface-factory.cpp \
-    cli-pending-channel.cpp \
-    cli-pending-operation.cpp \
-    cli-properties.cpp \
+    Client/account.cpp \
+    Client/account-manager.cpp \
+    Client/channel.cpp \
+    Client/connection.cpp \
+    Client/connection-manager.cpp \
+    Client/dbus.cpp \
+    Client/dbus-proxy.cpp \
+    Client/media-session-handler.cpp \
+    Client/media-stream-handler.cpp \
+    Client/optional-interface-factory.cpp \
+    Client/pending-channel.cpp \
+    Client/pending-operation.cpp \
+    Client/properties.cpp \
     debug.cpp \
     debug-internal.hpp \
     key-file.cpp \
@@ -75,13 +75,13 @@ nodist_libtelepathy_qt4_la_SOURCES = \
     _gen/cli-properties-body.hpp \
     _gen/cli-properties.moc.hpp \
     _gen/types-body.hpp \
-    cli-channel.moc.hpp \
-    cli-connection.moc.hpp \
-    cli-connection-manager.moc.hpp \
-    cli-dbus-proxy.moc.hpp \
-    cli-pending-channel.moc.hpp \
-    cli-pending-operation.moc.hpp \
-    cli-simple-pending-operations.moc.hpp
+    Client/channel.moc.hpp \
+    Client/connection.moc.hpp \
+    Client/connection-manager.moc.hpp \
+    Client/dbus-proxy.moc.hpp \
+    Client/pending-channel.moc.hpp \
+    Client/pending-operation.moc.hpp \
+    Client/simple-pending-operations.moc.hpp
 
 tpqt4include_HEADERS = \
     Constants \
@@ -89,20 +89,6 @@ tpqt4include_HEADERS = \
     KeyFile \
     ManagerFile \
     Types \
-    cli-account.h \
-    cli-account-manager.h \
-    cli-channel.h \
-    cli-connection.h \
-    cli-connection-manager.h \
-    cli-dbus.h \
-    cli-dbus-proxy.h \
-    cli-media-session-handler.h \
-    cli-media-stream-handler.h \
-    cli-optional-interface-factory.h \
-    cli-pending-channel.h \
-    cli-pending-operation.h \
-    cli-properties.h \
-    cli-simple-pending-operations.h \
     constants.h \
     debug.h \
     key-file.h \
@@ -110,6 +96,7 @@ tpqt4include_HEADERS = \
     types.h
 
 tpqt4clientinclude_HEADERS = \
+    Client/Account \
     Client/AccountManager \
     Client/Channel \
     Client/Connection \
@@ -119,11 +106,28 @@ tpqt4clientinclude_HEADERS = \
     Client/MediaSessionHandler \
     Client/MediaStreamHandler \
     Client/OptionalInterfaceFactory \
+    Client/PendingChannel \
     Client/PendingFailure \
     Client/PendingOperation \
     Client/PendingSuccess \
     Client/PendingVoidMethodCall \
-    Client/Properties
+    Client/Properties \
+    Client/StatelessDBusProxy \
+    Client/StatefulDBusProxy \
+    Client/account.h \
+    Client/account-manager.h \
+    Client/channel.h \
+    Client/connection.h \
+    Client/connection-manager.h \
+    Client/dbus.h \
+    Client/dbus-proxy.h \
+    Client/media-session-handler.h \
+    Client/media-stream-handler.h \
+    Client/optional-interface-factory.h \
+    Client/pending-channel.h \
+    Client/pending-operation.h \
+    Client/properties.h \
+    Client/simple-pending-operations.h
 
 nodist_geninclude_HEADERS = \
     _gen/cli-account.h \
@@ -262,7 +266,7 @@ _gen/cli-%.h _gen/cli-%-body.hpp: _gen/spec-%.xml \
 		--typesnamespace='Telepathy' \
 		--headerfile=_gen/cli-$*.h \
 		--implfile=_gen/cli-$*-body.hpp \
-		--realinclude='TelepathyQt4/cli-$*.h' \
+		--realinclude='TelepathyQt4/Client/$*.h' \
 		--prettyinclude='TelepathyQt4/Client/'$$prettyinclude \
 		--specxml=_gen/stable-spec.xml \
 		--ifacexml=$< \
diff --git a/qt4/TelepathyQt4/Prototype/Account.cpp b/qt4/TelepathyQt4/Prototype/Account.cpp
index a85c0bc3d..b2d19d58d 100644
--- a/qt4/TelepathyQt4/Prototype/Account.cpp
+++ b/qt4/TelepathyQt4/Prototype/Account.cpp
@@ -25,6 +25,7 @@
 #include <QDebug>
 #include <QMetaProperty>
 
+#include <TelepathyQt4/Client/Account>
 #include <TelepathyQt4/Client/AccountManager>
 
 #include <TelepathyQt4/Prototype/Connection.h>
diff --git a/qt4/tests/prototype/prototype.cpp b/qt4/tests/prototype/prototype.cpp
index 321a9cf2d..03a537926 100644
--- a/qt4/tests/prototype/prototype.cpp
+++ b/qt4/tests/prototype/prototype.cpp
@@ -10,6 +10,7 @@
 
 #include <QtTest/QSignalSpy>
 
+#include <TelepathyQt4/Client/Account>
 #include <TelepathyQt4/Client/AccountManager>
 #include <TelepathyQt4/Client/ConnectionManager>
 #include <TelepathyQt4/Client/Connection>