9 files changed, 26 insertions, 10 deletions
diff --git a/BuildTools/CheckHeaders.py b/BuildTools/CheckHeaders.py
index b599099..8d20f4e 100755
--- a/BuildTools/CheckHeaders.py
+++ b/BuildTools/CheckHeaders.py
@@ -4,12 +4,12 @@ import os, sys
 FORBIDDEN_INCLUDES = [
        ("iostream", ["Swiften/Base/format.h"]), 
        ("Base/Log.h", []), 
        ("Base/format.h", []),
-        ("algorithm", ["Swiften/Base/Algorithm.h", "Swiften/Base/SafeAllocator.h", "Swiften/Base/Listenable.h"]), 
+        ("algorithm", ["Swiften/Base/Algorithm.h", "Swiften/Base/SafeAllocator.h", "Swiften/Base/Listenable.h", "Swiften/Base/Concat.h"]), 
-        ("boost/bind.hpp", ["Swiften/Base/Listenable.h"]), 
+        ("boost/bind.hpp", ["Swiften/Base/Listenable.h", "Swiften/FileTransfer/S5BTransportSession.h"]), 
        ("boost/filesystem.hpp", []), 
        ("Base/foreach.h", []), 
        ("boost/date_time/date_time.hpp", []), 
        ("boost/filesystem/filesystem.hpp", []),
diff --git a/Swiften/Base/Concat.h b/Swiften/Base/Concat.h
index 97b04f2..1d158d5 100644
--- a/Swiften/Base/Concat.h
+++ b/Swiften/Base/Concat.h
@@ -1,13 +1,15 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
 #pragma once
+#include <algorithm>
 namespace Swift {
        template<typename C>
        C concat(const C& c1, const C& c2) {
                C result;
                result.resize(c1.size() + c2.size());
diff --git a/Swiften/Base/Listenable.h b/Swiften/Base/Listenable.h
index 994480d..655599a 100644
--- a/Swiften/Base/Listenable.h
+++ b/Swiften/Base/Listenable.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2015 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
 #pragma once
-#include <Swiften/Base/API.h>
-#include <boost/bind.hpp>
 #include <algorithm>
+#include <vector>
+#include <boost/bind.hpp>
+#include <Swiften/Base/API.h>
 namespace Swift {
        template<typename T>
        class SWIFTEN_API Listenable {
                public:
diff --git a/Swiften/Elements/CompressRequest.h b/Swiften/Elements/CompressRequest.h
index 4e2a3a4..1c3fb39 100644
--- a/Swiften/Elements/CompressRequest.h
+++ b/Swiften/Elements/CompressRequest.h
@@ -4,10 +4,12 @@
 * See the COPYING file for more information.
 */
 #pragma once
+#include <string>
 #include <Swiften/Base/API.h>
 #include <Swiften/Elements/ToplevelElement.h>
 namespace Swift {
        class SWIFTEN_API CompressRequest : public ToplevelElement
diff --git a/Swiften/Elements/FormReportedRef.h b/Swiften/Elements/FormReportedRef.h
index b985167..03a89d1 100644
--- a/Swiften/Elements/FormReportedRef.h
+++ b/Swiften/Elements/FormReportedRef.h
@@ -3,10 +3,12 @@
 * All rights reserved.
 * See the COPYING file for more information.
 */
 #pragma once
+#include <boost/shared_ptr.hpp>
 #include <Swiften/Base/API.h>
 namespace Swift {
        class SWIFTEN_API FormReportedRef {
diff --git a/Swiften/Elements/Whiteboard/WhiteboardPolygonElement.h b/Swiften/Elements/Whiteboard/WhiteboardPolygonElement.h
index f885d3b..38bc3e1 100644
--- a/Swiften/Elements/Whiteboard/WhiteboardPolygonElement.h
+++ b/Swiften/Elements/Whiteboard/WhiteboardPolygonElement.h
@@ -10,13 +10,15 @@
 * See the COPYING file for more information.
 */
 #pragma once
+#include <vector>
 #include <Swiften/Base/API.h>
-#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
 #include <Swiften/Elements/Whiteboard/WhiteboardColor.h>
+#include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
 namespace Swift {
        class SWIFTEN_API WhiteboardPolygonElement : public WhiteboardElement {
                typedef std::pair<int, int> Point;
        public:
diff --git a/Swiften/FileTransfer/S5BTransportSession.h b/Swiften/FileTransfer/S5BTransportSession.h
index 234c491..b3eee3c 100644
--- a/Swiften/FileTransfer/S5BTransportSession.h
+++ b/Swiften/FileTransfer/S5BTransportSession.h
@@ -4,14 +4,16 @@
 * See the COPYING file for more information.
 */
 #pragma once
+#include <boost/bind.hpp>
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/boost_bsignals.h>
-#include <Swiften/FileTransfer/TransportSession.h>
 #include <Swiften/FileTransfer/ReadBytestream.h>
+#include <Swiften/FileTransfer/TransportSession.h>
 #include <Swiften/FileTransfer/WriteBytestream.h>
 namespace Swift {
 template <typename T>
diff --git a/Swiften/Serializer/PayloadSerializers/StartSessionSerializer.h b/Swiften/Serializer/PayloadSerializers/StartSessionSerializer.h
index d629db2..1815955 100644
--- a/Swiften/Serializer/PayloadSerializers/StartSessionSerializer.h
+++ b/Swiften/Serializer/PayloadSerializers/StartSessionSerializer.h
@@ -7,12 +7,13 @@
 #pragma once
 #include <boost/lexical_cast.hpp>
 #include <Swiften/Base/API.h>
-#include <Swiften/Serializer/GenericPayloadSerializer.h>
 #include <Swiften/Elements/StartSession.h>
+#include <Swiften/Serializer/GenericPayloadSerializer.h>
+#include <Swiften/Serializer/XML/XMLElement.h>
 namespace Swift {
        class SWIFTEN_API StartSessionSerializer : public GenericPayloadSerializer<StartSession> {
                public:
                        StartSessionSerializer() : GenericPayloadSerializer<StartSession>() {}
diff --git a/Swiften/Serializer/XML/XMLTextNode.h b/Swiften/Serializer/XML/XMLTextNode.h
index 65d6459..86efdf1 100644
--- a/Swiften/Serializer/XML/XMLTextNode.h
+++ b/Swiften/Serializer/XML/XMLTextNode.h
@@ -4,13 +4,15 @@
 * See the COPYING file for more information.
 */
 #pragma once
+#include <boost/shared_ptr.hpp>
 #include <Swiften/Base/API.h>
-#include <Swiften/Serializer/XML/XMLNode.h>
 #include <Swiften/Base/String.h>
+#include <Swiften/Serializer/XML/XMLNode.h>
 namespace Swift {
        class SWIFTEN_API XMLTextNode : public XMLNode {
                public:
                        typedef boost::shared_ptr<XMLTextNode> ref;