2 files changed, 4 insertions, 1 deletions
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp
index d4a082a..69b5c89 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp
@@ -10,6 +10,7 @@
 #include <Swiften/FileTransfer/FileReadBytestream.h>
 #include <Swiften/Base/boost_bsignals.h>
 #include <boost/bind.hpp>
+#include <boost/filesystem.hpp>
 #include "Swift/Controllers/UIInterfaces/ChatWindow.h"
 #include <Swiften/Base/Log.h>
 #include <Swift/Controllers/Intl.h>
diff --git a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp
index 6d19fa1..3081f71 100644
--- a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp
@@ -6,6 +6,8 @@
 
 #include "FileTransferProgressInfo.h"
 
+#include <boost/numeric/conversion/cast.hpp>
+
 #include <Swiften/Base/Log.h>
 
 namespace Swift {
@@ -16,7 +18,7 @@ FileTransferProgressInfo::FileTransferProgressInfo(boost::uintmax_t completeByte
 
 void FileTransferProgressInfo::setBytesProcessed(int processedBytes) {
 	int oldPercentage = int(double(completedBytes) / double(completeBytes) * 100.0);
-	completedBytes += processedBytes;
+	completedBytes += boost::numeric_cast<boost::uintmax_t>(processedBytes);
 	int newPercentage = int(double(completedBytes) / double(completeBytes) * 100.0);
 	if (oldPercentage != newPercentage) {
 		onProgressPercentage(newPercentage);