4 files changed, 16 insertions, 13 deletions
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index 4a849ce..bd05345 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <Swiften/Base/API.h>
 #include <Swiften/Client/CoreClient.h>
+
+#include <Swiften/Base/API.h>
 #include <Swiften/Base/SafeString.h>
 
 namespace Swift {
@@ -56,7 +57,7 @@ namespace Swift {
 			 *	all data will be stored in memory (and be lost on shutdown)
 			 */
 			Client(const JID& jid, const SafeString& password, NetworkFactories* networkFactories, Storages* storages = NULL);
-			~Client();
+			virtual ~Client();
 
 
 			/**
diff --git a/Swiften/Client/CoreClient.h b/Swiften/Client/CoreClient.h
index 79b05c6..002a704 100644
--- a/Swiften/Client/CoreClient.h
+++ b/Swiften/Client/CoreClient.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,15 +7,16 @@
 #pragma once
 
 #include <string>
+
 #include <boost/shared_ptr.hpp>
 
 #include <Swiften/Base/API.h>
+#include <Swiften/Base/SafeByteArray.h>
 #include <Swiften/Base/boost_bsignals.h>
-#include <Swiften/Entity/Entity.h>
-#include <Swiften/JID/JID.h>
 #include <Swiften/Client/ClientError.h>
 #include <Swiften/Client/ClientOptions.h>
-#include <Swiften/Base/SafeByteArray.h>
+#include <Swiften/Entity/Entity.h>
+#include <Swiften/JID/JID.h>
 #include <Swiften/TLS/CertificateWithKey.h>
 
 namespace Swift {
@@ -52,7 +53,7 @@ namespace Swift {
 			 * Constructs a client for the given JID with the given password.
 			 */
 			CoreClient(const JID& jid, const SafeByteArray& password, NetworkFactories* networkFactories);
-			~CoreClient();
+			virtual ~CoreClient();
 
 			/**
 			 * Set a client certificate to use for strong authentication with the server.
diff --git a/Swiften/Client/MemoryStorages.h b/Swiften/Client/MemoryStorages.h
index e341a37..49f18f5 100644
--- a/Swiften/Client/MemoryStorages.h
+++ b/Swiften/Client/MemoryStorages.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -20,7 +20,7 @@ namespace Swift {
 	class SWIFTEN_API MemoryStorages : public Storages {
 		public:
 			MemoryStorages(CryptoProvider*);
-			~MemoryStorages();
+			virtual ~MemoryStorages();
 
 			virtual VCardStorage* getVCardStorage() const;
 			virtual AvatarStorage* getAvatarStorage() const;
diff --git a/Swiften/Client/NickManagerImpl.h b/Swiften/Client/NickManagerImpl.h
index 9e599fa..51a8624 100644
--- a/Swiften/Client/NickManagerImpl.h
+++ b/Swiften/Client/NickManagerImpl.h
@@ -1,15 +1,16 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <string>
+
 #include <Swiften/Client/NickManager.h>
 #include <Swiften/Elements/VCard.h>
 #include <Swiften/JID/JID.h>
-#include <string>
 
 namespace Swift {
 	class VCardManager;
@@ -17,7 +18,7 @@ namespace Swift {
 	class NickManagerImpl : public NickManager {
 		public:
 			NickManagerImpl(const JID& ownJID, VCardManager* vcardManager);
-			~NickManagerImpl();
+			virtual ~NickManagerImpl();
 
 			std::string getOwnNick() const;
 			void setOwnNick(const std::string& nick);