6 files changed, 11 insertions, 2 deletions
diff --git a/cpp/tests/ChannelTest.cpp b/cpp/tests/ChannelTest.cpp
index e7a02d631d..b31ff6a321 100644
--- a/cpp/tests/ChannelTest.cpp
+++ b/cpp/tests/ChannelTest.cpp
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <memory>
 #include <AMQP_HighestVersion.h>
-
+#include "AMQFrame.h"
 
 using namespace boost;
 using namespace qpid::broker;
@@ -107,6 +107,9 @@ class ChannelTest : public CppUnit::TestCase
             handle(call);
         }
 
+        // Don't hide overloads.
+        using NullMessageStore::destroy;
+        
         void destroy(Message* msg)
         {
             MethodCall call = {"destroy", msg, ""};
diff --git a/cpp/tests/InMemoryContentTest.cpp b/cpp/tests/InMemoryContentTest.cpp
index bd638dae66..1494518578 100644
--- a/cpp/tests/InMemoryContentTest.cpp
+++ b/cpp/tests/InMemoryContentTest.cpp
@@ -23,6 +23,7 @@
 #include <AMQP_HighestVersion.h>
 #include <iostream>
 #include <list>
+#include "AMQFrame.h"
 
 using std::list;
 using std::string;
diff --git a/cpp/tests/LazyLoadedContentTest.cpp b/cpp/tests/LazyLoadedContentTest.cpp
index 2075a6dd3a..624d2be3ff 100644
--- a/cpp/tests/LazyLoadedContentTest.cpp
+++ b/cpp/tests/LazyLoadedContentTest.cpp
@@ -25,6 +25,7 @@
 #include <iostream>
 #include <list>
 #include <sstream>
+#include "AMQFrame.h"
 
 using std::list;
 using std::string;
diff --git a/cpp/tests/MessageBuilderTest.cpp b/cpp/tests/MessageBuilderTest.cpp
index 88e8318832..21f5935218 100644
--- a/cpp/tests/MessageBuilderTest.cpp
+++ b/cpp/tests/MessageBuilderTest.cpp
@@ -71,6 +71,9 @@ class MessageBuilderTest : public CppUnit::TestCase
             }
         }
 
+        // Don't hide overloads.
+        using NullMessageStore::destroy;
+
         void destroy(Message* msg)
         {
             CPPUNIT_ASSERT(msg->getPersistenceId());
diff --git a/cpp/tests/MessageTest.cpp b/cpp/tests/MessageTest.cpp
index bcf3ad8064..8bb570e598 100644
--- a/cpp/tests/MessageTest.cpp
+++ b/cpp/tests/MessageTest.cpp
@@ -22,6 +22,7 @@
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <AMQP_HighestVersion.h>
+#include "AMQFrame.h"
 
 using namespace boost;
 using namespace qpid::broker;
diff --git a/cpp/tests/MockConnectionInputHandler.h b/cpp/tests/MockConnectionInputHandler.h
index 522df0900f..b039e244d9 100644
--- a/cpp/tests/MockConnectionInputHandler.h
+++ b/cpp/tests/MockConnectionInputHandler.h
@@ -89,7 +89,7 @@ struct MockConnectionInputHandler : public qpid::sys::ConnectionInputHandler {
 struct MockConnectionInputHandlerFactory : public qpid::sys::ConnectionInputHandlerFactory {
     MockConnectionInputHandlerFactory() : handler(0) {}
 
-    qpid::sys::ConnectionInputHandler* create(qpid::sys::SessionContext*) {
+    qpid::sys::ConnectionInputHandler* create(qpid::sys::ConnectionOutputHandler*) {
         qpid::sys::Monitor::ScopedLock lock(monitor);
         handler = new MockConnectionInputHandler();
         monitor.notifyAll();