10 files changed, 17 insertions, 28 deletions
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();