1 files changed, 11 insertions, 13 deletions
diff --git a/Swiften/Client/CoreClient.h b/Swiften/Client/CoreClient.h
index 27031c0..8168e7b 100644
--- a/Swiften/Client/CoreClient.h
+++ b/Swiften/Client/CoreClient.h
@@ -1,68 +1,66 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <memory>
 #include <string>
 
 #include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/SafeByteArray.h>
 #include <Swiften/Client/ClientError.h>
 #include <Swiften/Client/ClientOptions.h>
 #include <Swiften/Entity/Entity.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/TLS/CertificateWithKey.h>
 
 namespace Swift {
+    class CertificateTrustChecker;
     class ChainedConnector;
-    class Message;
-    class Presence;
+    class ClientSession;
+    class ClientSessionStanzaChannel;
+    class Connection;
+    class ConnectionFactory;
     class Error;
     class IQRouter;
-    class TLSContextFactory;
-    class ConnectionFactory;
-    class Connection;
-    class TimerFactory;
-    class ClientSession;
-    class StanzaChannel;
-    class Stanza;
-    class SessionStream;
-    class CertificateTrustChecker;
+    class Message;
     class NetworkFactories;
-    class ClientSessionStanzaChannel;
+    class Presence;
+    class SessionStream;
+    class Stanza;
+    class StanzaChannel;
 
     /**
      * The central class for communicating with an XMPP server.
      *
      * This class is responsible for setting up the connection with the XMPP
      * server, authenticating, and initializing the session.
      *
      * This class can be used directly in your application, although the Client
      * subclass provides more functionality and interfaces, and is better suited
      * for most needs.
      */
     class SWIFTEN_API CoreClient : public Entity {
         public:
             /**
              * Constructs a client for the given JID with the given password.
              */
             CoreClient(const JID& jid, const SafeByteArray& password, NetworkFactories* networkFactories);
             virtual ~CoreClient();
 
             /**
              * Set a client certificate to use for strong authentication with the server.
              * Ensure that it is of the correct type for the TLS engine in use.
              * This means, largely, PKCS12Certificate for OpenSSL and CAPICertificate for CAPI.
              */
             void setCertificate(CertificateWithKey::ref certificate);
 
             /**
              * Connects the client to the server.
              *
              * After the connection is established, the client will set