3 files changed, 24 insertions, 26 deletions
diff --git a/cpp/test/client/client_test.cpp b/cpp/test/client/client_test.cpp
index b899d494d7..e1c7d56573 100644
--- a/cpp/test/client/client_test.cpp
+++ b/cpp/test/client/client_test.cpp
@@ -17,15 +17,13 @@
  */
 #include <iostream>
 
-#include "QpidError.h"
-#include "Channel.h"
-#include "Connection.h"
-#include "FieldTable.h"
-#include "Message.h"
-#include "MessageListener.h"
-
-#include "MonitorImpl.h"
-
+#include "qpid/QpidError.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/Message.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/concurrent/MonitorImpl.h"
+#include "qpid/framing/FieldTable.h"
 
 using namespace qpid::client;
 using namespace qpid::concurrent;
diff --git a/cpp/test/client/topic_listener.cpp b/cpp/test/client/topic_listener.cpp
index a1b8e383a0..0f383134b5 100644
--- a/cpp/test/client/topic_listener.cpp
+++ b/cpp/test/client/topic_listener.cpp
@@ -15,15 +15,15 @@
  * limitations under the License.
  *
  */
+#include "qpid/QpidError.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/Exchange.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/Queue.h"
+#include <apr-1/apr_time.h>
 #include <iostream>
 #include <sstream>
-#include "apr_time.h"
-#include "QpidError.h"
-#include "Channel.h"
-#include "Connection.h"
-#include "Exchange.h"
-#include "MessageListener.h"
-#include "Queue.h"
 
 using namespace qpid::client;
 
diff --git a/cpp/test/client/topic_publisher.cpp b/cpp/test/client/topic_publisher.cpp
index fc6b7f3b30..9652c6450f 100644
--- a/cpp/test/client/topic_publisher.cpp
+++ b/cpp/test/client/topic_publisher.cpp
@@ -15,17 +15,17 @@
  * limitations under the License.
  *
  */
-#include <iostream>
-#include <cstdlib>
+#include "qpid/QpidError.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/Exchange.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/Queue.h"
+#include "qpid/concurrent/MonitorImpl.h"
 #include "unistd.h"
-#include "apr_time.h"
-#include "MonitorImpl.h"
-#include "QpidError.h"
-#include "Channel.h"
-#include "Connection.h"
-#include "Exchange.h"
-#include "MessageListener.h"
-#include "Queue.h"
+#include <apr-1/apr_time.h>
+#include <cstdlib>
+#include <iostream>
 
 using namespace qpid::client;
 using namespace qpid::concurrent;