9 files changed, 11 insertions, 11 deletions
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index ef091e3..8b830d1 100644
--- a/Swift/QtUI/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h
@@ -1,7 +1,7 @@
 #ifndef SWIFT_QtChatWindow_H
 #define SWIFT_QtChatWindow_H
 
-#include "Swiften/Controllers/ChatWindow.h"
+#include "Swift/Controllers/ChatWindow.h"
 
 #include <QWidget>
 
diff --git a/Swift/QtUI/QtChatWindowFactory.h b/Swift/QtUI/QtChatWindowFactory.h
index 9e5004e..bda4c01 100644
--- a/Swift/QtUI/QtChatWindowFactory.h
+++ b/Swift/QtUI/QtChatWindowFactory.h
@@ -1,7 +1,7 @@
 #ifndef SWIFT_QtChatWindowFactory_H
 #define SWIFT_QtChatWindowFactory_H
 
-#include "Swiften/Controllers/ChatWindowFactory.h"
+#include "Swift/Controllers/ChatWindowFactory.h"
 #include "Swiften/JID/JID.h"
 
 namespace Swift {
diff --git a/Swift/QtUI/QtLoginWindow.h b/Swift/QtUI/QtLoginWindow.h
index 5a14202..173a6b9 100644
--- a/Swift/QtUI/QtLoginWindow.h
+++ b/Swift/QtUI/QtLoginWindow.h
@@ -7,8 +7,8 @@
 #include <QCheckBox>
 #include <QStackedWidget>
 
-#include "Swiften/Controllers/LoginWindow.h"
-#include "Swiften/Controllers/MainWindow.h"
+#include "Swift/Controllers/LoginWindow.h"
+#include "Swift/Controllers/MainWindow.h"
 
 class QLabel;
 class QToolButton;
diff --git a/Swift/QtUI/QtLoginWindowFactory.h b/Swift/QtUI/QtLoginWindowFactory.h
index 52f92c8..17f2453 100644
--- a/Swift/QtUI/QtLoginWindowFactory.h
+++ b/Swift/QtUI/QtLoginWindowFactory.h
@@ -1,7 +1,7 @@
 #ifndef SWIFT_QtLoginWindowFactory_H
 #define SWIFT_QtLoginWindowFactory_H
 
-#include "Swiften/Controllers/LoginWindowFactory.h"
+#include "Swift/Controllers/LoginWindowFactory.h"
 
 namespace Swift {
 	class QtLoginWindowFactory : public LoginWindowFactory{
diff --git a/Swift/QtUI/QtMainWindow.h b/Swift/QtUI/QtMainWindow.h
index fe5c8b4..6f4b5f7 100644
--- a/Swift/QtUI/QtMainWindow.h
+++ b/Swift/QtUI/QtMainWindow.h
@@ -3,7 +3,7 @@
 
 #include <QWidget>
 #include <QMenu>
-#include "Swiften/Controllers/MainWindow.h"
+#include "Swift/Controllers/MainWindow.h"
 
 #include <vector>
 
diff --git a/Swift/QtUI/QtMainWindowFactory.h b/Swift/QtUI/QtMainWindowFactory.h
index 86fc02f..1e45b23 100644
--- a/Swift/QtUI/QtMainWindowFactory.h
+++ b/Swift/QtUI/QtMainWindowFactory.h
@@ -1,7 +1,7 @@
 #ifndef SWIFT_QtMainWindowFactory_H
 #define SWIFT_QtMainWindowFactory_H
 
-#include "Swiften/Controllers/MainWindowFactory.h"
+#include "Swift/Controllers/MainWindowFactory.h"
 
 namespace Swift {
 	class QtTreeWidgetFactory;
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index e7d4152..b8b45a1 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -12,8 +12,8 @@
 #include "Swiften/Base/String.h"
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/Client/Client.h"
-#include "Swiften/Controllers/ChatController.h"
-#include "Swiften/Controllers/MainController.h"
+#include "Swift/Controllers/ChatController.h"
+#include "Swift/Controllers/MainController.h"
 
 namespace Swift{
 
diff --git a/Swift/QtUI/Swift.pro b/Swift/QtUI/Swift.pro
index 16db0d1..1c860b4 100644
--- a/Swift/QtUI/Swift.pro
+++ b/Swift/QtUI/Swift.pro
@@ -27,7 +27,7 @@ win32 {
 else {
 	DEPENDPATH += . ../.. ../../3rdParty/Boost
 	INCLUDEPATH += . ../.. ../../3rdParty/Boost
-	LIBS += ../../Swiften/Swiften.a -lexpat -lssl -lcrypto
+	LIBS += ../Controllers/Controllers.a ../../Swiften/Swiften.a -lexpat -lssl -lcrypto
 	unix {
 		LIBS += -lresolv
 	}
diff --git a/Swift/QtUI/qmakeish.py b/Swift/QtUI/qmakeish.py
index 72a5f62..178696d 100755
--- a/Swift/QtUI/qmakeish.py
+++ b/Swift/QtUI/qmakeish.py
@@ -80,7 +80,7 @@ for line in makefile :
       continue
     
     match = re.match("(\w+)_SOURCES (\+?)= (.*)", line) 
-    if match and match.group(1) in ["SWIFTEN", "ZLIB", "LIBIDN", "BOOST", "EXPAT"] :
+    if match and match.group(1) in ["SWIFTEN", "ZLIB", "LIBIDN", "BOOST", "EXPAT", "SWIFT_CONTROLLERS"] :
       inSources = processSourcesLine(match.group(3))
       continue