32 files changed, 73 insertions, 89 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index a447f60..001251e 100644
--- a/Swift/Controllers/Chat/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -23,9 +23,9 @@
 #include "Swiften/Elements/Delay.h"
 #include "Swiften/MUC/MUC.h"
 #include "Swiften/Client/StanzaChannel.h"
-#include "Swiften/Roster/Roster.h"
-#include "Swiften/Roster/SetAvatar.h"
-#include "Swiften/Roster/SetPresence.h"
+#include "Swift/Controllers/Roster/Roster.h"
+#include "Swift/Controllers/Roster/SetAvatar.h"
+#include "Swift/Controllers/Roster/SetPresence.h"
 
 
 #define MUC_JOIN_WARNING_TIMEOUT_MILLISECONDS 60000
diff --git a/Swift/Controllers/ContactEditController.cpp b/Swift/Controllers/ContactEditController.cpp
index 286fdeb..a8f7811 100644
--- a/Swift/Controllers/ContactEditController.cpp
+++ b/Swift/Controllers/ContactEditController.cpp
@@ -13,7 +13,7 @@
 #include <Swift/Controllers/UIEvents/UIEventStream.h>
 #include <Swift/Controllers/UIEvents/RemoveRosterItemUIEvent.h>
 #include <Swift/Controllers/UIInterfaces/ContactEditWindowFactory.h>
-#include <Swift/Controllers/RosterController.h>
+#include <Swift/Controllers/Roster/RosterController.h>
 
 
 namespace Swift {
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 3e1b366..98599bb 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -28,7 +28,7 @@
 #include "Swift/Controllers/UIInterfaces/MainWindow.h"
 #include "Swift/Controllers/Chat/MUCController.h"
 #include "Swiften/Client/NickResolver.h"
-#include "Swift/Controllers/RosterController.h"
+#include "Swift/Controllers/Roster/RosterController.h"
 #include "Swift/Controllers/SoundEventController.h"
 #include "Swift/Controllers/SoundPlayer.h"
 #include "Swift/Controllers/StatusTracker.h"
diff --git a/Swiften/Roster/AppearOffline.h b/Swift/Controllers/Roster/AppearOffline.h
index 8e14190..8bd53d7 100644
--- a/Swiften/Roster/AppearOffline.h
+++ b/Swift/Controllers/Roster/AppearOffline.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include "Swiften/Roster/RosterItemOperation.h"
-#include "Swiften/Roster/ContactRosterItem.h"
+#include <Swift/Controllers/Roster/RosterItemOperation.h>
+#include <Swift/Controllers/Roster/ContactRosterItem.h>
 
 namespace Swift {
 
diff --git a/Swiften/Roster/ContactRosterItem.cpp b/Swift/Controllers/Roster/ContactRosterItem.cpp
index 9c7af32..df0eb7b 100644
--- a/Swiften/Roster/ContactRosterItem.cpp
+++ b/Swift/Controllers/Roster/ContactRosterItem.cpp
@@ -4,8 +4,8 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/Roster/ContactRosterItem.h"
-#include "Swiften/Roster/GroupRosterItem.h"
+#include "Swift/Controllers/Roster/ContactRosterItem.h"
+#include "Swift/Controllers/Roster/GroupRosterItem.h"
 
 namespace Swift {
 
diff --git a/Swiften/Roster/ContactRosterItem.h b/Swift/Controllers/Roster/ContactRosterItem.h
index cb30989..ca9d727 100644
--- a/Swiften/Roster/ContactRosterItem.h
+++ b/Swift/Controllers/Roster/ContactRosterItem.h
@@ -8,7 +8,7 @@
 
 #include "Swiften/Base/String.h"
 #include "Swiften/JID/JID.h"
-#include "Swiften/Roster/RosterItem.h"
+#include "Swift/Controllers/Roster/RosterItem.h"
 #include "Swiften/Elements/StatusShow.h"
 #include "Swiften/Elements/Presence.h"
 
diff --git a/Swiften/Roster/GroupRosterItem.cpp b/Swift/Controllers/Roster/GroupRosterItem.cpp
index 325c890..c473ae7 100644
--- a/Swiften/Roster/GroupRosterItem.cpp
+++ b/Swift/Controllers/Roster/GroupRosterItem.cpp
@@ -4,7 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/Roster/GroupRosterItem.h"
+#include "Swift/Controllers/Roster/GroupRosterItem.h"
 
 #include <boost/bind.hpp>
 //#include <boost/algorithm.hpp>
diff --git a/Swiften/Roster/GroupRosterItem.h b/Swift/Controllers/Roster/GroupRosterItem.h
index b306b59..85e8e46 100644
--- a/Swiften/Roster/GroupRosterItem.h
+++ b/Swift/Controllers/Roster/GroupRosterItem.h
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include "Swiften/Roster/RosterItem.h"
+#include "Swift/Controllers/Roster/RosterItem.h"
 #include "Swiften/Base/String.h"
-#include "Swiften/Roster/ContactRosterItem.h"
+#include "Swift/Controllers/Roster/ContactRosterItem.h"
 
 #include <vector>
 
diff --git a/Swiften/Roster/OfflineRosterFilter.h b/Swift/Controllers/Roster/OfflineRosterFilter.h
index 2a71900..1af2624 100644
--- a/Swiften/Roster/OfflineRosterFilter.h
+++ b/Swift/Controllers/Roster/OfflineRosterFilter.h
@@ -4,12 +4,11 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_OfflineRosterFilter_H
-#define SWIFTEN_OfflineRosterFilter_H
+#pragma once
 
-#include "Swiften/Roster/ContactRosterItem.h"
-#include "Swiften/Roster/RosterItem.h"
-#include "Swiften/Roster/RosterFilter.h"
+#include "Swift/Controllers/Roster/ContactRosterItem.h"
+#include "Swift/Controllers/Roster/RosterItem.h"
+#include "Swift/Controllers/Roster/RosterFilter.h"
 #include "Swiften/Elements/StatusShow.h"
 
 namespace Swift {
@@ -24,7 +23,5 @@ class OfflineRosterFilter : public RosterFilter {
 };
 
 }
-#endif
-
 
 
diff --git a/Swiften/Roster/Roster.cpp b/Swift/Controllers/Roster/Roster.cpp
index 68bac53..7967a38 100644
--- a/Swiften/Roster/Roster.cpp
+++ b/Swift/Controllers/Roster/Roster.cpp
@@ -4,15 +4,15 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/Roster/Roster.h"
+#include "Swift/Controllers/Roster/Roster.h"
 
 #include "Swiften/Base/foreach.h"
 #include "Swiften/Base/String.h"
 #include "Swiften/JID/JID.h"
-#include "Swiften/Roster/ContactRosterItem.h"
-#include "Swiften/Roster/RosterItem.h"
-#include "Swiften/Roster/GroupRosterItem.h"
-#include "Swiften/Roster/RosterItemOperation.h"
+#include "Swift/Controllers/Roster/ContactRosterItem.h"
+#include "Swift/Controllers/Roster/RosterItem.h"
+#include "Swift/Controllers/Roster/GroupRosterItem.h"
+#include "Swift/Controllers/Roster/RosterItemOperation.h"
 
 #include <boost/bind.hpp>
 
diff --git a/Swiften/Roster/Roster.h b/Swift/Controllers/Roster/Roster.h
index 2f12b57..70ff0b5 100644
--- a/Swiften/Roster/Roster.h
+++ b/Swift/Controllers/Roster/Roster.h
@@ -4,13 +4,12 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_Roster_H
-#define SWIFTEN_Roster_H
+#pragma once
 
 #include "Swiften/Base/String.h"
 #include "Swiften/JID/JID.h"
-#include "Swiften/Roster/RosterItemOperation.h"
-#include "Swiften/Roster/RosterFilter.h"
+#include "Swift/Controllers/Roster/RosterItemOperation.h"
+#include "Swift/Controllers/Roster/RosterFilter.h"
 
 #include <vector>
 #include <map>
@@ -55,6 +54,5 @@ class Roster {
 		bool fullJIDMapping_;
 		bool sortByStatus_;
 };
-}
 
-#endif
+}
diff --git a/Swift/Controllers/RosterController.cpp b/Swift/Controllers/Roster/RosterController.cpp
index be735cf..2dddd7d 100644
--- a/Swift/Controllers/RosterController.cpp
+++ b/Swift/Controllers/Roster/RosterController.cpp
@@ -4,7 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swift/Controllers/RosterController.h"
+#include "Swift/Controllers/Roster/RosterController.h"
 
 #include <boost/bind.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
@@ -21,12 +21,12 @@
 #include "Swiften/Presence/SubscriptionManager.h"
 #include "Swift/Controllers/XMPPEvents/EventController.h"
 #include "Swiften/Queries/IQRouter.h"
-#include "Swiften/Roster/Roster.h"
-#include "Swiften/Roster/SetPresence.h"
-#include "Swiften/Roster/AppearOffline.h"
-#include "Swiften/Roster/SetAvatar.h"
-#include "Swiften/Roster/SetName.h"
-#include "Swiften/Roster/OfflineRosterFilter.h"
+#include "Swift/Controllers/Roster/Roster.h"
+#include "Swift/Controllers/Roster/SetPresence.h"
+#include "Swift/Controllers/Roster/AppearOffline.h"
+#include "Swift/Controllers/Roster/SetAvatar.h"
+#include "Swift/Controllers/Roster/SetName.h"
+#include "Swift/Controllers/Roster/OfflineRosterFilter.h"
 #include "Swiften/Roster/XMPPRoster.h"
 #include "Swiften/Roster/XMPPRosterItem.h"
 #include "Swift/Controllers/UIEvents/AddContactUIEvent.h"
diff --git a/Swift/Controllers/RosterController.h b/Swift/Controllers/Roster/RosterController.h
index d8c2487..b0641c3 100644
--- a/Swift/Controllers/RosterController.h
+++ b/Swift/Controllers/Roster/RosterController.h
@@ -13,7 +13,7 @@
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/Avatars/AvatarManager.h"
 #include "Swift/Controllers/UIEvents/UIEvent.h"
-#include "Swift/Controllers/RosterGroupExpandinessPersister.h"
+#include "RosterGroupExpandinessPersister.h"
 
 #include "Swiften/Base/boost_bsignals.h"
 #include <boost/shared_ptr.hpp>
diff --git a/Swiften/Roster/RosterFilter.h b/Swift/Controllers/Roster/RosterFilter.h
index 02e788c..508b9da 100644
--- a/Swiften/Roster/RosterFilter.h
+++ b/Swift/Controllers/Roster/RosterFilter.h
@@ -4,10 +4,9 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_RosterFilter_H
-#define SWIFTEN_RosterFilter_H
+#pragma once
 
-#include "Swiften/Roster/RosterItem.h"
+#include "Swift/Controllers/Roster/RosterItem.h"
 
 namespace Swift {
 
@@ -18,6 +17,5 @@ class RosterFilter {
 };
 
 }
-#endif
 
 
diff --git a/Swift/Controllers/RosterGroupExpandinessPersister.cpp b/Swift/Controllers/Roster/RosterGroupExpandinessPersister.cpp
index d532fcb..64baac9 100644
--- a/Swift/Controllers/RosterGroupExpandinessPersister.cpp
+++ b/Swift/Controllers/Roster/RosterGroupExpandinessPersister.cpp
@@ -4,12 +4,12 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swift/Controllers/RosterGroupExpandinessPersister.h"
+#include "RosterGroupExpandinessPersister.h"
 
 #include <boost/bind.hpp>
 #include <vector>
 
-#include "Swiften/Roster/GroupRosterItem.h"
+#include "Swift/Controllers/Roster/GroupRosterItem.h"
 
 namespace Swift {
 
diff --git a/Swift/Controllers/RosterGroupExpandinessPersister.h b/Swift/Controllers/Roster/RosterGroupExpandinessPersister.h
index 0b88a48..f73afa8 100644
--- a/Swift/Controllers/RosterGroupExpandinessPersister.h
+++ b/Swift/Controllers/Roster/RosterGroupExpandinessPersister.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <set>
-#include "Swiften/Roster/Roster.h"
+#include "Swift/Controllers/Roster/Roster.h"
 #include "Swift/Controllers/Settings/SettingsProvider.h"
 
 namespace Swift {
diff --git a/Swiften/Roster/RosterItem.cpp b/Swift/Controllers/Roster/RosterItem.cpp
index 3ce13b4..61c5aea 100644
--- a/Swiften/Roster/RosterItem.cpp
+++ b/Swift/Controllers/Roster/RosterItem.cpp
@@ -4,9 +4,9 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/Roster/RosterItem.h"
+#include "Swift/Controllers/Roster/RosterItem.h"
 
-#include "Swiften/Roster/GroupRosterItem.h"
+#include "Swift/Controllers/Roster/GroupRosterItem.h"
 
 namespace Swift {
 
diff --git a/Swiften/Roster/RosterItem.h b/Swift/Controllers/Roster/RosterItem.h
index 35dbe73..35dbe73 100644
--- a/Swiften/Roster/RosterItem.h
+++ b/Swift/Controllers/Roster/RosterItem.h
diff --git a/Swiften/Roster/RosterItemOperation.h b/Swift/Controllers/Roster/RosterItemOperation.h
index e27e68b..691c8ef 100644
--- a/Swiften/Roster/RosterItemOperation.h
+++ b/Swift/Controllers/Roster/RosterItemOperation.h
@@ -4,10 +4,9 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_RosterItemOperation_H
-#define SWIFTEN_RosterItemOperation_H
+#pragma once
 
-#include "Swiften/Roster/RosterItem.h"
+#include "Swift/Controllers/Roster/RosterItem.h"
 
 namespace Swift {
 
@@ -29,5 +28,3 @@ class RosterItemOperation {
 };
 
 }
-#endif
-
diff --git a/Swiften/Roster/SetAvatar.h b/Swift/Controllers/Roster/SetAvatar.h
index 2b22188..2b9cfa8 100644
--- a/Swiften/Roster/SetAvatar.h
+++ b/Swift/Controllers/Roster/SetAvatar.h
@@ -4,13 +4,12 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_SetAvatar_H
-#define SWIFTEN_SetAvatar_H
+#pragma once
 
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/JID/JID.h"
-#include "Swiften/Roster/RosterItemOperation.h"
-#include "Swiften/Roster/ContactRosterItem.h"
+#include "Swift/Controllers/Roster/RosterItemOperation.h"
+#include "Swift/Controllers/Roster/ContactRosterItem.h"
 
 namespace Swift {
 
@@ -35,5 +34,3 @@ class SetAvatar : public RosterItemOperation {
 };
 
 }
-#endif
-
diff --git a/Swiften/Roster/SetName.h b/Swift/Controllers/Roster/SetName.h
index d3f7749..4d75392 100644
--- a/Swiften/Roster/SetName.h
+++ b/Swift/Controllers/Roster/SetName.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include "Swiften/JID/JID.h"
-#include "Swiften/Roster/RosterItemOperation.h"
-#include "Swiften/Roster/ContactRosterItem.h"
+#include "Swift/Controllers/Roster/RosterItemOperation.h"
+#include "Swift/Controllers/Roster/ContactRosterItem.h"
 
 namespace Swift {
 
diff --git a/Swiften/Roster/SetPresence.h b/Swift/Controllers/Roster/SetPresence.h
index e710931..06adfa4 100644
--- a/Swiften/Roster/SetPresence.h
+++ b/Swift/Controllers/Roster/SetPresence.h
@@ -8,8 +8,8 @@
 
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/JID/JID.h"
-#include "Swiften/Roster/RosterItemOperation.h"
-#include "Swiften/Roster/ContactRosterItem.h"
+#include "Swift/Controllers/Roster/RosterItemOperation.h"
+#include "Swift/Controllers/Roster/ContactRosterItem.h"
 
 namespace Swift {
 
diff --git a/Swift/Controllers/UnitTest/RosterControllerTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
index 2f6f0da..604cda6 100644
--- a/Swift/Controllers/UnitTest/RosterControllerTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
@@ -8,7 +8,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
-#include "Swift/Controllers/RosterController.h"
+#include "Swift/Controllers/Roster/RosterController.h"
 #include "Swift/Controllers/UnitTest/MockMainWindowFactory.h"
 // #include "Swiften/Elements/Payload.h"
 // #include "Swiften/Elements/RosterItemPayload.h"
@@ -17,9 +17,9 @@
 #include "Swiften/Client/DummyStanzaChannel.h"
 #include "Swiften/Queries/IQRouter.h"
 #include "Swiften/Roster/XMPPRosterImpl.h"
-#include "Swiften/Roster/Roster.h"
-#include "Swiften/Roster/GroupRosterItem.h"
-#include "Swiften/Roster/ContactRosterItem.h"
+#include "Swift/Controllers/Roster/Roster.h"
+#include "Swift/Controllers/Roster/GroupRosterItem.h"
+#include "Swift/Controllers/Roster/ContactRosterItem.h"
 #include "Swift/Controllers/Settings/DummySettingsProvider.h"
 #include "Swiften/Avatars/NullAvatarManager.h"
 #include "Swift/Controllers/XMPPEvents/EventController.h"
diff --git a/Swiften/Roster/UnitTest/RosterTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
index 0300188..754f3e1 100644
--- a/Swiften/Roster/UnitTest/RosterTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
@@ -8,9 +8,9 @@
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <boost/shared_ptr.hpp>
 
-#include "Swiften/Roster/Roster.h"
-#include "Swiften/Roster/GroupRosterItem.h"
-#include "Swiften/Roster/SetPresence.h"
+#include "Swift/Controllers/Roster/Roster.h"
+#include "Swift/Controllers/Roster/GroupRosterItem.h"
+#include "Swift/Controllers/Roster/SetPresence.h"
 
 using namespace Swift;
 
diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript
index c8314de..c563c7b 100644
--- a/Swift/Controllers/SConscript
+++ b/Swift/Controllers/SConscript
@@ -31,8 +31,12 @@ if env["SCONS_STAGE"] == "build" :
 			"MainController.cpp",
 			"ProfileController.cpp",
 			"ContactEditController.cpp",
-			"RosterController.cpp",
-			"RosterGroupExpandinessPersister.cpp",
+			"Roster/RosterController.cpp",
+			"Roster/RosterGroupExpandinessPersister.cpp",
+			"Roster/ContactRosterItem.cpp",
+			"Roster/GroupRosterItem.cpp",
+			"Roster/RosterItem.cpp",
+			"Roster/Roster.cpp",
 			"EventWindowController.cpp",
 			"SoundEventController.cpp",
 			"SystemTrayController.cpp",
@@ -51,7 +55,8 @@ if env["SCONS_STAGE"] == "build" :
 		])
 
 	env.Append(UNITTEST_SOURCES = [
-			File("UnitTest/RosterControllerTest.cpp"),
+			File("Roster/UnitTest/RosterControllerTest.cpp"),
+			File("Roster/UnitTest/RosterTest.cpp"),
 			File("UnitTest/PreviousStatusStoreTest.cpp"),
 			File("UnitTest/PresenceNotifierTest.cpp"),
 			File("Chat/UnitTest/ChatsManagerTest.cpp"),
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index ef31727..c8341dc 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -6,7 +6,7 @@
 
 #include "QtChatWindow.h"
 #include "QtSwiftUtil.h"
-#include "Swiften/Roster/Roster.h"
+#include "Swift/Controllers/Roster/Roster.h"
 #include "Roster/QtTreeWidget.h"
 #include "SwifTools/Linkify.h"
 #include "QtChatView.h"
diff --git a/Swift/QtUI/Roster/QtTreeWidget.cpp b/Swift/QtUI/Roster/QtTreeWidget.cpp
index 3c0b303..90084c4 100644
--- a/Swift/QtUI/Roster/QtTreeWidget.cpp
+++ b/Swift/QtUI/Roster/QtTreeWidget.cpp
@@ -12,8 +12,8 @@
 #include <boost/smart_ptr/make_shared.hpp>
 
 #include "Swiften/Base/Platform.h"
-#include "Swiften/Roster/ContactRosterItem.h"
-#include "Swiften/Roster/GroupRosterItem.h"
+#include "Swift/Controllers/Roster/ContactRosterItem.h"
+#include "Swift/Controllers/Roster/GroupRosterItem.h"
 #include "Swift/Controllers/UIEvents/UIEventStream.h"
 #include "Swift/Controllers/UIEvents/RequestChatUIEvent.h"
 #include "Swift/Controllers/UIEvents/RequestContactEditorUIEvent.h"
diff --git a/Swift/QtUI/Roster/RosterDelegate.cpp b/Swift/QtUI/Roster/RosterDelegate.cpp
index f5dcbd6..7dbf3cb 100644
--- a/Swift/QtUI/Roster/RosterDelegate.cpp
+++ b/Swift/QtUI/Roster/RosterDelegate.cpp
@@ -15,8 +15,8 @@
 #include <QPolygon>
 #include <qdebug.h>
 
-#include "Swiften/Roster/ContactRosterItem.h"
-#include "Swiften/Roster/GroupRosterItem.h"
+#include "Swift/Controllers/Roster/ContactRosterItem.h"
+#include "Swift/Controllers/Roster/GroupRosterItem.h"
 
 #include "QtTreeWidget.h"
 #include "RosterModel.h"
diff --git a/Swift/QtUI/Roster/RosterModel.cpp b/Swift/QtUI/Roster/RosterModel.cpp
index a6f40bb..95452c8 100644
--- a/Swift/QtUI/Roster/RosterModel.cpp
+++ b/Swift/QtUI/Roster/RosterModel.cpp
@@ -13,8 +13,8 @@
 #include <qdebug.h>
 
 #include "Swiften/Elements/StatusShow.h"
-#include "Swiften/Roster/ContactRosterItem.h"
-#include "Swiften/Roster/GroupRosterItem.h"
+#include "Swift/Controllers/Roster/ContactRosterItem.h"
+#include "Swift/Controllers/Roster/GroupRosterItem.h"
 
 #include "QtSwiftUtil.h"
 #include "Swift/QtUI/Roster/QtTreeWidget.h"
diff --git a/Swift/QtUI/Roster/RosterModel.h b/Swift/QtUI/Roster/RosterModel.h
index 4d9e03c..964f680 100644
--- a/Swift/QtUI/Roster/RosterModel.h
+++ b/Swift/QtUI/Roster/RosterModel.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "Swiften/Roster/Roster.h"
+#include "Swift/Controllers/Roster/Roster.h"
 
 #include <QAbstractItemModel>
 #include <QList>
diff --git a/Swiften/Roster/XMPPRosterController.cpp b/Swiften/Roster/XMPPRosterController.cpp
index 909ef8e..3a1d11f 100644
--- a/Swiften/Roster/XMPPRosterController.cpp
+++ b/Swiften/Roster/XMPPRosterController.cpp
@@ -12,9 +12,6 @@
 #include "Swiften/Elements/RosterItemPayload.h"
 #include "Swiften/Queries/IQRouter.h"
 #include "Swiften/Roster/GetRosterRequest.h"
-#include "Swiften/Roster/Roster.h"
-#include "Swiften/Roster/SetPresence.h"
-#include "Swiften/Roster/OfflineRosterFilter.h"
 #include "Swiften/Roster/XMPPRosterImpl.h"
 
 namespace Swift {
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 36ebd0c..8eeab37 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -75,10 +75,6 @@ if env["SCONS_STAGE"] == "build" :
 			"Queries/Requests/GetInBandRegistrationFormRequest.cpp",
 			"Queries/Requests/SubmitInBandRegistrationFormRequest.cpp",
 			"Queries/Responders/SoftwareVersionResponder.cpp",
-			"Roster/ContactRosterItem.cpp",
-			"Roster/GroupRosterItem.cpp",
-			"Roster/RosterItem.cpp",
-			"Roster/Roster.cpp",
 			"Roster/XMPPRoster.cpp",
 			"Roster/XMPPRosterImpl.cpp",
 			"Roster/XMPPRosterController.cpp",
@@ -249,7 +245,6 @@ if env["SCONS_STAGE"] == "build" :
 			File("Queries/UnitTest/IQRouterTest.cpp"),
 			File("Queries/UnitTest/RequestTest.cpp"),
 			File("Queries/UnitTest/ResponderTest.cpp"),
-			File("Roster/UnitTest/RosterTest.cpp"),
 			File("Roster/UnitTest/XMPPRosterImplTest.cpp"),
 			File("Roster/UnitTest/XMPPRosterControllerTest.cpp"),
 			File("Serializer/PayloadSerializers/UnitTest/PayloadsSerializer.cpp"),