diff --git a/opal/include/opal/sys/atomic.h b/opal/include/opal/sys/atomic.h
index d8e8c4a3cd..579afab499 100644
--- a/opal/include/opal/sys/atomic.h
+++ b/opal/include/opal/sys/atomic.h
@@ -9,7 +9,6 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserverd.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -180,7 +179,7 @@ typedef struct opal_atomic_lock_t opal_atomic_lock_t;
  * generally grinding the memory controller's performance.  Use only
  * if you need *both* read and write barriers.
  */
-static inline void opal_atomic_mb(void);
+void opal_atomic_mb(void);
 
 /**
  * Read memory barrier
@@ -191,7 +190,7 @@ static inline void opal_atomic_mb(void);
  * next read.  Nothing is said about the ordering of writes when using
  * \c opal_atomic_rmb().
  */
-static inline void opal_atomic_rmb(void);
+void opal_atomic_rmb(void);
 
 /**
  * Write memory barrier.
@@ -202,7 +201,7 @@ static inline void opal_atomic_rmb(void);
  * next write.  Nothing is said about the ordering of reads when using
  * \c opal_atomic_wmb().
  */
-static inline void opal_atomic_wmb(void);
+void opal_atomic_wmb(void);
 
 #endif /* defined(DOXYGEN) || OPAL_HAVE_ATOMIC_MEM_BARRIER */
 
@@ -294,11 +293,11 @@ void opal_atomic_unlock(opal_atomic_lock_t *lock);
 #define OPAL_HAVE_ATOMIC_CMPSET_32 0
 #endif
 #if defined(DOXYGEN) || OPAL_HAVE_ATOMIC_CMPSET_32
-static inline int opal_atomic_cmpset_32(volatile int32_t *addr, int32_t oldval, 
+int opal_atomic_cmpset_32(volatile int32_t *addr, int32_t oldval, 
                           int32_t newval);
-static inline int opal_atomic_cmpset_acq_32(volatile int32_t *addr, int32_t oldval, 
+int opal_atomic_cmpset_acq_32(volatile int32_t *addr, int32_t oldval, 
                               int32_t newval);
-static inline int opal_atomic_cmpset_rel_32(volatile int32_t *addr, int32_t oldval, 
+int opal_atomic_cmpset_rel_32(volatile int32_t *addr, int32_t oldval, 
                               int32_t newval);
 #endif
 
@@ -307,11 +306,11 @@ static inline int opal_atomic_cmpset_rel_32(volatile int32_t *addr, int32_t oldv
 #define OPAL_HAVE_ATOMIC_CMPSET_64 0
 #endif
 #if defined(DOXYGEN) || OPAL_HAVE_ATOMIC_CMPSET_64
-static inline int opal_atomic_cmpset_64(volatile int64_t *addr, int64_t oldval, 
+int opal_atomic_cmpset_64(volatile int64_t *addr, int64_t oldval, 
                           int64_t newval);
-static inline int opal_atomic_cmpset_acq_64(volatile int64_t *addr, int64_t oldval, 
+int opal_atomic_cmpset_acq_64(volatile int64_t *addr, int64_t oldval, 
                               int64_t newval);
-static inline int opal_atomic_cmpset_rel_64(volatile int64_t *addr, int64_t oldval, 
+int opal_atomic_cmpset_rel_64(volatile int64_t *addr, int64_t oldval, 
                               int64_t newval);
 #endif