4 files changed, 4 insertions, 17 deletions
diff --git a/cpp/common/framing/test/BodyHandlerTest.cpp b/cpp/common/framing/test/BodyHandlerTest.cpp
index 94038d9a6c..1cad6afe02 100644
--- a/cpp/common/framing/test/BodyHandlerTest.cpp
+++ b/cpp/common/framing/test/BodyHandlerTest.cpp
@@ -17,11 +17,7 @@
  */
 #include <iostream>
 #include "amqp_framing.h"
-#include <cppunit/TestCase.h>
-#include <cppunit/TextTestRunner.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
-
+#include "qpid_test_plugin.h"
 using namespace qpid::framing;
 
 class BodyHandlerTest : public CppUnit::TestCase  
diff --git a/cpp/common/framing/test/field_table_test.cpp b/cpp/common/framing/test/field_table_test.cpp
index 48332e05bc..535f7f4a08 100644
--- a/cpp/common/framing/test/field_table_test.cpp
+++ b/cpp/common/framing/test/field_table_test.cpp
@@ -17,10 +17,7 @@
  */
 #include <iostream>
 #include "amqp_framing.h"
-#include <cppunit/TestCase.h>
-#include <cppunit/TextTestRunner.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
+#include <qpid_test_plugin.h>
 
 using namespace qpid::framing;
 
diff --git a/cpp/common/framing/test/framing_test.cpp b/cpp/common/framing/test/framing_test.cpp
index 1978c2cbed..8c69f8718a 100644
--- a/cpp/common/framing/test/framing_test.cpp
+++ b/cpp/common/framing/test/framing_test.cpp
@@ -19,10 +19,7 @@
 #include "ConnectionRedirectBody.h"
 #include <iostream>
 #include <sstream>
-#include <cppunit/TestCase.h>
-#include <cppunit/TextTestRunner.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
+#include <qpid_test_plugin.h>
 #include <typeinfo>
 
 using namespace qpid::framing;
diff --git a/cpp/common/framing/test/header_test.cpp b/cpp/common/framing/test/header_test.cpp
index 0ff6d47d57..f98dd5d108 100644
--- a/cpp/common/framing/test/header_test.cpp
+++ b/cpp/common/framing/test/header_test.cpp
@@ -17,10 +17,7 @@
  */
 #include <iostream>
 #include "amqp_framing.h"
-#include <cppunit/TestCase.h>
-#include <cppunit/TextTestRunner.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
+#include <qpid_test_plugin.h>
 
 using namespace qpid::framing;