diff --git a/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.cpp b/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.cpp
index 3f98cbb96a2053c87c450677c358b384520f45b8..47540a199256d66882743591d20b7cbf4efe9a49 100644
--- a/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.cpp
+++ b/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.cpp
@@ -6,6 +6,7 @@
 
 #include "CombinedOutgoingFileTransferManager.h"
 
+#include <boost/foreach.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
 #include <Swiften/JID/JID.h>
@@ -18,7 +19,6 @@
 #include <Swiften/FileTransfer/SOCKS5BytestreamServer.h>
 #include <Swiften/Base/IDGenerator.h>
 #include <Swiften/Elements/Presence.h>
-#include <Swiften/Base/foreach.h>
 
 
 namespace Swift {
@@ -68,7 +68,7 @@ boost::optional<JID> CombinedOutgoingFileTransferManager::highestPriorityJIDSupp
 	std::vector<Presence::ref> presences = presenceOracle->getAllPresence(bareJID);
 
 	//iterate over them
-	foreach(Presence::ref pres, presences) {
+	BOOST_FOREACH(Presence::ref pres, presences) {
 		if (pres->getPriority() > priority) {
 			// look up caps from the jid
 			DiscoInfo::ref info = capsProvider->getCaps(pres->getFrom());
@@ -92,7 +92,7 @@ boost::optional<JID> CombinedOutgoingFileTransferManager::highestPriorityJIDSupp
 	std::vector<Presence::ref> presences = presenceOracle->getAllPresence(bareJID);
 
 	//iterate over them
-	foreach(Presence::ref pres, presences) {
+	BOOST_FOREACH(Presence::ref pres, presences) {
 		if (pres->getPriority() > priority) {
 			// look up caps from the jid
 			DiscoInfo::ref info = capsProvider->getCaps(pres->getFrom());