diff --git a/include/etl/atomic.h b/include/etl/atomic.h
index 6567140d..98a11efd 100644
--- a/include/etl/atomic.h
+++ b/include/etl/atomic.h
@@ -31,7 +31,7 @@ SOFTWARE.
 
 #include "platform.h"
 
-#if ETL_STD_ATOMIC_SUPPORTED == 1
+#if ETL_CPP11_SUPPORTED == 1
   #include "atomic/atomic_std.h"
   #define ETL_HAS_ATOMIC 1
 #elif defined(ETL_COMPILER_ARM)
diff --git a/include/etl/atomic/atomic_arm.h b/include/etl/atomic/atomic_arm.h
index d8212254..9a21ac25 100644
--- a/include/etl/atomic/atomic_arm.h
+++ b/include/etl/atomic/atomic_arm.h
@@ -29,6 +29,6 @@ SOFTWARE.
 #ifndef __ETL_ATOMIC_ARM__
 #define __ETL_ATOMIC_ARM__
 
-#include "atomic_gcc_atomic.h"
+#include "atomic_gcc_sync.h"
 
 #endif
diff --git a/include/etl/atomic/atomic_gcc_sync.h b/include/etl/atomic/atomic_gcc_sync.h
index 763c0695..493b9803 100644
--- a/include/etl/atomic/atomic_gcc_sync.h
+++ b/include/etl/atomic/atomic_gcc_sync.h
@@ -429,7 +429,7 @@ namespace etl
     atomic& operator =(const atomic&);
     atomic& operator =(const atomic&) volatile;
 
-    T value;
+    volatile T value;
   };
 
   template <typename T>
@@ -736,7 +736,7 @@ namespace etl
     atomic& operator =(const atomic&);
     atomic& operator =(const atomic&) volatile;
 
-    T* value;
+    volatile T* value;
   };
 
   typedef etl::atomic<char>                atomic_char;