Replace #include "Swiften/Swiften.h" by particular headers. 25% compilation speedup.

2013-01-23 11:29:43 +01:00 · 2013-01-23 11:29:43 +01:00 · cc64a76c8b
commit cc64a76c8b
parent 1a7e4719ea
55 changed files with 104 additions and 59 deletions
--- a/include/transport/adhoccommand.h
+++ b/include/transport/adhoccommand.h
@ -23,7 +23,9 @@
 #include <string>
 #include <algorithm>
 #include <map>
-#include "Swiften/Swiften.h"
+
+#include "Swiften/Elements/FormField.h"
+#include "Swiften/Elements/Command.h"

 namespace Transport {

--- a/include/transport/adhoccommandfactory.h
+++ b/include/transport/adhoccommandfactory.h
@ -24,7 +24,6 @@
 #include <algorithm>
 #include <map>
 #include "transport/adhoccommand.h"
-#include "Swiften/Swiften.h"

 namespace Transport {

--- a/include/transport/adhocmanager.h
+++ b/include/transport/adhocmanager.h
@ -23,7 +23,10 @@
 #include <string>
 #include <algorithm>
 #include <map>
-#include "Swiften/Swiften.h"
+
+#include "Swiften/Queries/Responder.h"
+#include "Swiften/Elements/Command.h"
+#include "Swiften/Network/Timer.h"

 namespace Transport {

--- a/include/transport/admininterface.h
+++ b/include/transport/admininterface.h
@ -22,7 +22,8 @@

 #include <string>
 #include <map>
-#include "Swiften/Swiften.h"
+
+#include "Swiften/Elements/Message.h"

 namespace Transport {

--- a/include/transport/buddy.h
+++ b/include/transport/buddy.h
@ -23,8 +23,8 @@
 #include <string>
 #include <algorithm>
 #include "transport/transport.h"
+#include "Swiften/Elements/VCard.h"

-#include "Swiften/Swiften.h"

 namespace Transport {

--- a/include/transport/conversation.h
+++ b/include/transport/conversation.h
@ -24,7 +24,6 @@
 #include <algorithm>
 #include "transport/transport.h"

-#include "Swiften/Swiften.h"
 #include "Swiften/Elements/Message.h"

 namespace Transport {
--- a/include/transport/conversationmanager.h
+++ b/include/transport/conversationmanager.h
@ -23,7 +23,8 @@
 #include <string>
 #include <algorithm>
 #include <map>
-#include "Swiften/Swiften.h"
+
+#include "Swiften/Elements/Message.h"

 namespace Transport {

--- a/include/transport/discoitemsresponder.h
+++ b/include/transport/discoitemsresponder.h
@ -21,9 +21,9 @@
 #pragma once

 #include <vector>
-#include "Swiften/Swiften.h"
 #include "Swiften/Queries/GetResponder.h"
 #include "Swiften/Elements/DiscoItems.h"
+#include "Swiften/Elements/CapsInfo.h"

 namespace Transport {

--- a/include/transport/factory.h
+++ b/include/transport/factory.h
@ -24,7 +24,6 @@
 #include <algorithm>
 #include "transport/transport.h"

-#include "Swiften/Swiften.h"
 #include "Swiften/Elements/Message.h"
 #include "transport/conversation.h"
 #include "transport/buddy.h"
--- a/include/transport/gatewayresponder.h
+++ b/include/transport/gatewayresponder.h
@ -21,7 +21,6 @@
 #pragma once

 #include <vector>
-#include "Swiften/Swiften.h"
 #include "Swiften/Queries/Responder.h"
 #include "Swiften/Elements/GatewayPayload.h"

--- a/include/transport/memoryreadbytestream.h
+++ b/include/transport/memoryreadbytestream.h
@ -22,7 +22,8 @@

 #include <string>
 #include <map>
-#include "Swiften/Swiften.h"
+
+#include "Swiften/FileTransfer/ReadBytestream.h"

 namespace Transport {

--- a/include/transport/mysqlbackend.h
+++ b/include/transport/mysqlbackend.h
@ -24,7 +24,6 @@

 #include <string>
 #include <map>
-#include "Swiften/Swiften.h"
 #include "transport/storagebackend.h"
 #include "transport/config.h"
 #include "mysql.h"
--- a/include/transport/networkpluginserver.h
+++ b/include/transport/networkpluginserver.h
@ -21,11 +21,13 @@
 #pragma once

 #include <time.h>
-#include "Swiften/Swiften.h"
 #include "Swiften/Presence/PresenceOracle.h"
 #include "Swiften/Disco/EntityCapsManager.h"
 #include "Swiften/Network/BoostConnectionServer.h"
 #include "Swiften/Network/Connection.h"
+#include "Swiften/Elements/ChatState.h"
+#include "Swiften/Elements/RosterItemPayload.h"
+#include "Swiften/Elements/VCard.h"
 #include "storagebackend.h"
 #include "transport/filetransfermanager.h"

--- a/include/transport/pqxxbackend.h
+++ b/include/transport/pqxxbackend.h
@ -24,7 +24,6 @@

 #include <string>
 #include <map>
-#include "Swiften/Swiften.h"
 #include "transport/storagebackend.h"
 #include "transport/config.h"
 #include <pqxx/pqxx>
--- a/include/transport/rostermanager.h
+++ b/include/transport/rostermanager.h
@ -25,8 +25,12 @@
 #include <map>
 #include <boost/pool/pool_alloc.hpp>
 #include <boost/pool/object_pool.hpp>
-#include "Swiften/Swiften.h"
 // #include "rosterstorage.h"
+#include "Swiften/Elements/RosterPayload.h"
+#include "Swiften/Queries/GenericRequest.h"
+#include "Swiften/Roster/SetRosterRequest.h"
+#include "Swiften/Elements/Presence.h"
+#include "Swiften/Network/Timer.h"

 namespace Transport {

--- a/include/transport/rosterresponder.h
+++ b/include/transport/rosterresponder.h
@ -21,10 +21,11 @@
 #pragma once

 #include <vector>
-#include "Swiften/Swiften.h"
 #include "Swiften/Queries/Responder.h"
 #include "Swiften/Elements/RosterPayload.h"

+#include <boost/signal.hpp>
+
 namespace Transport {

 class UserManager;
--- a/include/transport/rosterstorage.h
+++ b/include/transport/rosterstorage.h
@ -22,7 +22,9 @@

 #include <string>
 #include <algorithm>
-#include "Swiften/Swiften.h"
+#include <map>
+
+#include "Swiften/Network/Timer.h"

 namespace Transport {

--- a/include/transport/settingsadhoccommand.h
+++ b/include/transport/settingsadhoccommand.h
@ -23,7 +23,6 @@
 #include <string>
 #include <algorithm>
 #include <map>
-#include "Swiften/Swiften.h"
 #include "transport/adhoccommand.h"
 #include "transport/adhoccommandfactory.h"

--- a/include/transport/sqlite3backend.h
+++ b/include/transport/sqlite3backend.h
@ -24,7 +24,6 @@

 #include <string>
 #include <map>
-#include "Swiften/Swiften.h"
 #include "transport/storagebackend.h"
 #include "transport/config.h"
 #include "sqlite3.h"
--- a/include/transport/statsresponder.h
+++ b/include/transport/statsresponder.h
@ -21,7 +21,6 @@
 #pragma once

 #include <vector>
-#include "Swiften/Swiften.h"
 #include "Swiften/Queries/SetResponder.h"
 #include "Swiften/Elements/StatsPayload.h"

--- a/include/transport/threadpool.h
+++ b/include/transport/threadpool.h
@ -7,7 +7,7 @@
 #include <queue>
 #include <iostream>
 #include "transport/logging.h"
-#include "Swiften/Swiften.h"
+#include "Swiften/EventLoop/EventLoop.h"


 /*
--- a/include/transport/transport.h
+++ b/include/transport/transport.h
@ -21,7 +21,6 @@
 #pragma once

 #include <vector>
-#include "Swiften/Swiften.h"
 #include "Swiften/Server/Server.h"
 #include "Swiften/Disco/GetDiscoInfoRequest.h"
 #include "Swiften/Disco/EntityCapsManager.h"
@ -32,6 +31,8 @@
 #include "Swiften/Server/UserRegistry.h"
 #include "Swiften/Base/SafeByteArray.h"
 #include "Swiften/Jingle/JingleSessionManager.h"
+#include "Swiften/Component/ComponentError.h"
+#include "Swiften/Component/Component.h"

 #include <boost/bind.hpp>
 #include "transport/config.h"
@ -40,12 +41,6 @@
 #include <Swiften/Network/BoostConnectionServer.h>

 namespace Transport {
-	// typedef enum { 	CLIENT_FEATURE_ROSTERX = 2,
-	// 				CLIENT_FEATURE_XHTML_IM = 4,
-	// 				CLIENT_FEATURE_FILETRANSFER = 8,
-	// 				CLIENT_FEATURE_CHATSTATES = 16
-	// 				} SpectrumImportantFeatures;
-	// 
 	class StorageBackend;
 	class Factory;
 	class UserRegistry;
@ -68,7 +63,9 @@ namespace Transport {
 			/// 	- service.server
 			/// 	- service.port
 			/// 	- service.server_mode
+			/// \param factories Swift::NetworkFactories.
 			/// \param factory Transport Abstract factory used to create basic transport structures.
+			/// \param userRegistery UserRegistry class instance. It's needed only when running transport in server-mode.
 			Component(Swift::EventLoop *loop, Swift::NetworkFactories *factories, Config *config, Factory *factory, Transport::UserRegistry *userRegistry = NULL);

 			/// Component destructor.
@ -96,9 +93,13 @@ namespace Transport {
 			/// \return True if the component is in server mode.
 			bool inServerMode() { return m_server != NULL; }

-			/// Connects the Jabber server.
-
+			/// Starts the Component.
+			
+			/// In server-mode, it starts listening on particular port for new client connections.
+			/// In gateway-mode, it connects the XMPP server.
 			void start();
+
+			/// Stops the component.
 			void stop();

 			/// Returns Jabber ID of this transport.
@ -139,14 +140,17 @@ namespace Transport {
 			/// This signal is emitted when presence from XMPP user is received.

 			/// It's emitted only for presences addressed to transport itself
-			/// (for example to="j2j.domain.tld").
-			/// \param presence presence data
+			/// (for example to="j2j.domain.tld") and for presences comming to
+			/// MUC (for example to="#chat%irc.freenode.org@irc.domain.tld")
+			/// \param presence Presence.
 			boost::signal<void (Swift::Presence::ref presence)> onUserPresenceReceived;

+			/// Component class asks the XMPP clients automatically for their capabilities.
+			/// This signal is emitted when capabilities have been received or changed.
+			/// \param jid JID of the client for which we received capabilities
+			/// \param info disco#info with response.
 			boost::signal<void (const Swift::JID& jid, boost::shared_ptr<Swift::DiscoInfo> info)> onUserDiscoInfoReceived;

-// 			boost::signal<void (boost::shared_ptr<Swift::DiscoInfo> info, Swift::ErrorPayload::ref error, const Swift::JID& jid)> onDiscoInfoResponse;
-
 		private:
 			void handleConnected();
 			void handleConnectionError(const Swift::ComponentError &error);
--- a/include/transport/user.h
+++ b/include/transport/user.h
@ -21,12 +21,13 @@
 #pragma once

 #include <time.h>
-#include "Swiften/Swiften.h"
 #include "Swiften/Disco/EntityCapsManager.h"
 #include "Swiften/Disco/EntityCapsProvider.h"
 #include "storagebackend.h"
 #include <Swiften/FileTransfer/OutgoingFileTransfer.h>
 #include "Swiften/Elements/SpectrumErrorPayload.h"
+#include "Swiften/Network/Timer.h"
+#include "Swiften/Network/Connection.h"

 namespace Transport {

--- a/include/transport/usermanager.h
+++ b/include/transport/usermanager.h
@ -22,8 +22,12 @@

 #include <string>
 #include <map>
-#include "Swiften/Swiften.h"
 #include "transport/userregistry.h"
+#include "Swiften/Elements/Message.h"
+#include "Swiften/Elements/Presence.h"
+#include "Swiften/Disco/EntityCapsProvider.h"
+#include "Swiften/Elements/DiscoInfo.h"
+#include "Swiften/Network/Timer.h"

 namespace Transport {

--- a/include/transport/userregistration.h
+++ b/include/transport/userregistration.h
@ -20,9 +20,10 @@

 #pragma once

-#include "Swiften/Swiften.h"
 #include "Swiften/Queries/Responder.h"
 #include "Swiften/Elements/InBandRegistrationPayload.h"
+#include "Swiften/Elements/RosterPayload.h"
+#include <boost/signal.hpp>

 namespace Transport {

--- a/include/transport/userregistry.h
+++ b/include/transport/userregistry.h
@ -22,8 +22,10 @@

 #include <string>
 #include <map>
-#include "Swiften/Swiften.h"
 #include "Swiften/Server/UserRegistry.h"
+#include "Swiften/Network/NetworkFactories.h"
+#include "Swiften/Network/Timer.h"
+#include "Swiften/Network/TimerFactory.h"
 #include "transport/config.h"

 namespace Transport {
--- a/include/transport/usersreconnecter.h
+++ b/include/transport/usersreconnecter.h
@ -23,7 +23,8 @@
 #include <string>
 #include <algorithm>
 #include <vector>
-#include "Swiften/Swiften.h"
+
+#include "Swiften/Network/Timer.h"

 namespace Transport {

--- a/include/transport/vcardresponder.h
+++ b/include/transport/vcardresponder.h
@ -21,9 +21,11 @@
 #pragma once

 #include <vector>
-#include "Swiften/Swiften.h"
 #include "Swiften/Queries/Responder.h"
 #include "Swiften/Elements/VCard.h"
+#include "Swiften/Network/NetworkFactories.h"
+#include "Swiften/Network/Timer.h"
+#include <boost/signal.hpp>

 namespace Transport {

--- a/spectrum/src/main.cpp
+++ b/spectrum/src/main.cpp
@ -17,6 +17,7 @@
 #include "transport/adhocmanager.h"
 #include "transport/settingsadhoccommand.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
+#include "Swiften/Network/BoostNetworkFactories.h"
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 #ifndef WIN32
--- a/src/blockresponder.cpp
+++ b/src/blockresponder.cpp
@ -24,7 +24,6 @@
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
 #include "transport/BlockPayload.h"
-#include "Swiften/Swiften.h"
 #include "transport/usermanager.h"
 #include "transport/user.h"
 #include "transport/buddy.h"
--- a/src/blockresponder.h
+++ b/src/blockresponder.h
@ -21,9 +21,9 @@
 #pragma once

 #include <vector>
-#include "Swiften/Swiften.h"
 #include "Swiften/Queries/SetResponder.h"
 #include "transport/BlockPayload.h"
+#include <boost/signal.hpp>

 namespace Transport {

--- a/src/buddy.cpp
+++ b/src/buddy.cpp
@ -26,6 +26,8 @@
 #include "transport/usermanager.h"
 #include "transport/discoitemsresponder.h"

+#include "Swiften/Elements/VCardUpdate.h"
+
 namespace Transport {

 Buddy::Buddy(RosterManager *rosterManager, long id, BuddyFlag flags) : m_id(id), m_flags(flags), m_rosterManager(rosterManager),
--- a/src/conversation.cpp
+++ b/src/conversation.cpp
@ -26,6 +26,11 @@
 #include "transport/buddy.h"
 #include "transport/rostermanager.h"

+#include "Swiften/Elements/MUCItem.h"
+#include "Swiften/Elements/MUCOccupant.h"
+#include "Swiften/Elements/MUCUserPayload.h"
+#include "Swiften/Elements/Delay.h"
+
 namespace Transport {

 Conversation::Conversation(ConversationManager *conversationManager, const std::string &legacyName, bool isMUC) : m_conversationManager(conversationManager) {
--- a/src/discoinforesponder.cpp
+++ b/src/discoinforesponder.cpp
@ -26,9 +26,9 @@
 #include "Swiften/Disco/DiscoInfoResponder.h"
 #include "Swiften/Queries/IQRouter.h"
 #include "Swiften/Elements/DiscoInfo.h"
-#include "Swiften/Swiften.h"
 #include "transport/config.h"
 #include "transport/logging.h"
+#include "Swiften/Disco/CapsInfoGenerator.h"

 using namespace Swift;
 using namespace boost;
--- a/src/discoinforesponder.h
+++ b/src/discoinforesponder.h
@ -21,7 +21,8 @@
 #pragma once

 #include <vector>
-#include "Swiften/Swiften.h"
+#include <list>
+#include <boost/signal.hpp>
 #include "Swiften/Queries/GetResponder.h"
 #include "Swiften/Elements/DiscoInfo.h"
 #include "Swiften/Elements/CapsInfo.h"
--- a/src/discoitemsresponder.cpp
+++ b/src/discoitemsresponder.cpp
@ -23,7 +23,6 @@
 #include <iostream>
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
-#include "Swiften/Swiften.h"
 #include "transport/transport.h"
 #include "transport/logging.h"
 #include "discoinforesponder.h"
--- a/src/filetransfermanager.cpp
+++ b/src/filetransfermanager.cpp
@ -24,6 +24,7 @@
 #include "transport/user.h"
 #include "transport/buddy.h"
 #include "transport/logging.h"
+#include "Swiften/Network/ConnectionServerFactory.h"

 namespace Transport {

--- a/src/gatewayresponder.cpp
+++ b/src/gatewayresponder.cpp
@ -24,7 +24,6 @@
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
 #include "Swiften/Elements/RawXMLPayload.h"
-#include "Swiften/Swiften.h"
 #include "transport/usermanager.h"
 #include "transport/user.h"
 #include "transport/transport.h"
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@ -34,18 +34,24 @@
 #include "transport/logging.h"
 #include "transport/admininterface.h"
 #include "blockresponder.h"
-#include "Swiften/Swiften.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
 #include "Swiften/Network/BoostConnectionServer.h"
+#include "Swiften/Network/ConnectionServerFactory.h"
 #include "Swiften/Elements/AttentionPayload.h"
 #include "Swiften/Elements/XHTMLIMPayload.h"
+#include "Swiften/Elements/Delay.h"
+#include "Swiften/Elements/DeliveryReceipt.h"
+#include "Swiften/Elements/DeliveryReceiptRequest.h"
 #include "Swiften/Elements/InvisiblePayload.h"
 #include "Swiften/Elements/SpectrumErrorPayload.h"
 #include "transport/protocol.pb.h"
 #include "transport/util.h"
 #include "transport/discoitemsresponder.h"

+#include "boost/date_time/posix_time/posix_time.hpp"
+#include "boost/signal.hpp"
+
 #include "utf8.h"

 #include <Swiften/FileTransfer/ReadBytestream.h>
--- a/src/presenceoracle.cpp
+++ b/src/presenceoracle.cpp
@ -19,7 +19,7 @@
 */

 #include "transport/presenceoracle.h"
-#include "Swiften/Swiften.h"
+#include "Swiften/Elements/MUCPayload.h"

 #include <boost/bind.hpp>

--- a/src/rostermanager.cpp
+++ b/src/rostermanager.cpp
@ -30,7 +30,10 @@
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/Elements/RosterItemPayload.h"
 #include "Swiften/Elements/RosterItemExchangePayload.h"
+#include "Swiften/Elements/Nickname.h"
+#include "Swiften/Queries/IQRouter.h"
 #include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>

 #include <map>
 #include <iterator>
--- a/src/rosterresponder.cpp
+++ b/src/rosterresponder.cpp
@ -23,7 +23,6 @@
 #include <iostream>
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
-#include "Swiften/Swiften.h"
 #include "transport/user.h"
 #include "transport/usermanager.h"
 #include "transport/rostermanager.h"
--- a/src/rosterstorage.cpp
+++ b/src/rosterstorage.cpp
@ -24,6 +24,8 @@
 #include "transport/storagebackend.h"
 #include "transport/logging.h"

+#include "Swiften/Network/NetworkFactories.h"
+
 DEFINE_LOGGER(logger, "RosterStorage");

 namespace Transport {
--- a/src/statsresponder.cpp
+++ b/src/statsresponder.cpp
@ -24,7 +24,6 @@
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
 #include "transport/BlockPayload.h"
-#include "Swiften/Swiften.h"
 #include "transport/usermanager.h"
 #include "transport/user.h"
 #include "transport/buddy.h"
--- a/src/storagebackend.cpp
+++ b/src/storagebackend.cpp
@ -4,8 +4,8 @@
 #include "transport/sqlite3backend.h"
 #include "transport/mysqlbackend.h"
 #include "transport/pqxxbackend.h"
+#include "Swiften/StringCodecs/Base64.h"

-#include "Swiften/Swiften.h"

 namespace Transport {

--- a/src/storageresponder.cpp
+++ b/src/storageresponder.cpp
@ -24,7 +24,9 @@
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
 #include "Swiften/Elements/RawXMLPayload.h"
-#include "Swiften/Swiften.h"
+#include "Swiften/Elements/Storage.h"
+#include "Swiften/Elements/Storage.h"
+#include "Swiften/Serializer/PayloadSerializers/StorageSerializer.h"
 #include "transport/usermanager.h"
 #include "transport/user.h"
 #include "transport/logging.h"
--- a/src/storageresponder.h
+++ b/src/storageresponder.h
@ -21,9 +21,9 @@
 #pragma once

 #include <vector>
-#include "Swiften/Swiften.h"
 #include "Swiften/Queries/Responder.h"
 #include "Swiften/Elements/RosterPayload.h"
+#include "Swiften/Elements/PrivateStorage.h"

 namespace Transport {

--- a/src/tests/userregistry.cpp
+++ b/src/tests/userregistry.cpp
@ -6,6 +6,8 @@
 #include <Swiften/Server/Server.h>
 #include <Swiften/Network/DummyNetworkFactories.h>
 #include <Swiften/Network/DummyConnectionServer.h>
+#include <Swiften/Network/ConnectionFactory.h>
+#include <Swiften/Network/DummyTimerFactory.h>

 using namespace Transport;

--- a/src/transport.cpp
+++ b/src/transport.cpp
@ -51,7 +51,7 @@
 #include "transport/BlockSerializer.h"
 #include "Swiften/Parser/PayloadParsers/InvisibleParser.h"
 #include "Swiften/Serializer/PayloadSerializers/InvisibleSerializer.h"
-#include "Swiften/Swiften.h"
+#include "Swiften/Parser/GenericPayloadParserFactory.h"

 using namespace Swift;
 using namespace boost;
--- a/src/user.cpp
+++ b/src/user.cpp
@ -26,7 +26,6 @@
 #include "transport/conversationmanager.h"
 #include "transport/presenceoracle.h"
 #include "transport/logging.h"
-#include "Swiften/Swiften.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
 #include "Swiften/Elements/MUCPayload.h"
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@ -29,9 +29,10 @@
 #include "transport/discoitemsresponder.h"
 #include "storageresponder.h"

-#include "Swiften/Swiften.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
+#include "Swiften/Elements/MUCPayload.h"
+#include "Swiften/Elements/ChatState.h"
 #ifndef __FreeBSD__
 #include "malloc.h"
 #endif
--- a/src/userregistration.cpp
+++ b/src/userregistration.cpp
@ -26,6 +26,9 @@
 #include "transport/user.h"
 #include "transport/logging.h"
 #include "Swiften/Elements/ErrorPayload.h"
+#include "Swiften/EventLoop/SimpleEventLoop.h"
+#include "Swiften/Network/BoostNetworkFactories.h"
+#include "Swiften/Client/Client.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
--- a/src/userregistry.cpp
+++ b/src/userregistry.cpp
@ -20,7 +20,6 @@

 #include <string>
 #include <map>
-#include "Swiften/Swiften.h"
 #include "Swiften/Server/UserRegistry.h"
 #include "transport/userregistry.h"
 #include "transport/logging.h"
--- a/src/usersreconnecter.cpp
+++ b/src/usersreconnecter.cpp
@ -23,11 +23,12 @@
 #include <iostream>
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
-#include "Swiften/Swiften.h"
 #include "transport/storagebackend.h"
 #include "transport/transport.h"
 #include "transport/logging.h"

+#include "Swiften/Network/NetworkFactories.h"
+
 using namespace Swift;
 using namespace boost;

--- a/src/vcardresponder.cpp
+++ b/src/vcardresponder.cpp
@ -23,7 +23,6 @@
 #include <iostream>
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
-#include "Swiften/Swiften.h"
 #include "transport/user.h"
 #include "transport/usermanager.h"
 #include "transport/rostermanager.h"