diff --git a/indra/llcommon/llatomic.h b/indra/llcommon/llatomic.h
index dbf55ab544a766dbaa116d448abfbc5486da1151..e620e67683fa688ad3eb6e5522475e93f300c550 100644
--- a/indra/llcommon/llatomic.h
+++ b/indra/llcommon/llatomic.h
@@ -28,19 +28,21 @@
 #pragma once
  
 #include "stdtypes.h"
+#define AL_CXX_ATOMICS 1
 #define AL_BOOST_ATOMICS 1
 
-#if (__cplusplus >= 201103L || _MSC_VER >= 1800)
-
+#if AL_CXX_ATOMICS && (__cplusplus >= 201103L || _MSC_VER >= 1800)
 #if AL_BOOST_ATOMICS
 #include <boost/atomic.hpp>
-#elif AL_STD_ATOMICS
-#include <boost/atomic.hpp>
-#endif
 template<typename Type>
 using LLAtomic32 = boost::atomic<Type>;
+#elif AL_STD_ATOMICS
+#include <atomic>
+template<typename Type>
+using LLAtomic32 = std::atomic<Type>;
+#endif
 #else
-#include "apr_atomic.h"
+#include <apr_atomic.h>
 template <typename Type> class LLAtomic32
 {
 public: