4 files changed, 12 insertions, 17 deletions
diff --git a/Limber/SConscript b/Limber/SConscript
index bc05f7f..13bc0df 100644
--- a/Limber/SConscript
+++ b/Limber/SConscript
@@ -9,6 +9,6 @@ if env["SCONS_STAGE"] == "flags" :
 elif env["SCONS_STAGE"] == "build" :
 	libenv = env.Clone()
-	libenv.MergeFlags(env["BOOST_FLAGS"])
-	libenv.MergeFlags(env["SWIFTEN_FLAGS"])
+	libenv.UseFlags(env["SWIFTEN_FLAGS"])
+	libenv.UseFlags(env["SWIFTEN_DEP_FLAGS"])
 	libenv.StaticLibrary("Limber", [
 			"Server/ServerFromClientSession.cpp",
@@ -23,10 +23,5 @@ elif env["SCONS_STAGE"] == "build" :
 	myenv.UseFlags(env["LIMBER_FLAGS"])
 	myenv.UseFlags(env["SWIFTEN_FLAGS"])
-	myenv.UseFlags(env["LIBIDN_FLAGS"])
-	myenv.UseFlags(env.get("LIBXML_FLAGS", ""))
-	myenv.UseFlags(env.get("EXPAT_FLAGS", ""))
-	myenv.UseFlags(env["OPENSSL_FLAGS"])
-	myenv.UseFlags(env["BOOST_FLAGS"])
-	myenv.UseFlags(myenv["PLATFORM_FLAGS"])
+	myenv.UseFlags(env["SWIFTEN_DEP_FLAGS"])
 	myenv.Program("limber", ["main.cpp"])
 
diff --git a/Limber/Server/ServerFromClientSession.cpp b/Limber/Server/ServerFromClientSession.cpp
index 71a8fef..9b1d2cf 100644
--- a/Limber/Server/ServerFromClientSession.cpp
+++ b/Limber/Server/ServerFromClientSession.cpp
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -41,5 +41,5 @@ ServerFromClientSession::ServerFromClientSession(
 
 
-void ServerFromClientSession::handleElement(boost::shared_ptr<Element> element) {
+void ServerFromClientSession::handleElement(boost::shared_ptr<ToplevelElement> element) {
 	if (isInitialized()) {
 		onElementReceived(element);
diff --git a/Limber/Server/ServerFromClientSession.h b/Limber/Server/ServerFromClientSession.h
index 34ea40e..00dfd79 100644
--- a/Limber/Server/ServerFromClientSession.h
+++ b/Limber/Server/ServerFromClientSession.h
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -8,8 +8,8 @@
 
 #include <boost/shared_ptr.hpp>
-#include <Swiften/Base/boost_bsignals.h>
 #include <boost/enable_shared_from_this.hpp>
-
 #include <string>
+
+#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Session/Session.h>
 #include <Swiften/JID/JID.h>
@@ -19,5 +19,5 @@
 namespace Swift {
 	class ProtocolHeader;
-	class Element;
+	class ToplevelElement;
 	class Stanza;
 	class PayloadParserFactoryCollection;
@@ -44,5 +44,5 @@ namespace Swift {
 
 		private:
-			void handleElement(boost::shared_ptr<Element>);
+			void handleElement(boost::shared_ptr<ToplevelElement>);
 			void handleStreamStart(const ProtocolHeader& header);
 
diff --git a/Limber/main.cpp b/Limber/main.cpp
index 3809729..3e095d5 100644
--- a/Limber/main.cpp
+++ b/Limber/main.cpp
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
@@ -50,5 +50,5 @@ class Server {
 		}
 
-		void handleElementReceived(boost::shared_ptr<Element> element, boost::shared_ptr<ServerFromClientSession> session) {
+		void handleElementReceived(boost::shared_ptr<ToplevelElement> element, boost::shared_ptr<ServerFromClientSession> session) {
 			boost::shared_ptr<Stanza> stanza(boost::dynamic_pointer_cast<Stanza>(element));
 			if (!stanza) {