11 files changed, 18 insertions, 48 deletions
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;