9 files changed, 33 insertions, 7 deletions
diff --git a/Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h b/Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h
index 76227c0..c633c20 100644
--- a/Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h
+++ b/Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h
@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include <Swiften/JID/JID.h>
+
 #include <Swift/Controllers/Roster/RosterItem.h>
 
 namespace Swift {
diff --git a/Swift/Controllers/Settings/DummySettingsProvider.h b/Swift/Controllers/Settings/DummySettingsProvider.h
index 63c0767..134aadc 100644
--- a/Swift/Controllers/Settings/DummySettingsProvider.h
+++ b/Swift/Controllers/Settings/DummySettingsProvider.h
@@ -7,6 +7,8 @@
 #pragma once
 
 #include <map>
+#include <set>
+#include <string>
 
 #include <Swift/Controllers/Settings/SettingsProvider.h>
 
diff --git a/Swift/Controllers/Storages/CertificateFileStorageFactory.h b/Swift/Controllers/Storages/CertificateFileStorageFactory.h
index 8ab99f4..6f466dc 100644
--- a/Swift/Controllers/Storages/CertificateFileStorageFactory.h
+++ b/Swift/Controllers/Storages/CertificateFileStorageFactory.h
@@ -6,6 +6,8 @@
 
 #pragma once
 
+#include <Swiften/JID/JID.h>
+
 #include <Swift/Controllers/Storages/CertificateFileStorage.h>
 #include <Swift/Controllers/Storages/CertificateStorageFactory.h>
 
diff --git a/Swift/Controllers/UIEvents/AddContactUIEvent.h b/Swift/Controllers/UIEvents/AddContactUIEvent.h
index d2176ac..df5bf36 100644
--- a/Swift/Controllers/UIEvents/AddContactUIEvent.h
+++ b/Swift/Controllers/UIEvents/AddContactUIEvent.h
@@ -9,6 +9,8 @@
 #include <set>
 #include <string>
 
+#include <Swiften/JID/JID.h>
+
 #include <Swift/Controllers/UIEvents/UIEvent.h>
 
 namespace Swift {
diff --git a/Swift/Controllers/UIEvents/CreateImpromptuMUCUIEvent.h b/Swift/Controllers/UIEvents/CreateImpromptuMUCUIEvent.h
index b566be6..22ce926 100644
--- a/Swift/Controllers/UIEvents/CreateImpromptuMUCUIEvent.h
+++ b/Swift/Controllers/UIEvents/CreateImpromptuMUCUIEvent.h
@@ -4,8 +4,19 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <string>
+#include <vector>
+
+#include <Swiften/JID/JID.h>
+
 #include <Swift/Controllers/UIEvents/UIEvent.h>
 
 namespace Swift {
diff --git a/Swift/Controllers/UIEvents/RequestAdHocWithJIDUIEvent.h b/Swift/Controllers/UIEvents/RequestAdHocWithJIDUIEvent.h
index 8d8bd19..6fe2342 100644
--- a/Swift/Controllers/UIEvents/RequestAdHocWithJIDUIEvent.h
+++ b/Swift/Controllers/UIEvents/RequestAdHocWithJIDUIEvent.h
@@ -6,6 +6,10 @@
 
 #pragma once
 
+#include <string>
+
+#include <Swiften/JID/JID.h>
+
 #include <Swift/Controllers/UIEvents/UIEvent.h>
 
 namespace Swift {
diff --git a/Swift/Controllers/UIInterfaces/WhiteboardWindowFactory.h b/Swift/Controllers/UIInterfaces/WhiteboardWindowFactory.h
index 0153a5a..9868ceb 100644
--- a/Swift/Controllers/UIInterfaces/WhiteboardWindowFactory.h
+++ b/Swift/Controllers/UIInterfaces/WhiteboardWindowFactory.h
@@ -12,6 +12,8 @@
 
 #pragma once
 
+#include <memory>
+
 namespace Swift {
     class WhiteboardSession;
     class WhiteboardWindow;
diff --git a/Swift/QtUI/QtPlainChatView.h b/Swift/QtUI/QtPlainChatView.h
index 2a9b3e1..d65672c 100644
--- a/Swift/QtUI/QtPlainChatView.h
+++ b/Swift/QtUI/QtPlainChatView.h
@@ -55,17 +55,17 @@ namespace Swift {
             virtual void setFileTransferProgress(std::string, const int /*percentageDone*/);
             virtual void setFileTransferStatus(std::string, const ChatWindow::FileTransferState /*state*/, const std::string& /*msg*/ = "");
             virtual void addMUCInvitation(const std::string& /*senderName*/, const JID& /*jid*/, const std::string& /*reason*/, const std::string& /*password*/, bool /*direct*/, bool /*isImpromptu*/, bool /*isContinuation*/);
-            virtual std::string addWhiteboardRequest(const QString& /*contact*/, bool /*senderIsSelf*/) {return "";};
-            virtual void setWhiteboardSessionStatus(const std::string& /*id*/, const ChatWindow::WhiteboardSessionState /*state*/) {};
-            virtual void setMessageReceiptState(const std::string& /*id*/, ChatWindow::ReceiptState /*state*/) {};
+            virtual std::string addWhiteboardRequest(const QString& /*contact*/, bool /*senderIsSelf*/) {return "";}
+            virtual void setWhiteboardSessionStatus(const std::string& /*id*/, const ChatWindow::WhiteboardSessionState /*state*/) {}
+            virtual void setMessageReceiptState(const std::string& /*id*/, ChatWindow::ReceiptState /*state*/) {}
 
-            virtual void showEmoticons(bool /*show*/) {};
-            virtual void addLastSeenLine() {};
+            virtual void showEmoticons(bool /*show*/) {}
+            virtual void addLastSeenLine() {}
 
         public slots:
-            virtual void resizeFont(int /*fontSizeSteps*/) {};
+            virtual void resizeFont(int /*fontSizeSteps*/) {}
             virtual void scrollToBottom();
-            virtual void handleKeyPressEvent(QKeyEvent* /*event*/) {};
+            virtual void handleKeyPressEvent(QKeyEvent* /*event*/) {}
             virtual void fileTransferAccept();
             virtual void fileTransferReject();
             virtual void fileTransferFinish();
diff --git a/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h b/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h
index 8182bcb..24bf6fa 100644
--- a/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h
+++ b/Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h
@@ -12,6 +12,7 @@
 
 #pragma once
 
+#include <Swiften/ELements/Whiteboard/WhiteboardRectElement.h>
 #include <Swiften/Elements/Whiteboard/WhiteboardElementVisitor.h>
 #include <Swiften/Elements/Whiteboard/WhiteboardEllipseElement.h>
 #include <Swiften/Elements/Whiteboard/WhiteboardFreehandPathElement.h>