5 files changed, 16 insertions, 13 deletions
diff --git a/qpid/cpp/include/qpid/sys/IOHandle.h b/qpid/cpp/include/qpid/sys/IOHandle.h
index 45fc8c240a..0a72f12165 100644
--- a/qpid/cpp/include/qpid/sys/IOHandle.h
+++ b/qpid/cpp/include/qpid/sys/IOHandle.h
@@ -33,14 +33,14 @@ namespace sys {
  */
 class PollerHandle;
 class IOHandlePrivate;
-class IOHandle {
+class QPID_COMMON_CLASS_EXTERN IOHandle {
     friend class PollerHandle;
     friend class IOHandlePrivate;
 
 protected:
     IOHandlePrivate* const impl;
 
-    IOHandle(IOHandlePrivate*);
+    QPID_COMMON_EXTERN IOHandle(IOHandlePrivate*);
     QPID_COMMON_EXTERN virtual ~IOHandle();
 };
 
diff --git a/qpid/cpp/include/qpid/sys/Thread.h b/qpid/cpp/include/qpid/sys/Thread.h
index f556612908..cf4d10500f 100644
--- a/qpid/cpp/include/qpid/sys/Thread.h
+++ b/qpid/cpp/include/qpid/sys/Thread.h
@@ -44,7 +44,7 @@ namespace sys {
 class Runnable;
 class ThreadPrivate;
 
-class Thread
+class QPID_COMMON_CLASS_EXTERN Thread
 {
     boost::shared_ptr<ThreadPrivate> impl;
 
diff --git a/qpid/cpp/include/qpid/sys/Time.h b/qpid/cpp/include/qpid/sys/Time.h
index 9c5ac66e9a..e9e164b3fa 100644
--- a/qpid/cpp/include/qpid/sys/Time.h
+++ b/qpid/cpp/include/qpid/sys/Time.h
@@ -77,7 +77,7 @@ class Duration;
  * with one of the AbsTime constructors). However trying to add 2 AbsTimes
  * doesn't make sense.
  */
-class AbsTime {
+class QPID_COMMON_CLASS_EXTERN AbsTime {
     friend class Duration;
     friend class Condition;
 
diff --git a/qpid/cpp/include/qpid/sys/posix/Mutex.h b/qpid/cpp/include/qpid/sys/posix/Mutex.h
index e2b21b5a56..bef35cc19f 100644
--- a/qpid/cpp/include/qpid/sys/posix/Mutex.h
+++ b/qpid/cpp/include/qpid/sys/posix/Mutex.h
@@ -20,6 +20,7 @@
  */
 
 #include "qpid/sys/posix/check.h"
+#include "qpid/CommonImportExport.h"
 
 #include <pthread.h>
 #include <boost/noncopyable.hpp>
@@ -32,9 +33,9 @@ class Condition;
 /**
  * Mutex lock.
  */
-class Mutex : private boost::noncopyable {
+class QPID_COMMON_CLASS_EXTERN Mutex : private boost::noncopyable {
     friend class Condition;
-    static const pthread_mutexattr_t* getAttribute();
+    QPID_COMMON_EXTERN static const pthread_mutexattr_t* getAttribute();
 
 public:
     typedef ::qpid::sys::ScopedLock<Mutex> ScopedLock;
@@ -54,7 +55,7 @@ protected:
 /**
  * RW lock.
  */
-class RWlock : private boost::noncopyable {
+class QPID_COMMON_CLASS_EXTERN RWlock : private boost::noncopyable {
     friend class Condition;
 
 public:
@@ -78,7 +79,7 @@ protected:
  * PODMutex is a POD, can be static-initialized with
  * PODMutex m = QPID_PODMUTEX_INITIALIZER
  */
-struct PODMutex
+struct QPID_COMMON_CLASS_EXTERN PODMutex
 {
     typedef ::qpid::sys::ScopedLock<PODMutex> ScopedLock;
 
diff --git a/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h b/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h
index 79cb950275..2ff5f9e64c 100644
--- a/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h
+++ b/qpid/cpp/include/qpid/sys/posix/PrivatePosix.h
@@ -24,6 +24,7 @@
 
 #include "qpid/sys/Time.h"
 #include "qpid/sys/IOHandle.h"
+#include "qpid/CommonImportExport.h"
 
 struct timespec;
 struct timeval;
@@ -33,13 +34,14 @@ namespace qpid {
 namespace sys {
 
 // Private Time related implementation details
-struct timespec& toTimespec(struct timespec& ts, const Duration& t);
-struct timeval& toTimeval(struct timeval& tv, const Duration& t);
-Duration toTime(const struct timespec& ts);
+QPID_COMMON_EXTERN struct timespec& toTimespec(struct timespec& ts, const Duration& t);
+QPID_COMMON_EXTERN struct timeval& toTimeval(struct timeval& tv, const Duration& t);
+QPID_COMMON_EXTERN Duration toTime(const struct timespec& ts);
 
 // Private SocketAddress details
 class SocketAddress;
-const struct addrinfo& getAddrInfo(const SocketAddress&);
+// FIXME aconway 2011-03-22: ??
+const struct addrinfo& QPID_COMMON_EXTERN getAddrInfo(const SocketAddress&);
 
 // Private fd related implementation details
 class IOHandlePrivate {
@@ -51,7 +53,7 @@ public:
     int fd;
 };
 
-int toFd(const IOHandlePrivate* h);
+QPID_COMMON_EXTERN int toFd(const IOHandlePrivate* h);
 
 // Posix fd as an IOHandle
 class PosixIOHandle : public IOHandle {