5 files changed, 12 insertions, 3 deletions
diff --git a/Swiften/Examples/BenchTool/BenchTool.cpp b/Swiften/Examples/BenchTool/BenchTool.cpp
index 9e54ed9..1fb6601 100644
--- a/Swiften/Examples/BenchTool/BenchTool.cpp
+++ b/Swiften/Examples/BenchTool/BenchTool.cpp
@@ -6,6 +6,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/thread.hpp>
+#include <iostream>
 
 #include "Swiften/Client/Client.h"
 #include "Swiften/Network/TimerFactory.h"
diff --git a/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp b/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp
index fda203a..3b66d96 100644
--- a/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp
+++ b/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp
@@ -6,6 +6,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/thread.hpp>
+#include <iostream>
 
 #include "Swiften/Client/Client.h"
 #include "Swiften/Network/Timer.h"
diff --git a/Swiften/Examples/SendFile/ReceiveFile.cpp b/Swiften/Examples/SendFile/ReceiveFile.cpp
index b46d790..effa1b7 100644
--- a/Swiften/Examples/SendFile/ReceiveFile.cpp
+++ b/Swiften/Examples/SendFile/ReceiveFile.cpp
@@ -7,7 +7,10 @@
 #include <boost/bind.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
+#include <iostream>
 
+#include <Swiften/Elements/Presence.h>
+#include <Swiften/Base/foreach.h>
 #include <Swiften/Client/Client.h>
 #include <Swiften/Network/BoostNetworkFactories.h>
 #include <Swiften/EventLoop/SimpleEventLoop.h>
diff --git a/Swiften/Examples/SendFile/SendFile.cpp b/Swiften/Examples/SendFile/SendFile.cpp
index 5ec00a9..d8300be 100644
--- a/Swiften/Examples/SendFile/SendFile.cpp
+++ b/Swiften/Examples/SendFile/SendFile.cpp
@@ -6,15 +6,17 @@
 
 #include <boost/bind.hpp>
 #include <boost/filesystem.hpp>
+#include <iostream>
 
 #include "Swiften/Client/Client.h"
+#include <Swiften/Elements/Presence.h>
 #include "Swiften/Network/BoostTimer.h"
 #include "Swiften/Network/TimerFactory.h"
 #include "Swiften/Network/BoostNetworkFactories.h"
 #include "Swiften/EventLoop/EventLoop.h"
 #include "Swiften/Client/ClientXMLTracer.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
-#include "Swiften/FileTransfer/OutgoingFileTransfer.h"
+#include "Swiften/FileTransfer/OutgoingSIFileTransfer.h"
 #include "Swiften/FileTransfer/FileReadBytestream.h"
 #include "Swiften/FileTransfer/SOCKS5BytestreamServer.h"
 #include "Swiften/Network/BoostConnectionServer.h"
@@ -64,7 +66,7 @@ class FileSender {
 	private:
 		void handleConnected() {
 			client->sendPresence(Presence::create());
-			transfer = new OutgoingFileTransfer("myid",	client->getJID(), recipient, file.filename(), boost::filesystem::file_size(file), "A file", boost::shared_ptr<FileReadBytestream>(new FileReadBytestream(file)), client->getIQRouter(), socksBytestreamServer);
+			transfer = new OutgoingSIFileTransfer("myid",	client->getJID(), recipient, file.filename(), boost::filesystem::file_size(file), "A file", boost::shared_ptr<FileReadBytestream>(new FileReadBytestream(file)), client->getIQRouter(), socksBytestreamServer);
 			transfer->onFinished.connect(boost::bind(&FileSender::handleFileTransferFinished, this, _1));
 			transfer->start();
 		}
@@ -99,7 +101,7 @@ class FileSender {
 		boost::filesystem::path file;
 		Client* client;
 		ClientXMLTracer* tracer;
-		OutgoingFileTransfer* transfer;
+		OutgoingSIFileTransfer* transfer;
 };
 
 
diff --git a/Swiften/Examples/SendMessage/SendMessage.cpp b/Swiften/Examples/SendMessage/SendMessage.cpp
index d7f7333..ad75318 100644
--- a/Swiften/Examples/SendMessage/SendMessage.cpp
+++ b/Swiften/Examples/SendMessage/SendMessage.cpp
@@ -6,8 +6,10 @@
 
 #include <boost/bind.hpp>
 #include <boost/thread.hpp>
+#include <iostream>
 
 #include "Swiften/Client/Client.h"
+#include "Swiften/Elements/Message.h"
 #include "Swiften/Network/BoostNetworkFactories.h"
 #include "Swiften/Network/TimerFactory.h"
 #include "Swiften/EventLoop/EventLoop.h"