From bd0e671455f6b042bbbd385f1551e9a5011badf5 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Sat, 24 Jun 2017 21:24:28 +0200
Subject: Remove unneeded forward declarations from Swiften headers

Found by cppclean.

Test-Information:

Still builds on macOS 10.12.5 with clang trunk.

Change-Id: Ie8a154e12b196587c956c8b333abf529a36f6bb3

diff --git a/Swiften/AdHoc/OutgoingAdHocCommandSession.h b/Swiften/AdHoc/OutgoingAdHocCommandSession.h
index 9a97ed0..da4acf5 100644
--- a/Swiften/AdHoc/OutgoingAdHocCommandSession.h
+++ b/Swiften/AdHoc/OutgoingAdHocCommandSession.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -19,8 +19,6 @@
 
 namespace Swift {
     class IQRouter;
-    class MainWindow;
-    class UIEventStream;
 
     class SWIFTEN_API OutgoingAdHocCommandSession {
         public:
diff --git a/Swiften/Base/Debug.h b/Swiften/Base/Debug.h
index a6d000f..75575de 100644
--- a/Swiften/Base/Debug.h
+++ b/Swiften/Base/Debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -15,10 +15,6 @@ namespace Swift {
     class Element;
 }
 
-namespace boost {
-    template<class T> class shared_ptr;
-}
-
 SWIFTEN_API std::ostream& operator<<(std::ostream& os, const Swift::ClientError& error);
 
 SWIFTEN_API std::ostream& operator<<(std::ostream& os, Swift::Element* ele);
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,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -20,22 +20,20 @@
 #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.
diff --git a/Swiften/Client/DummyNickManager.h b/Swiften/Client/DummyNickManager.h
index 52a8401..8ed7701 100644
--- a/Swiften/Client/DummyNickManager.h
+++ b/Swiften/Client/DummyNickManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -9,8 +9,6 @@
 #include <Swiften/Client/NickManager.h>
 
 namespace Swift {
-    class VCardManager;
-
     class DummyNickManager : public NickManager {
         public:
             std::string getOwnNick() const {
diff --git a/Swiften/Component/ComponentSession.h b/Swiften/Component/ComponentSession.h
index 9d963a1..dcb9b4a 100644
--- a/Swiften/Component/ComponentSession.h
+++ b/Swiften/Component/ComponentSession.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -19,7 +19,6 @@
 #include <Swiften/Session/SessionStream.h>
 
 namespace Swift {
-    class ComponentAuthenticator;
     class CryptoProvider;
 
     class SWIFTEN_API ComponentSession : public std::enable_shared_from_this<ComponentSession> {
diff --git a/Swiften/Component/CoreComponent.h b/Swiften/Component/CoreComponent.h
index 669be97..f673643 100644
--- a/Swiften/Component/CoreComponent.h
+++ b/Swiften/Component/CoreComponent.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -26,11 +26,10 @@
 #include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
 
 namespace Swift {
-    class EventLoop;
+    class BasicSessionStream;
+    class ComponentSession;
     class IQRouter;
     class NetworkFactories;
-    class ComponentSession;
-    class BasicSessionStream;
 
     /**
      * The central class for communicating with an XMPP server as a component.
diff --git a/Swiften/Elements/MUCOccupant.h b/Swiften/Elements/MUCOccupant.h
index c345a49..260502e 100644
--- a/Swiften/Elements/MUCOccupant.h
+++ b/Swiften/Elements/MUCOccupant.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -14,8 +14,6 @@
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
-    class Client;
-
     class SWIFTEN_API MUCOccupant {
         public:
             enum Role {Moderator, Participant, Visitor, NoRole};
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.h b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
index 3dd206d..7ddf700 100644
--- a/Swiften/FileTransfer/IncomingJingleFileTransfer.h
+++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -21,17 +21,15 @@
 #include <Swiften/Jingle/JingleContentID.h>
 
 namespace Swift {
-    class JID;
-    class JingleSession;
-    class JingleContentPayload;
-    class FileTransferTransporter;
-    class FileTransferTransporterFactory;
-    class TimerFactory;
-    class Timer;
     class CryptoProvider;
+    class FileTransferTransporterFactory;
     class IncrementalBytestreamHashCalculator;
+    class JID;
+    class JingleContentPayload;
     class JingleFileTransferDescription;
-    class HashElement;
+    class JingleSession;
+    class Timer;
+    class TimerFactory;
 
     /**
      * @brief The IncomingJingleFileTransfer class contains the business logic for managing incoming
diff --git a/Swiften/FileTransfer/JingleFileTransfer.h b/Swiften/FileTransfer/JingleFileTransfer.h
index 5b9dd62..dd9bcb9 100644
--- a/Swiften/FileTransfer/JingleFileTransfer.h
+++ b/Swiften/FileTransfer/JingleFileTransfer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -19,10 +19,6 @@
 #include <Swiften/Jingle/JingleContentID.h>
 
 namespace Swift {
-    class CryptoProvider;
-    class IQRouter;
-    class RemoteJingleTransportCandidateSelector;
-    class LocalJingleTransportCandidateGenerator;
     class JingleSession;
     class FileTransferTransporter;
     class FileTransferTransporterFactory;
diff --git a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
index cd45948..9fd1d76 100644
--- a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
+++ b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -27,7 +27,6 @@
 
 namespace Swift {
     class CryptoProvider;
-    class FileTransferTransporter;
     class FileTransferTransporterFactory;
     class IDGenerator;
     class IncrementalBytestreamHashCalculator;
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h
index b819910..70a7c9c 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h
+++ b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -28,7 +28,6 @@
 
 namespace Swift {
 
-class SOCKS5BytestreamRegistry;
 class Connection;
 class TimerFactory;
 
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamRegistry.h b/Swiften/FileTransfer/SOCKS5BytestreamRegistry.h
index 2fa67fa..33bc57c 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamRegistry.h
+++ b/Swiften/FileTransfer/SOCKS5BytestreamRegistry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -14,8 +14,6 @@
 #include <Swiften/Base/IDGenerator.h>
 
 namespace Swift {
-    class SOCKS5BytestreamServerSession;
-
     class SWIFTEN_API SOCKS5BytestreamRegistry {
         public:
             SOCKS5BytestreamRegistry();
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServer.h b/Swiften/FileTransfer/SOCKS5BytestreamServer.h
index c8866c4..16d3d29 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamServer.h
+++ b/Swiften/FileTransfer/SOCKS5BytestreamServer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,7 +18,6 @@
 
 namespace Swift {
     class SOCKS5BytestreamServerSession;
-    class CryptoProvider;
 
     class SWIFTEN_API SOCKS5BytestreamServer {
         public:
diff --git a/Swiften/Jingle/JingleSessionImpl.h b/Swiften/Jingle/JingleSessionImpl.h
index b42b790..ae2458c 100644
--- a/Swiften/Jingle/JingleSessionImpl.h
+++ b/Swiften/Jingle/JingleSessionImpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2016 Isode Limited.
+ * Copyright (c) 2011-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -14,7 +14,6 @@
 
 namespace Swift {
     class IQRouter;
-    class Request;
 
     class JingleSessionImpl : public JingleSession {
             friend class JingleResponder;
diff --git a/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h b/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h
index 633ca6d..5d4fefd 100644
--- a/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h
+++ b/Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -20,7 +20,6 @@
 
 namespace Swift {
     class FakeDNSSDQuery;
-    class FakeDNSSDBrowseQuery;
     class EventLoop;
 
     class SWIFTEN_API FakeDNSSDQuerier :
diff --git a/Swiften/LinkLocal/LinkLocalConnector.h b/Swiften/LinkLocal/LinkLocalConnector.h
index 2c49185..044b74f 100644
--- a/Swiften/LinkLocal/LinkLocalConnector.h
+++ b/Swiften/LinkLocal/LinkLocalConnector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -16,13 +16,10 @@
 #include <Swiften/Network/Connection.h>
 
 namespace Swift {
-    class ConnectionFactory;
-    class HostAddress;
-    class ToplevelElement;
-    class PayloadParserFactoryCollection;
-    class PayloadSerializerCollection;
     class DNSSDQuerier;
     class DNSSDResolveHostnameQuery;
+    class HostAddress;
+    class ToplevelElement;
 
     class SWIFTEN_API LinkLocalConnector : public std::enable_shared_from_this<LinkLocalConnector> {
         public:
diff --git a/Swiften/LinkLocal/OutgoingLinkLocalSession.h b/Swiften/LinkLocal/OutgoingLinkLocalSession.h
index 34f7af9..93f8c9d 100644
--- a/Swiften/LinkLocal/OutgoingLinkLocalSession.h
+++ b/Swiften/LinkLocal/OutgoingLinkLocalSession.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -16,11 +16,10 @@
 #include <Swiften/Session/Session.h>
 
 namespace Swift {
-    class ConnectionFactory;
-    class XMLParserFactory;
-    class ToplevelElement;
     class PayloadParserFactoryCollection;
     class PayloadSerializerCollection;
+    class ToplevelElement;
+    class XMLParserFactory;
 
     class SWIFTEN_API OutgoingLinkLocalSession : public Session {
         public:
diff --git a/Swiften/MUC/MUC.h b/Swiften/MUC/MUC.h
index cfb38f6..d61f369 100644
--- a/Swiften/MUC/MUC.h
+++ b/Swiften/MUC/MUC.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -24,10 +24,6 @@
 #include <Swiften/MUC/MUCRegistry.h>
 
 namespace Swift {
-    class StanzaChannel;
-    class IQRouter;
-    class DirectedPresenceSender;
-
     class SWIFTEN_API MUC {
         public:
             typedef std::shared_ptr<MUC> ref;
diff --git a/Swiften/MUC/UnitTest/MockMUC.h b/Swiften/MUC/UnitTest/MockMUC.h
index 4c5ce8d..39b0f1a 100644
--- a/Swiften/MUC/UnitTest/MockMUC.h
+++ b/Swiften/MUC/UnitTest/MockMUC.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -25,10 +25,6 @@
 #include <Swiften/MUC/MUCRegistry.h>
 
 namespace Swift {
-    class StanzaChannel;
-    class IQRouter;
-    class DirectedPresenceSender;
-
     class SWIFTEN_API MockMUC : public MUC{
         public:
             typedef std::shared_ptr<MockMUC> ref;
diff --git a/Swiften/Network/BOSHConnection.h b/Swiften/Network/BOSHConnection.h
index 1409ae6..c492ac4 100644
--- a/Swiften/Network/BOSHConnection.h
+++ b/Swiften/Network/BOSHConnection.h
@@ -25,13 +25,6 @@
 #include <Swiften/Session/SessionStream.h>
 #include <Swiften/TLS/TLSError.h>
 
-namespace boost {
-    class thread;
-    namespace system {
-        class error_code;
-    }
-}
-
 class BOSHConnectionTest;
 
 namespace Swift {
diff --git a/Swiften/Network/BOSHConnectionPool.h b/Swiften/Network/BOSHConnectionPool.h
index c4d827c..a6956fa 100644
--- a/Swiften/Network/BOSHConnectionPool.h
+++ b/Swiften/Network/BOSHConnectionPool.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2016 Isode Limited.
+ * Copyright (c) 2011-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,7 +18,6 @@
 namespace Swift {
     class CachingDomainNameResolver;
     class EventLoop;
-    class HTTPConnectProxiedConnectionFactory;
     class HTTPTrafficFilter;
     class TLSContextFactory;
     class CachingDomainNameResolver;
diff --git a/Swiften/Network/BoostConnection.h b/Swiften/Network/BoostConnection.h
index 03122da..c77b933 100644
--- a/Swiften/Network/BoostConnection.h
+++ b/Swiften/Network/BoostConnection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -20,13 +20,6 @@
 #include <Swiften/TLS/CertificateVerificationError.h>
 #include <Swiften/TLS/CertificateWithKey.h>
 
-namespace boost {
-    class thread;
-    namespace system {
-        class error_code;
-    }
-}
-
 namespace Swift {
     class EventLoop;
 
diff --git a/Swiften/Network/BoostConnectionFactory.h b/Swiften/Network/BoostConnectionFactory.h
index a4e3b0d..eef0b45 100644
--- a/Swiften/Network/BoostConnectionFactory.h
+++ b/Swiften/Network/BoostConnectionFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -13,8 +13,6 @@
 #include <Swiften/Network/ConnectionFactory.h>
 
 namespace Swift {
-    class BoostConnection;
-
     class SWIFTEN_API BoostConnectionFactory : public ConnectionFactory {
         public:
             BoostConnectionFactory(std::shared_ptr<boost::asio::io_service>, EventLoop* eventLoop);
diff --git a/Swiften/Network/BoostTimerFactory.h b/Swiften/Network/BoostTimerFactory.h
index ca9a833..1e2139b 100644
--- a/Swiften/Network/BoostTimerFactory.h
+++ b/Swiften/Network/BoostTimerFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -13,7 +13,6 @@
 #include <Swiften/Network/TimerFactory.h>
 
 namespace Swift {
-    class BoostTimer;
     class EventLoop;
 
     class SWIFTEN_API BoostTimerFactory : public TimerFactory {
diff --git a/Swiften/Network/HTTPConnectProxiedConnection.h b/Swiften/Network/HTTPConnectProxiedConnection.h
index 21b3960..6592839 100644
--- a/Swiften/Network/HTTPConnectProxiedConnection.h
+++ b/Swiften/Network/HTTPConnectProxiedConnection.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2011-2016 Isode Limited.
+ * Copyright (c) 2011-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -21,7 +21,6 @@
 namespace Swift {
     class ConnectionFactory;
     class DomainNameResolver;
-    class EventLoop;
     class HTTPTrafficFilter;
     class TimerFactory;
 
diff --git a/Swiften/Network/HTTPConnectProxiedConnectionFactory.h b/Swiften/Network/HTTPConnectProxiedConnectionFactory.h
index 74d6279..395f64f 100644
--- a/Swiften/Network/HTTPConnectProxiedConnectionFactory.h
+++ b/Swiften/Network/HTTPConnectProxiedConnectionFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 Isode Limited.
+ * Copyright (c) 2012-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -19,9 +19,8 @@
 
 namespace Swift {
     class DomainNameResolver;
-    class TimerFactory;
-    class EventLoop;
     class HTTPTrafficFilter;
+    class TimerFactory;
 
     class SWIFTEN_API HTTPConnectProxiedConnectionFactory : public ConnectionFactory {
         public:
diff --git a/Swiften/Network/NetworkFactories.h b/Swiften/Network/NetworkFactories.h
index 7c76c67..f31c448 100644
--- a/Swiften/Network/NetworkFactories.h
+++ b/Swiften/Network/NetworkFactories.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -9,19 +9,18 @@
 #include <Swiften/Base/API.h>
 
 namespace Swift {
-    class TimerFactory;
     class ConnectionFactory;
-    class DomainNameResolver;
     class ConnectionServerFactory;
-    class NATTraverser;
-    class XMLParserFactory;
-    class TLSContextFactory;
-    class CertificateFactory;
-    class ProxyProvider;
+    class CryptoProvider;
+    class DomainNameResolver;
     class EventLoop;
     class IDNConverter;
+    class NATTraverser;
     class NetworkEnvironment;
-    class CryptoProvider;
+    class ProxyProvider;
+    class TLSContextFactory;
+    class TimerFactory;
+    class XMLParserFactory;
 
     /**
      * An interface collecting network factories.
diff --git a/Swiften/Network/PlatformNATTraversalWorker.h b/Swiften/Network/PlatformNATTraversalWorker.h
index 3607dac..aee1052 100644
--- a/Swiften/Network/PlatformNATTraversalWorker.h
+++ b/Swiften/Network/PlatformNATTraversalWorker.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -35,7 +35,6 @@ namespace Swift {
     class NATPMPInterface;
     class MiniUPnPInterface;
     class NATTraversalInterface;
-    class NATPortMapping;
 
     class SWIFTEN_API PlatformNATTraversalWorker : public NATTraverser {
             friend class PlatformNATTraversalRequest;
diff --git a/Swiften/Network/ProxiedConnection.h b/Swiften/Network/ProxiedConnection.h
index 38194aa..440fb86 100644
--- a/Swiften/Network/ProxiedConnection.h
+++ b/Swiften/Network/ProxiedConnection.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 Isode Limited.
+ * Copyright (c) 2012-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -15,13 +15,6 @@
 #include <Swiften/Network/Connector.h>
 #include <Swiften/Network/HostAddressPort.h>
 
-namespace boost {
-    class thread;
-    namespace system {
-        class error_code;
-    }
-}
-
 namespace Swift {
     class ConnectionFactory;
 
diff --git a/Swiften/Network/UnboundDomainNameResolver.h b/Swiften/Network/UnboundDomainNameResolver.h
index a97e385..988a415 100644
--- a/Swiften/Network/UnboundDomainNameResolver.h
+++ b/Swiften/Network/UnboundDomainNameResolver.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -26,7 +26,6 @@ struct ub_result;
 namespace Swift {
     class EventLoop;
     class IDNConverter;
-    class TimerFactory;
 
     class UnboundDomainNameResolver;
     class UnboundQuery;
diff --git a/Swiften/Parser/GenericElementParser.h b/Swiften/Parser/GenericElementParser.h
index 5aa62c9..1092710 100644
--- a/Swiften/Parser/GenericElementParser.h
+++ b/Swiften/Parser/GenericElementParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -13,8 +13,6 @@
 
 namespace Swift {
 
-    class PayloadParserFactoryCollection;
-
     template<typename ElementType>
     class SWIFTEN_API GenericElementParser : public ElementParser {
         public:
diff --git a/Swiften/Parser/GenericPayloadParser.h b/Swiften/Parser/GenericPayloadParser.h
index ea0a7bd..b72189e 100644
--- a/Swiften/Parser/GenericPayloadParser.h
+++ b/Swiften/Parser/GenericPayloadParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -12,9 +12,6 @@
 #include <Swiften/Parser/PayloadParser.h>
 
 namespace Swift {
-
-    class FormParser;
-
     /**
      * A generic payload parser for payloads of the given type.
      *
diff --git a/Swiften/Parser/PayloadParsers/ChatStateParserFactory.h b/Swiften/Parser/PayloadParsers/ChatStateParserFactory.h
index cf226cc..3f9b3d3 100644
--- a/Swiften/Parser/PayloadParsers/ChatStateParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/ChatStateParserFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,8 +11,6 @@
 #include <Swiften/Parser/PayloadParsers/ChatStateParser.h>
 
 namespace Swift {
-    class PayloadParserFactoryCollection;
-
     class SWIFTEN_API ChatStateParserFactory : public PayloadParserFactory {
         public:
             ChatStateParserFactory() {
diff --git a/Swiften/Parser/PayloadParsers/ClientStateParserFactory.h b/Swiften/Parser/PayloadParsers/ClientStateParserFactory.h
index 95617a1..61f7012 100644
--- a/Swiften/Parser/PayloadParsers/ClientStateParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/ClientStateParserFactory.h
@@ -4,6 +4,12 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2017 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <Swiften/Base/API.h>
@@ -11,8 +17,6 @@
 #include <Swiften/Parser/PayloadParsers/ClientStateParser.h>
 
 namespace Swift {
-    class PayloadParserFactoryCollection;
-
     class SWIFTEN_API ClientStateParserFactory : public PayloadParserFactory {
         public:
             ClientStateParserFactory() {
diff --git a/Swiften/Parser/PayloadParsers/DeliveryReceiptParserFactory.h b/Swiften/Parser/PayloadParsers/DeliveryReceiptParserFactory.h
index dc0c311..322ef94 100644
--- a/Swiften/Parser/PayloadParsers/DeliveryReceiptParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/DeliveryReceiptParserFactory.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -17,8 +17,6 @@
 #include <Swiften/Parser/PayloadParsers/DeliveryReceiptParser.h>
 
 namespace Swift {
-    class PayloadParserFactoryCollection;
-
     class SWIFTEN_API DeliveryReceiptParserFactory : public PayloadParserFactory {
         public:
             DeliveryReceiptParserFactory() {
diff --git a/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h b/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h
index a858285..cef5d8f 100644
--- a/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -17,8 +17,6 @@
 #include <Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParser.h>
 
 namespace Swift {
-    class PayloadParserFactoryCollection;
-
     class SWIFTEN_API DeliveryReceiptRequestParserFactory : public PayloadParserFactory {
         public:
             DeliveryReceiptRequestParserFactory() {
diff --git a/Swiften/Parser/PayloadParsers/DiscoInfoParser.h b/Swiften/Parser/PayloadParsers/DiscoInfoParser.h
index 28bfff1..9c26310 100644
--- a/Swiften/Parser/PayloadParsers/DiscoInfoParser.h
+++ b/Swiften/Parser/PayloadParsers/DiscoInfoParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,6 +11,8 @@
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
+    class FormParser;
+
     class SWIFTEN_API DiscoInfoParser : public GenericPayloadParser<DiscoInfo> {
         public:
             DiscoInfoParser();
diff --git a/Swiften/Parser/PayloadParsers/FormParserFactory.h b/Swiften/Parser/PayloadParsers/FormParserFactory.h
index 851b302..296fcd1 100644
--- a/Swiften/Parser/PayloadParsers/FormParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/FormParserFactory.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,8 +11,6 @@
 #include <Swiften/Parser/PayloadParsers/FormParser.h>
 
 namespace Swift {
-    class PayloadParserFactoryCollection;
-
     class SWIFTEN_API FormParserFactory : public PayloadParserFactory {
         public:
             FormParserFactory() {
diff --git a/Swiften/Parser/PayloadParsers/PubSubErrorParser.h b/Swiften/Parser/PayloadParsers/PubSubErrorParser.h
index adc36e9..9c41095 100644
--- a/Swiften/Parser/PayloadParsers/PubSubErrorParser.h
+++ b/Swiften/Parser/PayloadParsers/PubSubErrorParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -15,9 +15,6 @@
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-    class PayloadParserFactoryCollection;
-    class PayloadParser;
-
     class SWIFTEN_API PubSubErrorParser : public GenericPayloadParser<PubSubError> {
         public:
             PubSubErrorParser();
diff --git a/Swiften/Parser/PayloadParsers/ResultSetParser.h b/Swiften/Parser/PayloadParsers/ResultSetParser.h
index aa18ae6..819c0a5 100644
--- a/Swiften/Parser/PayloadParsers/ResultSetParser.h
+++ b/Swiften/Parser/PayloadParsers/ResultSetParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -14,8 +14,6 @@
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-    class PayloadParserFactoryCollection;
-
     class SWIFTEN_API ResultSetParser : public GenericPayloadParser<ResultSet> {
         public:
             ResultSetParser();
diff --git a/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h b/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h
index 40e010a..1fd1113 100644
--- a/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h
+++ b/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -17,8 +17,6 @@
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-    class SerializingParser;
-
     class SWIFTEN_API RosterItemExchangeParser : public GenericPayloadParser<RosterItemExchangePayload> {
         public:
             RosterItemExchangeParser();
diff --git a/Swiften/Parser/PayloadParsers/VCardUpdateParser.h b/Swiften/Parser/PayloadParsers/VCardUpdateParser.h
index 914f138..91837fb 100644
--- a/Swiften/Parser/PayloadParsers/VCardUpdateParser.h
+++ b/Swiften/Parser/PayloadParsers/VCardUpdateParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,8 +11,6 @@
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-    class SerializingParser;
-
     class SWIFTEN_API VCardUpdateParser : public GenericPayloadParser<VCardUpdate> {
         public:
             VCardUpdateParser();
diff --git a/Swiften/Presence/PayloadAddingPresenceSender.h b/Swiften/Presence/PayloadAddingPresenceSender.h
index 3a55183..010b77e 100644
--- a/Swiften/Presence/PayloadAddingPresenceSender.h
+++ b/Swiften/Presence/PayloadAddingPresenceSender.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,8 +11,6 @@
 #include <Swiften/Presence/PresenceSender.h>
 
 namespace Swift {
-    class StanzaChannel;
-
     /**
      * This presence sender adds payloads to outgoing presences.
      *
diff --git a/Swiften/PubSub/PubSubManagerImpl.h b/Swiften/PubSub/PubSubManagerImpl.h
index 58c5fc0..2f2b96b 100644
--- a/Swiften/PubSub/PubSubManagerImpl.h
+++ b/Swiften/PubSub/PubSubManagerImpl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,7 +18,6 @@
     }
 
 namespace Swift {
-    class JID;
     class StanzaChannel;
     class Message;
 
diff --git a/Swiften/Queries/IQHandler.h b/Swiften/Queries/IQHandler.h
index 1bfdf0f..b5c1fc3 100644
--- a/Swiften/Queries/IQHandler.h
+++ b/Swiften/Queries/IQHandler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -12,8 +12,6 @@
 #include <Swiften/Elements/IQ.h>
 
 namespace Swift {
-    class IQRouter;
-
     class SWIFTEN_API IQHandler {
         public:
             virtual ~IQHandler();
diff --git a/Swiften/Queries/Request.h b/Swiften/Queries/Request.h
index a62c103..2cf5017 100644
--- a/Swiften/Queries/Request.h
+++ b/Swiften/Queries/Request.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -19,6 +19,8 @@
 #include <Swiften/Queries/IQHandler.h>
 
 namespace Swift {
+    class IQRouter;
+
     /**
      * An IQ get/set request query.
      */
diff --git a/Swiften/Serializer/PayloadSerializers/BytestreamsSerializer.h b/Swiften/Serializer/PayloadSerializers/BytestreamsSerializer.h
index 533be61..900d37a 100644
--- a/Swiften/Serializer/PayloadSerializers/BytestreamsSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/BytestreamsSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,8 +11,6 @@
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
-
     class SWIFTEN_API BytestreamsSerializer : public GenericPayloadSerializer<Bytestreams> {
         public:
             BytestreamsSerializer();
diff --git a/Swiften/Serializer/PayloadSerializers/JingleContentPayloadSerializer.h b/Swiften/Serializer/PayloadSerializers/JingleContentPayloadSerializer.h
index 825a67c..93cf5b3 100644
--- a/Swiften/Serializer/PayloadSerializers/JingleContentPayloadSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/JingleContentPayloadSerializer.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,8 +18,6 @@
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
-
     class SWIFTEN_API JingleContentPayloadSerializer : public GenericPayloadSerializer<JingleContentPayload> {
         public:
             JingleContentPayloadSerializer();
diff --git a/Swiften/Serializer/PayloadSerializers/JingleFileTransferDescriptionSerializer.h b/Swiften/Serializer/PayloadSerializers/JingleFileTransferDescriptionSerializer.h
index 65e757b..9e77c0a 100644
--- a/Swiften/Serializer/PayloadSerializers/JingleFileTransferDescriptionSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/JingleFileTransferDescriptionSerializer.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,9 +18,6 @@
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
-    class XMLElement;
-
     class SWIFTEN_API JingleFileTransferDescriptionSerializer : public GenericPayloadSerializer<JingleFileTransferDescription> {
         public:
             JingleFileTransferDescriptionSerializer();
diff --git a/Swiften/Serializer/PayloadSerializers/JingleFileTransferFileInfoSerializer.h b/Swiften/Serializer/PayloadSerializers/JingleFileTransferFileInfoSerializer.h
index 6b80235..d0f4c17 100644
--- a/Swiften/Serializer/PayloadSerializers/JingleFileTransferFileInfoSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/JingleFileTransferFileInfoSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -12,8 +12,6 @@
 #include <Swiften/Serializer/XML/XMLElement.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
-
     class SWIFTEN_API JingleFileTransferFileInfoSerializer : public GenericPayloadSerializer<JingleFileTransferFileInfo> {
         public:
             JingleFileTransferFileInfoSerializer();
diff --git a/Swiften/Serializer/PayloadSerializers/JingleFileTransferHashSerializer.h b/Swiften/Serializer/PayloadSerializers/JingleFileTransferHashSerializer.h
index bb6eabc..bc978ea 100644
--- a/Swiften/Serializer/PayloadSerializers/JingleFileTransferHashSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/JingleFileTransferHashSerializer.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,9 +18,6 @@
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
-    class XMLElement;
-
     class SWIFTEN_API JingleFileTransferHashSerializer : public GenericPayloadSerializer<JingleFileTransferHash> {
         public:
             JingleFileTransferHashSerializer();
diff --git a/Swiften/Serializer/PayloadSerializers/JingleIBBTransportPayloadSerializer.h b/Swiften/Serializer/PayloadSerializers/JingleIBBTransportPayloadSerializer.h
index e94fb52..27fb5f1 100644
--- a/Swiften/Serializer/PayloadSerializers/JingleIBBTransportPayloadSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/JingleIBBTransportPayloadSerializer.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,9 +18,6 @@
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
-    class XMLElement;
-
     class SWIFTEN_API JingleIBBTransportPayloadSerializer : public GenericPayloadSerializer<JingleIBBTransportPayload> {
         public:
             JingleIBBTransportPayloadSerializer();
diff --git a/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.h b/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.h
index a846ebe..7794855 100644
--- a/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -19,7 +19,6 @@
 
 namespace Swift {
     class PayloadSerializerCollection;
-    class XMLElement;
 
     class SWIFTEN_API JinglePayloadSerializer : public GenericPayloadSerializer<JinglePayload> {
         public:
diff --git a/Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.h b/Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.h
index cca2f4e..c081c87 100644
--- a/Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,9 +18,6 @@
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
-    class XMLElement;
-
     class SWIFTEN_API JingleS5BTransportPayloadSerializer : public GenericPayloadSerializer<JingleS5BTransportPayload> {
         public:
             JingleS5BTransportPayloadSerializer();
diff --git a/Swiften/Serializer/PayloadSerializers/MAMFinSerializer.h b/Swiften/Serializer/PayloadSerializers/MAMFinSerializer.h
index 7e2a7c7..7c5bd29 100644
--- a/Swiften/Serializer/PayloadSerializers/MAMFinSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MAMFinSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -14,8 +14,6 @@
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
-
     class SWIFTEN_API MAMFinSerializer : public GenericPayloadSerializer<MAMFin> {
         public:
             MAMFinSerializer();
diff --git a/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h b/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h
index 6af979b..6b2403f 100644
--- a/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -14,8 +14,6 @@
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
-
     class SWIFTEN_API MAMQuerySerializer : public GenericPayloadSerializer<MAMQuery> {
         public:
             MAMQuerySerializer();
diff --git a/Swiften/Serializer/PayloadSerializers/MUCDestroyPayloadSerializer.h b/Swiften/Serializer/PayloadSerializers/MUCDestroyPayloadSerializer.h
index 2ce8ccc..def362c 100644
--- a/Swiften/Serializer/PayloadSerializers/MUCDestroyPayloadSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/MUCDestroyPayloadSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2016 Isode Limited.
+ * Copyright (c) 2011-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,7 +11,6 @@
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
     class SWIFTEN_API MUCDestroyPayloadSerializer : public GenericPayloadSerializer<MUCDestroyPayload> {
         public:
             MUCDestroyPayloadSerializer();
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.h b/Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.h
index 6b0882e..d3d1227 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -12,8 +12,6 @@
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
-
     class SWIFTEN_API PubSubErrorSerializer : public GenericPayloadSerializer<PubSubError> {
         public:
             PubSubErrorSerializer();
diff --git a/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h b/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h
index e75b443..6a1429a 100644
--- a/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -14,8 +14,6 @@
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
-
     class SWIFTEN_API ResultSetSerializer : public GenericPayloadSerializer<ResultSet> {
         public:
             ResultSetSerializer();
diff --git a/Swiften/Serializer/PayloadSerializers/S5BProxyRequestSerializer.h b/Swiften/Serializer/PayloadSerializers/S5BProxyRequestSerializer.h
index 7058ac1..14cbd14 100644
--- a/Swiften/Serializer/PayloadSerializers/S5BProxyRequestSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/S5BProxyRequestSerializer.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -22,8 +22,6 @@
 #include <Swiften/Serializer/XML/XMLElement.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
-
     class SWIFTEN_API S5BProxyRequestSerializer : public GenericPayloadSerializer<S5BProxyRequest> {
         public:
             virtual std::string serializePayload(std::shared_ptr<S5BProxyRequest> s5bProxyRequest) const {
diff --git a/Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.h b/Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.h
index 51f4227..21c6921 100644
--- a/Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -12,8 +12,6 @@
 #include <Swiften/Serializer/GenericPayloadSerializer.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
-
     class SWIFTEN_API SearchPayloadSerializer : public GenericPayloadSerializer<SearchPayload> {
         public:
             SearchPayloadSerializer();
diff --git a/Swiften/Serializer/PayloadSerializers/StreamInitiationFileInfoSerializer.h b/Swiften/Serializer/PayloadSerializers/StreamInitiationFileInfoSerializer.h
index de54313..b352f7f 100644
--- a/Swiften/Serializer/PayloadSerializers/StreamInitiationFileInfoSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/StreamInitiationFileInfoSerializer.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -19,8 +19,6 @@
 #include <Swiften/Serializer/XML/XMLElement.h>
 
 namespace Swift {
-    class PayloadSerializerCollection;
-
     class SWIFTEN_API StreamInitiationFileInfoSerializer : public GenericPayloadSerializer<StreamInitiationFileInfo> {
         public:
             StreamInitiationFileInfoSerializer();
diff --git a/Swiften/Serializer/XMPPSerializer.h b/Swiften/Serializer/XMPPSerializer.h
index 8c182e3..d328272 100644
--- a/Swiften/Serializer/XMPPSerializer.h
+++ b/Swiften/Serializer/XMPPSerializer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -17,7 +17,6 @@
 
 namespace Swift {
     class PayloadSerializerCollection;
-    class CompressRequestSerializer;
     class ProtocolHeader;
 
     class SWIFTEN_API XMPPSerializer {
diff --git a/Swiften/Session/BOSHSessionStream.h b/Swiften/Session/BOSHSessionStream.h
index 719f1f0..5b730cf 100644
--- a/Swiften/Session/BOSHSessionStream.h
+++ b/Swiften/Session/BOSHSessionStream.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2016 Isode Limited.
+ * Copyright (c) 2011-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,13 +18,10 @@
 #include <Swiften/TLS/TLSOptions.h>
 
 namespace Swift {
-    class CompressionLayer;
-    class ConnectionLayer;
     class EventLoop;
     class HTTPTrafficFilter;
     class PayloadParserFactoryCollection;
     class PayloadSerializerCollection;
-    class StreamStack;
     class TLSContextFactory;
     class TimerFactory;
     class XMLParserFactory;
diff --git a/Swiften/Session/Session.h b/Swiften/Session/Session.h
index 23cc656..04153ec 100644
--- a/Swiften/Session/Session.h
+++ b/Swiften/Session/Session.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -21,8 +21,6 @@
 namespace Swift {
     class ProtocolHeader;
     class StreamStack;
-    class JID;
-    class Element;
     class PayloadParserFactoryCollection;
     class PayloadSerializerCollection;
     class XMPPLayer;
diff --git a/Swiften/VCards/VCardManager.h b/Swiften/VCards/VCardManager.h
index d987862..e28e8e6 100644
--- a/Swiften/VCards/VCardManager.h
+++ b/Swiften/VCards/VCardManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -19,7 +19,6 @@
 
 namespace Swift {
     class IQRouter;
-    class JID;
     class VCardStorage;
 
     class SWIFTEN_API VCardManager : public boost::signals2::trackable {
diff --git a/Swiften/Whiteboard/WhiteboardSession.h b/Swiften/Whiteboard/WhiteboardSession.h
index 0871f94..1b5d039 100644
--- a/Swiften/Whiteboard/WhiteboardSession.h
+++ b/Swiften/Whiteboard/WhiteboardSession.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -25,7 +25,6 @@
 
 namespace Swift {
     class IQRouter;
-    class ErrorPayload;
     class WhiteboardPayload;
 
     class SWIFTEN_API WhiteboardSession {
-- 
cgit v0.10.2-6-g49f6