2 files changed, 3 insertions, 5 deletions
diff --git a/Swiften/Presence/PayloadAddingPresenceSender.h b/Swiften/Presence/PayloadAddingPresenceSender.h
index 3a55183..010b77e 100644
--- a/Swiften/Presence/PayloadAddingPresenceSender.h
+++ b/Swiften/Presence/PayloadAddingPresenceSender.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,8 +11,6 @@
 #include <Swiften/Presence/PresenceSender.h>
 
 namespace Swift {
-    class StanzaChannel;
-
     /**
      * This presence sender adds payloads to outgoing presences.
      *
diff --git a/Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp b/Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp
index 38e67fb..e313124 100644
--- a/Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp
+++ b/Swiften/Presence/UnitTest/DirectedPresenceSenderTest.cpp
@@ -29,12 +29,12 @@ class DirectedPresenceSenderTest : public CppUnit::TestFixture {
 
     public:
         void setUp() {
-            channel = std::unique_ptr<DummyStanzaChannel>(new DummyStanzaChannel());
+            channel = std::make_unique<DummyStanzaChannel>();
             testPresence = std::make_shared<Presence>();
             testPresence->setStatus("Foo");
             secondTestPresence = std::make_shared<Presence>();
             secondTestPresence->setStatus("Bar");
-            stanzaChannelPresenceSender = std::unique_ptr<StanzaChannelPresenceSender>(new StanzaChannelPresenceSender(channel.get()));
+            stanzaChannelPresenceSender = std::make_unique<StanzaChannelPresenceSender>(channel.get());
         }
 
         void testSendPresence() {