4 files changed, 27 insertions, 29 deletions
diff --git a/cpp/Makefile b/cpp/Makefile
index ca774563c2..33a020780d 100644
--- a/cpp/Makefile
+++ b/cpp/Makefile
@@ -99,10 +99,10 @@ UNITTESTS := $(UNITTESTS) $(wildcard test/unit/qpid/broker/*Test.cpp)
 	$(CXX) -shared -o $@ $< $($(LIB)_FLAGS) -Itest/include $(CXXFLAGS) $(LDFLAGS) -lapr-1 -lcppunit $(CURDIR)/$(COMMON_LIB) $(CURDIR)/$(BROKER_LIB)
 
 ## Client tests
-
-all-nogen: $(wildcard test/client/*.cpp:.cpp=)
+CLIENT_TEST_SRC := $(wildcard test/client/*.cpp)
+all-nogen: $(CLIENT_TEST_SRC:.cpp=)
 test/client/%: test/client/%.cpp
-	$(CXX) -o $@ $< $($(LIB)_FLAGS) -Itest/include $(CXXFLAGS) $(LDFLAGS) -lapr-1 $(LINK_WITH_$(LIB)) $(LINK_WITH_$(LIB)_DEPS)
+	$(CXX) -o $@ $< $($(LIB)_FLAGS) -Itest/include $(CXXFLAGS) $(LDFLAGS) -lapr-1  $(CURDIR)/$(COMMON_LIB) $(CURDIR)/$(CLIENT_LIB)
 
 ## Daemon executable
 
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;