5 files changed, 8 insertions, 3 deletions
diff --git a/cpp/src/qpid/sys/posix/AsynchIO.cpp b/cpp/src/qpid/sys/posix/AsynchIO.cpp
index 58c7800514..d464ec826f 100644
--- a/cpp/src/qpid/sys/posix/AsynchIO.cpp
+++ b/cpp/src/qpid/sys/posix/AsynchIO.cpp
@@ -31,6 +31,7 @@
 #include <sys/socket.h>
 #include <signal.h>
 #include <errno.h>
+#include <string.h>
 
 #include <boost/bind.hpp>
 
@@ -133,7 +134,8 @@ void AsynchConnector::connComplete(DispatchHandle& h)
         connCallback(socket);
         DispatchHandle::doDelete();
     } else {
-        failure(errCode, std::string(strerror(errCode)));
+        // TODO: This need to be fixed as strerror isn't thread safe
+        failure(errCode, std::string(::strerror(errCode)));
     }
 }
 
diff --git a/cpp/src/qpid/sys/posix/Fork.h b/cpp/src/qpid/sys/posix/Fork.h
index d6fe862ee7..698c61ed30 100644
--- a/cpp/src/qpid/sys/posix/Fork.h
+++ b/cpp/src/qpid/sys/posix/Fork.h
@@ -20,6 +20,7 @@
  */
 
 #include <string>
+#include <sys/types.h>
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/sys/posix/Socket.cpp b/cpp/src/qpid/sys/posix/Socket.cpp
index d4de1741b1..c742b08c64 100644
--- a/cpp/src/qpid/sys/posix/Socket.cpp
+++ b/cpp/src/qpid/sys/posix/Socket.cpp
@@ -257,7 +257,7 @@ std::string Socket::getLocalAddress() const
 
 uint16_t Socket::getLocalPort() const
 {
-    return atoi(getService(impl->fd, true).c_str());
+    return std::atoi(getService(impl->fd, true).c_str());
 }
 
 uint16_t Socket::getRemotePort() const
diff --git a/cpp/src/qpid/sys/posix/Time.cpp b/cpp/src/qpid/sys/posix/Time.cpp
index 09627cdc6b..8aa9fd9946 100644
--- a/cpp/src/qpid/sys/posix/Time.cpp
+++ b/cpp/src/qpid/sys/posix/Time.cpp
@@ -24,6 +24,7 @@
 #include "qpid/sys/Time.h"
 #include <ostream>
 #include <time.h>
+#include <stdio.h>
 #include <sys/time.h>
 
 namespace qpid {
diff --git a/cpp/src/qpid/sys/posix/check.h b/cpp/src/qpid/sys/posix/check.h
index aa93c37205..32fdc48077 100644
--- a/cpp/src/qpid/sys/posix/check.h
+++ b/cpp/src/qpid/sys/posix/check.h
@@ -25,6 +25,7 @@
 #include "qpid/Exception.h"
 #include <cerrno>
 #include <assert.h>
+#include <stdio.h>
 
 #define QPID_POSIX_ERROR(ERRNO) qpid::Exception(QPID_MSG(qpid::strError(ERRNO)))
 
@@ -41,7 +42,7 @@
 #define QPID_POSIX_ASSERT_THROW_IF(ERRNO) QPID_POSIX_THROW_IF(ERRNO)
 #else
 #define QPID_POSIX_ASSERT_THROW_IF(ERRNO)                               \
-    do { int e=(ERRNO); if (e) { errno=e; perror(0); assert(0); } } while(0)
+    do { int e=(ERRNO); if (e) { errno=e; ::perror(0); assert(0); } } while(0)
 #endif
 
 #endif  /*!_posix_check_h*/