8 files changed, 15 insertions, 10 deletions
diff --git a/qpid/cpp/include/qpid/client/Connection.h b/qpid/cpp/include/qpid/client/Connection.h
index 4d92d4b804..6ed0d98bc0 100644
--- a/qpid/cpp/include/qpid/client/Connection.h
+++ b/qpid/cpp/include/qpid/client/Connection.h
@@ -28,6 +28,8 @@
 #include "qpid/client/ConnectionSettings.h"
 #include "qpid/framing/ProtocolVersion.h"
 
+#include "boost/function.hpp"
+
 namespace qpid {
 
 struct Url;
diff --git a/qpid/cpp/include/qpid/client/ConnectionSettings.h b/qpid/cpp/include/qpid/client/ConnectionSettings.h
index 46053e1fa8..bf060e73bb 100644
--- a/qpid/cpp/include/qpid/client/ConnectionSettings.h
+++ b/qpid/cpp/include/qpid/client/ConnectionSettings.h
@@ -22,13 +22,9 @@
  *
  */
 
-#include "qpid/Options.h"
-#include "qpid/log/Options.h"
-#include "qpid/Url.h"
 #include "qpid/client/ClientImportExport.h"
-
-#include <iostream>
-#include <exception>
+#include "qpid/sys/IntegerTypes.h"
+#include <string>
 
 namespace qpid {
 
@@ -107,7 +103,7 @@ struct ConnectionSettings {
      * Limit the size of the connections send buffer . The buffer
      * is limited to bounds * maxFrameSize.
      */
-    uint bounds;
+    unsigned int bounds;
     /**
      * If true, TCP_NODELAY will be set for the connection.
      */
@@ -120,12 +116,12 @@ struct ConnectionSettings {
      * Minimum acceptable strength of any SASL negotiated security
      * layer. 0 means no security layer required.
      */
-    uint minSsf;
+    unsigned int minSsf;
     /**
      * Maximum acceptable strength of any SASL negotiated security
      * layer. 0 means no security layer allowed.
      */
-    uint maxSsf;
+    unsigned int maxSsf;
 };
 
 }} // namespace qpid::client
diff --git a/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp b/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
index bade1d2826..076a34d1bf 100644
--- a/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
+++ b/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
@@ -29,7 +29,7 @@
 #include <sys/types.h>
 #include <iostream>
 #include <fstream>
-
+#include <boost/lexical_cast.hpp>
 
 using namespace qpid::client;
 using namespace qpid::framing;
diff --git a/qpid/cpp/src/qpid/client/ConnectionSettings.cpp b/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
index 3ae4ee010a..b0c9477223 100644
--- a/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
+++ b/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
@@ -22,6 +22,7 @@
 
 #include "qpid/log/Logger.h"
 #include "qpid/sys/Socket.h"
+#include "qpid/Url.h"
 #include "qpid/Version.h"
 
 namespace qpid {
diff --git a/qpid/cpp/src/qpid/client/SaslFactory.cpp b/qpid/cpp/src/qpid/client/SaslFactory.cpp
index ec5680c8d8..5175c7735c 100644
--- a/qpid/cpp/src/qpid/client/SaslFactory.cpp
+++ b/qpid/cpp/src/qpid/client/SaslFactory.cpp
@@ -21,6 +21,7 @@
 #include "qpid/client/SaslFactory.h"
 #include "qpid/client/ConnectionSettings.h"
 #include <map>
+#include <string.h>
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
diff --git a/qpid/cpp/src/qpid/cluster/RetractClient.h b/qpid/cpp/src/qpid/cluster/RetractClient.h
index fb896197cc..533fc3f7ef 100644
--- a/qpid/cpp/src/qpid/cluster/RetractClient.h
+++ b/qpid/cpp/src/qpid/cluster/RetractClient.h
@@ -24,6 +24,7 @@
 
 #include "qpid/client/ConnectionSettings.h"
 #include "qpid/sys/Runnable.h"
+#include "qpid/Url.h"
 
 
 namespace qpid {
diff --git a/qpid/cpp/src/tests/echotest.cpp b/qpid/cpp/src/tests/echotest.cpp
index ab26dcf3fd..dcb1869e4d 100644
--- a/qpid/cpp/src/tests/echotest.cpp
+++ b/qpid/cpp/src/tests/echotest.cpp
@@ -25,6 +25,7 @@
 #include <qpid/client/Message.h>
 #include <qpid/client/MessageListener.h>
 #include <qpid/sys/Time.h>
+#include <qpid/Options.h>
 
 #include <iostream>
 
diff --git a/qpid/cpp/src/tests/qrsh_server.cpp b/qpid/cpp/src/tests/qrsh_server.cpp
index f1163ba479..782f1e6c7c 100644
--- a/qpid/cpp/src/tests/qrsh_server.cpp
+++ b/qpid/cpp/src/tests/qrsh_server.cpp
@@ -20,6 +20,9 @@
  */
 
 #include <stdio.h>
+#include <set>
+#include <string>
+#include <sstream>
 #include <unistd.h>
 #include <cstdlib>
 #include <iostream>